From 283834183dd9b820353e809952abc0166ffbc821 Mon Sep 17 00:00:00 2001 From: cignoni Date: Thu, 25 May 2006 09:40:14 +0000 Subject: [PATCH] gcc dislike doubleline comments; removed. --- wrap/gl/pick.h | 8 +++++--- wrap/gl/trimesh.h | 5 ++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/wrap/gl/pick.h b/wrap/gl/pick.h index a7e13920..d509350d 100644 --- a/wrap/gl/pick.h +++ b/wrap/gl/pick.h @@ -29,7 +29,7 @@ #include #include - +#include namespace vcg{ template @@ -212,7 +212,8 @@ static int PickTetra(int x, int y, TETRA_MESH_TYPE &m, std::vector //xstring buf; //if (hits <= 0) return 0; std::vector< std::pair > H; - for(int ii=0;ii(selectBuf[ii*4+1]/4294967295.0,selectBuf[ii*4+3])); } @@ -303,7 +304,8 @@ static int PickTetraFace(int x, int y, TETRA_MESH_TYPE &m, std::vector > H; - for(int ii=0;ii(selectBuf[ii*4+1]/4294967295.0,selectBuf[ii*4+3])); } diff --git a/wrap/gl/trimesh.h b/wrap/gl/trimesh.h index 2653740f..d2110a06 100644 --- a/wrap/gl/trimesh.h +++ b/wrap/gl/trimesh.h @@ -24,6 +24,9 @@ History $Log: not supported by cvs2svn $ +Revision 1.19 2006/02/13 13:05:05 cignoni +Removed glew inclusion + Revision 1.18 2006/02/09 10:00:39 cignoni Switched from rough zoffset to glpolygonoffset for hiddenline and flatlines modes. Less zfighting... @@ -775,7 +778,7 @@ void Crease(MESH_TYPE &m, typename MESH_TYPE::scalar_type angleRad) if(he.v == he.f->V(he.z)) spl.z=he.z; if(he.v == he.f->V((he.z+1)%3)) spl.z=(he.z+1)%3; assert(spl.z>=0); - //VCTRACE(" -- spinning face vert %i Adding spl face %i vert %i\n",\ + //VCTRACE(" -- spinning face vert %i Adding spl face %i vert %i\n", // he.v-m.vert.begin(), spl.f-m.face.begin(), spl.z ); assert((spl.f->Supervisor_Flags() & vis[spl.z] )==0); spl.f->Supervisor_Flags() |= vis[spl.z];