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

small gcc compiling issues

This commit is contained in:
Paolo Cignoni 2006-11-21 22:34:58 +00:00
parent c7909c67f1
commit 8ae108fc2a
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_ptx.h
View File

@ -23,6 +23,9 @@
/**************************************************************************** /****************************************************************************
History History
$Log: not supported by cvs2svn $ $Log: not supported by cvs2svn $
Revision 1.4 2006/11/21 19:23:50 e_cerisoli
Added comments for documentation
****************************************************************************/ ****************************************************************************/
#ifndef __VCGLIB_IMPORT_PTX #ifndef __VCGLIB_IMPORT_PTX
@ -33,6 +36,8 @@ $Log: not supported by cvs2svn $
#include <wrap/callback.h> #include <wrap/callback.h>
#include <vcg/complex/trimesh/allocate.h> #include <vcg/complex/trimesh/allocate.h>
#include <vcg/complex/trimesh/clean.h> #include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/bounding.h>
namespace vcg { namespace vcg {
namespace tri { namespace tri {
@ -184,7 +189,7 @@ namespace vcg {
bool onlypoints = ((mask & PTX_ONLY_POINTS) != 0); bool onlypoints = ((mask & PTX_ONLY_POINTS) != 0);
if(! onlypoints) if(! onlypoints)
{ {
for(OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++) for(typename OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++)
{ {
if( ((*fi).V(0)->IsD()) || ((*fi).V(1)->IsD()) || ((*fi).V(2)->IsD()) ) if( ((*fi).V(0)->IsD()) || ((*fi).V(1)->IsD()) || ((*fi).V(2)->IsD()) )
{ {
@ -202,7 +207,7 @@ namespace vcg {
if(cb) cb(85,"PTX Mesh Loading - remove bad face!"); if(cb) cb(85,"PTX Mesh Loading - remove bad face!");
vcg::tri::UpdateNormals<OpenMeshType>::PerFaceNormalized(m); vcg::tri::UpdateNormals<OpenMeshType>::PerFaceNormalized(m);
for(OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++) for(typename OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++)
if(!(*fi).IsD()) if(!(*fi).IsD())
{ {
raggio = -((*fi).V(0)->P() + (*fi).V(1)->P() + (*fi).V(2)->P()) / 3.0; raggio = -((*fi).V(0)->P() + (*fi).V(1)->P() + (*fi).V(2)->P()) / 3.0;
@ -290,7 +295,7 @@ namespace vcg {
{ {
for(OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++) for(typename OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++)
{ {
if( ((*fi).V(0)->IsD()) || ((*fi).V(1)->IsD()) || ((*fi).V(2)->IsD()) ) if( ((*fi).V(0)->IsD()) || ((*fi).V(1)->IsD()) || ((*fi).V(2)->IsD()) )
{ {
@ -307,7 +312,7 @@ namespace vcg {
Point3f raggio; Point3f raggio;
vcg::tri::UpdateNormals<OpenMeshType>::PerFaceNormalized(m); vcg::tri::UpdateNormals<OpenMeshType>::PerFaceNormalized(m);
for(OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++) for(typename OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++)
if(!(*fi).IsD()) if(!(*fi).IsD())
{ {
raggio = -((*fi).V(0)->P() + (*fi).V(1)->P() + (*fi).V(2)->P()) / 3.0; raggio = -((*fi).V(0)->P() + (*fi).V(1)->P() + (*fi).V(2)->P()) / 3.0;
@ -652,7 +657,7 @@ namespace vcg {
{ {
// now i can triangulate // now i can triangulate
int trinum = (rownum-1) * (colnum-1) * 2; int trinum = (rownum-1) * (colnum-1) * 2;
OpenMeshType::FaceIterator fi= Allocator<OpenMeshType>::AddFaces(m,trinum); typename OpenMeshType::FaceIterator fi= Allocator<OpenMeshType>::AddFaces(m,trinum);
m.fn = trinum; m.fn = trinum;
int v0i,v1i,v2i, t; int v0i,v1i,v2i, t;
t=0; t=0;
@ -712,7 +717,7 @@ namespace vcg {
} }
} }
if(cb) cb(40,"PTX Mesh Loading - remove bad vertex!"); if(cb) cb(40,"PTX Mesh Loading - remove bad vertex!");
for(OpenMeshType::VertexIterator vi = m.vert.begin(); vi != m.vert.end(); vi++) for(typename OpenMeshType::VertexIterator vi = m.vert.begin(); vi != m.vert.end(); vi++)
{ {
if((*vi).P() == Point3f(0.0, 0.0, 0.0)) if((*vi).P() == Point3f(0.0, 0.0, 0.0))
{ {
@ -724,7 +729,7 @@ namespace vcg {
onlypoints = ((mask & PTX_ONLY_POINTS) != 0); onlypoints = ((mask & PTX_ONLY_POINTS) != 0);
if(! onlypoints) if(! onlypoints)
{ {
for(OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++) for(typename OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++)
{ {
if( ((*fi).V(0)->IsD()) || ((*fi).V(1)->IsD()) || ((*fi).V(2)->IsD()) ) if( ((*fi).V(0)->IsD()) || ((*fi).V(1)->IsD()) || ((*fi).V(2)->IsD()) )
{ {
@ -739,7 +744,7 @@ namespace vcg {
Point3f raggio; Point3f raggio;
vcg::tri::UpdateNormals<OpenMeshType>::PerFaceNormalized(m); vcg::tri::UpdateNormals<OpenMeshType>::PerFaceNormalized(m);
for(OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++) for(typename OpenMeshType::FaceIterator fi = m.face.begin(); fi != m.face.end(); fi++)
if(!(*fi).IsD()) if(!(*fi).IsD())
{ {
raggio = -((*fi).V(0)->P() + (*fi).V(1)->P() + (*fi).V(2)->P()) / 3.0; raggio = -((*fi).V(0)->P() + (*fi).V(1)->P() + (*fi).V(2)->P()) / 3.0;
@ -751,7 +756,7 @@ namespace vcg {
} }
} }
} }
for(OpenMeshType::VertexIterator vi = m.vert.begin(); vi != m.vert.end(); vi++) for(typename OpenMeshType::VertexIterator vi = m.vert.begin(); vi != m.vert.end(); vi++)
{ {
if(!(*vi).IsD()) if(!(*vi).IsD())
(*vi).P() = currtrasf * (*vi).P(); (*vi).P() = currtrasf * (*vi).P();