Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* made OBJReader reuse stringstream objects.

Browse Source 
Should speedup Reading on MS Windows especially with lots of materials.
This commit is contained in:
Martin Schultz
2015-09-11 14:47:02 +02:00
parent c9180795bb
commit ebd5180a8f
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/OpenMesh/Core/IO/reader/OBJReader.cc
View File

@@ -172,6 +172,8 @@ read_material(std::fstream& _in)
std::string keyWrd; std::string keyWrd;
std::string textureName; std::string textureName;
static std::stringstream stream;
std::string key; std::string key;
Material mat; Material mat;
float f1,f2,f3; float f1,f2,f3;
@@ -193,7 +195,8 @@ read_material(std::fstream& _in)
if ( line.empty() ) if ( line.empty() )
continue; continue;
std::stringstream stream(line); stream.str(line);
stream.clear();
stream >> keyWrd; stream >> keyWrd;
@@ -305,6 +308,8 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
std::string matname; std::string matname;
static std::stringstream stream, lineData, tmp;
// Options supplied by the user // Options supplied by the user
Options userOptions = _opt; Options userOptions = _opt;
@@ -329,7 +334,8 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
continue; continue;
} }
std::stringstream stream(line); stream.str(line);
stream.clear();
stream >> keyWrd; stream >> keyWrd;
@@ -463,7 +469,8 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
// read full line after detecting a face // read full line after detecting a face
std::string faceLine; std::string faceLine;
std::getline(stream,faceLine); std::getline(stream,faceLine);
std::stringstream lineData( faceLine ); lineData.str( faceLine );
lineData.clear();
FaceHandle fh; FaceHandle fh;
BaseImporter::VHandles faceVertices; BaseImporter::VHandles faceVertices;
@@ -484,7 +491,8 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
if( found != std::string::npos ){ if( found != std::string::npos ){
// read the index value // read the index value
std::stringstream tmp( vertex.substr(0,found) ); tmp.str( vertex.substr(0,found) );
tmp.clear();
// If we get an empty string this property is undefined in the file // If we get an empty string this property is undefined in the file
if ( vertex.substr(0,found).empty() ) { if ( vertex.substr(0,found).empty() ) {
@@ -507,7 +515,8 @@ read(std::istream& _in, BaseImporter& _bi, Options& _opt)
} else { } else {
// last component of the vertex, read it. // last component of the vertex, read it.
std::stringstream tmp( vertex ); tmp.str( vertex );
tmp.clear();
tmp >> value; tmp >> value;
// Clear vertex after finished reading the line // Clear vertex after finished reading the line