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

line 423 replaced assignment with Import call to make possible compile with non floats

This commit is contained in:
Nico Pietroni 2012-11-07 21:48:01 +00:00
parent 8e9430889c
commit 57adeea537
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wrap/io_trimesh/import_off.h
View File

@ -410,7 +410,7 @@ namespace vcg
nFaces += trigs; nFaces += trigs;
Allocator<MESH_TYPE>::AddFaces(mesh, trigs); Allocator<MESH_TYPE>::AddFaces(mesh, trigs);
std::vector<int> vertIndices(vert_per_face); std::vector<int> vertIndices(vert_per_face);
std::vector<vcg::Point3f > polygonVect(vert_per_face); // vec of polygon loops used for the triangulation of polygonal face std::vector<vcg::Point3f > polygonVect(vert_per_face); // vec of polygon loops used for the triangulation of polygonal face
for (int j=0; j < vert_per_face; j++) for (int j=0; j < vert_per_face; j++)
{ {
if (k == tokens.size()) // if EOL // Go to next line when needed if (k == tokens.size()) // if EOL // Go to next line when needed
@ -420,7 +420,7 @@ namespace vcg
k = 0; k = 0;
} }
vertIndices[j] = atoi(tokens[k].c_str()); vertIndices[j] = atoi(tokens[k].c_str());
polygonVect[j] = mesh.vert[ vertIndices[j] ].P(); polygonVect[j].Import<ScalarType> (mesh.vert[ vertIndices[j] ].P());
k++; k++;
} }
if(vert_per_face==4) if(vert_per_face==4)
@ -449,7 +449,7 @@ namespace vcg
{ {
std::vector<int> indexTriangulatedVect; std::vector<int> indexTriangulatedVect;
// TessellatePlanarPolygon3(polygonVect,indexTriangulatedVect); // TessellatePlanarPolygon3(polygonVect,indexTriangulatedVect);
std::vector< std::vector<Point3f> > loopVect; std::vector< std::vector<Point3f> > loopVect;
loopVect.push_back(polygonVect); loopVect.push_back(polygonVect);
#ifdef __gl_h_ #ifdef __gl_h_
//qDebug("OK: using opengl tessellation for a polygon of %i vertices",vertexesPerFace); //qDebug("OK: using opengl tessellation for a polygon of %i vertices",vertexesPerFace);