manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reset to zero warnings

This commit is contained in:
Massimiliano Corsini 2006-03-29 08:51:16 +00:00
parent ad53facf1f
commit 2a7eef61f2
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wrap/io_trimesh/import_obj.h
View File

@ -25,6 +25,9 @@
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.2 2006/03/27 07:18:22 cignoni
added missing std::
Revision 1.1 2006/03/07 13:19:29 cignoni Revision 1.1 2006/03/07 13:19:29 cignoni
First Release with OBJ import support First Release with OBJ import support
@ -261,7 +264,7 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
tokens.clear(); tokens.clear();
TokenizeNextLine(stream, tokens); TokenizeNextLine(stream, tokens);
unsigned numTokens = tokens.size(); unsigned int numTokens = static_cast<unsigned int>(tokens.size());
if (numTokens > 0) if (numTokens > 0)
{ {
header.clear(); header.clear();
@ -304,8 +307,8 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
if (numTokens < 3) return E_BAD_VERT_TEX_STATEMENT; if (numTokens < 3) return E_BAD_VERT_TEX_STATEMENT;
TexCoord t; TexCoord t;
t.u = (ScalarType) atof(tokens[1].c_str()); t.u = static_cast<float>(atof(tokens[1].c_str()));
t.v = (ScalarType) atof(tokens[2].c_str()); t.v = static_cast<float>(atof(tokens[2].c_str()));
texCoords.push_back(t); texCoords.push_back(t);
numTexCoords++; numTexCoords++;
@ -545,7 +548,7 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
++fi; ++fi;
++numTriangles; ++numTriangles;
int vertexesPerFace = tokens.size() -1; int vertexesPerFace = static_cast<int>(tokens.size()-1);
int iVertex = 3; int iVertex = 3;
while (iVertex < vertexesPerFace) // add other triangles while (iVertex < vertexesPerFace) // add other triangles
{ {
@ -680,7 +683,7 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
(*fi).C()[3] = faceColor[3]; (*fi).C()[3] = faceColor[3];
} }
// A face polygon composed of more than three vertices is tringulated // A face polygon composed of more than three vertices is triangulated
// according to the following schema: // according to the following schema:
// v5 // v5
// / \ // / \
@ -704,7 +707,9 @@ static int Open( OpenMeshType &m, const char * filename, Info &oi)
} }
// callback invocation, abort loading process if the call returns false // callback invocation, abort loading process if the call returns false
if ((cb !=NULL) && (((numTriangles + numVertices)%100)==0) && !(*cb)(100.0f * (float)(numTriangles + numVertices)/(float)numVerticesPlusFaces, "Face Loading")) if ((cb !=NULL) && (((numTriangles + numVertices)%100)==0) &&
!(*cb)(static_cast<int>(100.0f * static_cast<float>(numTriangles +
numVertices) / static_cast<float>(numVerticesPlusFaces)), "Face Loading"))
return E_ABORTED; return E_ABORTED;
} }
else if (header.compare("mtllib")==0) // material library else if (header.compare("mtllib")==0) // material library
@ -937,7 +942,7 @@ static bool LoadMask(const char * filename, int &mask)
} }
else if (header.compare("f")==0) else if (header.compare("f")==0)
{ {
numTriangles += (tokens.size() - 3); numTriangles += (static_cast<int>(tokens.size()) - 3);
std::string remainingText = tokens[1]; std::string remainingText = tokens[1];
// we base our assumption on the fact that the way vertex data is // we base our assumption on the fact that the way vertex data is
@ -1007,7 +1012,7 @@ static bool LoadMask(const char * filename, int &mask)
} }
else if (header.compare("f")==0) else if (header.compare("f")==0)
{ {
numTriangles += (tokens.size() - 3); numTriangles += (static_cast<int>(tokens.size()) - 3);
if (bUsingMaterial) bHasPerFaceColor = true; if (bUsingMaterial) bHasPerFaceColor = true;
} }
else if (header.compare("usemtl")==0) else if (header.compare("usemtl")==0)
@ -1129,7 +1134,7 @@ static bool LoadMask(const char * filename, int &mask)
// adding texture name into textures vector (if not already present) // adding texture name into textures vector (if not already present)
// avoid adding the same name twice // avoid adding the same name twice
bool found = false; bool found = false;
unsigned size = textures.size(); unsigned int size = static_cast<unsigned int>(textures.size());
unsigned j = 0; unsigned j = 0;
while (!found && (j < size)) while (!found && (j < size))
{ {