diff options
author | Nils Thuerey <nils@thuerey.de> | 2006-05-16 12:54:08 +0400 |
---|---|---|
committer | Nils Thuerey <nils@thuerey.de> | 2006-05-16 12:54:08 +0400 |
commit | 38547345e7819b8737fb8b85f70ca8a8c16fd8a3 (patch) | |
tree | 9264d93c8a0c7aeba931b9a0bef8378cde1c5d3d /intern/elbeem | |
parent | 563247f7a71ee785b741d77568bd5c9a56ee903c (diff) |
- fixed geometry init (object id init was missing)
- added more std::string fixes from bjornmose
Diffstat (limited to 'intern/elbeem')
-rw-r--r-- | intern/elbeem/intern/elbeem.cpp | 1 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_blenderdumper.cpp | 2 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_geometryshader.h | 4 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_vector3dim.h | 2 | ||||
-rw-r--r-- | intern/elbeem/intern/ntl_world.cpp | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/intern/elbeem/intern/elbeem.cpp b/intern/elbeem/intern/elbeem.cpp index bd96b9fce6a..907401395c5 100644 --- a/intern/elbeem/intern/elbeem.cpp +++ b/intern/elbeem/intern/elbeem.cpp @@ -116,6 +116,7 @@ extern "C" void elbeemResetMesh(elbeemMesh *mesh) { if(!mesh) return; mesh->type = 0; + mesh->parentDomainId = 0; mesh->numVertices = 0; mesh->vertices = NULL; mesh->numTriangles = 0; diff --git a/intern/elbeem/intern/ntl_blenderdumper.cpp b/intern/elbeem/intern/ntl_blenderdumper.cpp index 4468dda750f..1bdea59f210 100644 --- a/intern/elbeem/intern/ntl_blenderdumper.cpp +++ b/intern/elbeem/intern/ntl_blenderdumper.cpp @@ -85,7 +85,7 @@ int ntlBlenderDumper::renderScene( void ) } if(tid & GEOCLASSTID_SHADER) { ntlGeometryShader *geoshad = (ntlGeometryShader*)(*iter); //dynamic_cast<ntlGeometryShader*>(*iter); - std::string outname = geoshad->getOutFilename(); + string outname = geoshad->getOutFilename(); if(outname.length()<1) outname = mpGlob->getOutFilename(); geoshad->notifyShaderOfDump(DUMP_FULLGEOMETRY, glob->getAniCount(),nrStr,outname); diff --git a/intern/elbeem/intern/ntl_geometryshader.h b/intern/elbeem/intern/ntl_geometryshader.h index 07be18a8ef9..aba6b598e09 100644 --- a/intern/elbeem/intern/ntl_geometryshader.h +++ b/intern/elbeem/intern/ntl_geometryshader.h @@ -44,7 +44,7 @@ class ntlGeometryShader : virtual void notifyShaderOfDump(int dumptype, int frameNr,char *frameNrStr,string outfilename) = 0; /*! get ouput filename, returns global render outfile if empty */ - std::string getOutFilename( void ) { return mOutFilename; } + string getOutFilename( void ) { return mOutFilename; } protected: @@ -53,7 +53,7 @@ class ntlGeometryShader : /*! surface output name for this simulation */ - std::string mOutFilename; + string mOutFilename; }; #endif diff --git a/intern/elbeem/intern/ntl_vector3dim.h b/intern/elbeem/intern/ntl_vector3dim.h index 2e50330a807..ba3ea68f364 100644 --- a/intern/elbeem/intern/ntl_vector3dim.h +++ b/intern/elbeem/intern/ntl_vector3dim.h @@ -214,7 +214,7 @@ operator<<( std::ostream& os, const ntlVector3Dim<Scalar>& i ) { char buf[256]; snprintf(buf,256,globVecFormatStr,i[0],i[1],i[2]); - os << std::string(buf); + os << string(buf); //os << '[' << i[0] << ", " << i[1] << ", " << i[2] << ']'; return os; } diff --git a/intern/elbeem/intern/ntl_world.cpp b/intern/elbeem/intern/ntl_world.cpp index 6b4dc7b6054..befcbed21ae 100644 --- a/intern/elbeem/intern/ntl_world.cpp +++ b/intern/elbeem/intern/ntl_world.cpp @@ -74,7 +74,7 @@ int ntlWorld::addDomain(elbeemSimulationSettings *settings) char simname[100]; snprintf(simname,100,"domain%04d",globalDomainCounter); globalDomainCounter++; - sim->setName(std::string(simname)); + sim->setName(string(simname)); mpGlob->getSims()->push_back( sim ); // important - add to both, only render scene objects are free'd |