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

Removed a few harmless warnings

This commit is contained in:
Paolo Cignoni 2009-03-30 20:58:18 +00:00
parent 066c2bdb8b
commit 3447c82e88
10 changed files with 14 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sample/trimesh_base/trimesh_base.pro
View File

@ -8,4 +8,4 @@ DEPENDPATH += .
INCLUDEPATH += . ../../.. INCLUDEPATH += . ../../..
CONFIG += console stl CONFIG += console stl
TEMPLATE = app TEMPLATE = app
SOURCES += trimesh_base.cpp SOURCES += trimesh_base.cpp ../../../wrap/ply/plylib.cpp

9
apps/sample/trimesh_intersection/trimesh_intersection.cpp
View File

@ -75,8 +75,6 @@ int main(int argc,char ** argv)
if (dup > 0 || unref > 0) if (dup > 0 || unref > 0)
printf("Removed %i duplicate and %i unreferenced vertices from mesh %s\n",dup,unref,argv[1]); printf("Removed %i duplicate and %i unreferenced vertices from mesh %s\n",dup,unref,argv[1]);
printf("");
// Compute cross-intersection with the given plane // Compute cross-intersection with the given plane
///////////////////////////////////////////////////////// /////////////////////////////////////////////////////////
@ -106,11 +104,8 @@ int main(int argc,char ** argv)
vcg::edg::UpdateBounding<MyEdgeMesh>::Box(edge_mesh); vcg::edg::UpdateBounding<MyEdgeMesh>::Box(edge_mesh);
// export the cross-section // export the cross-section
vcg::edg::io::SVGProperties pr; edg::io::SVGProperties pro;
pr.setScale(500/(float)edge_mesh.bbox.Diag()); if (edg::io::ExporterSVG<MyEdgeMesh>::Save(edge_mesh, "out.svg",pro))
pr.setDimension(500,500);
if (vcg::edg::io::ExporterSVG<MyEdgeMesh>::Save(&edge_mesh, "out.svg",pr))
printf(" The cross-intersection has been successfully saved (OUT.SVG).\n"); printf(" The cross-intersection has been successfully saved (OUT.SVG).\n");
else else
printf(" The cross-intersection cannot be saved.\n"); printf(" The cross-intersection cannot be saved.\n");

2
apps/sample/trimesh_isosurface/trimesh_isosurface.cpp
View File

@ -1,5 +1,4 @@
#include <stdio.h> #include <stdio.h>
#include <wrap/io_trimesh/export_ply.h>
#include <vcg/space/point3.h> #include <vcg/space/point3.h>
#include <vcg/space/box3.h> #include <vcg/space/box3.h>
#include <vcg/math/perlin_noise.h> #include <vcg/math/perlin_noise.h>
@ -9,6 +8,7 @@
#include <vcg/complex/trimesh/allocate.h> #include <vcg/complex/trimesh/allocate.h>
#include <vcg/complex/trimesh/create/marching_cubes.h> #include <vcg/complex/trimesh/create/marching_cubes.h>
#include <vcg/complex/trimesh/create/extended_marching_cubes.h> #include <vcg/complex/trimesh/create/extended_marching_cubes.h>
#include <wrap/io_trimesh/export_ply.h>
#include "simple_volume.h" #include "simple_volume.h"

3
apps/sample/trimesh_refine/trimesh_refine.cpp
View File

@ -1,8 +1,5 @@
// mesh definition // mesh definition
//#include <vcg/simplex/vertex/with/vn.h>
//#include <vcg/simplex/face/with/af.h>
//#include <vcg/complex/trimesh/base.h>
#include<vcg/simplex/vertex/base.h> #include<vcg/simplex/vertex/base.h>
#include<vcg/simplex/face/base.h> #include<vcg/simplex/face/base.h>

4
vcg/complex/local_optimization/tri_edge_collapse.h
View File

@ -163,9 +163,7 @@ public:
inline void Execute(TriMeshType &m) inline void Execute(TriMeshType &m)
{ {
CoordType MidPoint=(pos.V(0)->P()+pos.V(1)->P())/2.0; CoordType MidPoint=(pos.V(0)->P()+pos.V(1)->P())/2.0;
int FaceDel=DoCollapse(m, pos, MidPoint); /* int FaceDel = */ DoCollapse(m, pos, MidPoint);
//m.fn-=FaceDel;
//--m.vn;
} }
static bool IsSymmetric() { return true;} static bool IsSymmetric() { return true;}

7
vcg/complex/trimesh/clean.h
View File

@ -225,9 +225,10 @@ Initial Release
#include <vcg/complex/trimesh/base.h> #include <vcg/complex/trimesh/base.h>
#include <vcg/complex/trimesh/closest.h> #include <vcg/complex/trimesh/closest.h>
#include <vcg/space/index/grid_static_ptr.h> #include <vcg/space/index/grid_static_ptr.h>
#include<vcg/complex/trimesh/allocate.h> #include <vcg/complex/trimesh/allocate.h>
#include<vcg/complex/trimesh/update/selection.h> #include <vcg/complex/trimesh/update/selection.h>
#include<vcg/complex/trimesh/update/flag.h> #include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/topology.h> #include <vcg/complex/trimesh/update/topology.h>
#include <vcg/space/triangle3.h> #include <vcg/space/triangle3.h>

2
vcg/complex/trimesh/create/platonic.h
View File

@ -195,7 +195,7 @@ void Dodecahedron(DodMeshType & in)
Allocator<DodMeshType>::AddVertices(in,20+12); Allocator<DodMeshType>::AddVertices(in,20+12);
Allocator<DodMeshType>::AddFaces(in, 5*12); // five pentagons, each made by 5 tri Allocator<DodMeshType>::AddFaces(in, 5*12); // five pentagons, each made by 5 tri
int h,i,j,k=0,m=0; int h,i,j,m=0;
bool used[N_points]; bool used[N_points];
for (i=0; i<N_points; i++) used[i]=false; for (i=0; i<N_points; i++) used[i]=false;

3
vcg/complex/trimesh/refine.h
View File

@ -424,9 +424,6 @@ bool RefineE(MESH_TYPE &m, MIDPOINT mid, EDGEPRED ep,bool RefineSelected=false,
vv[0]=(*fi).V(0); vv[0]=(*fi).V(0);
vv[1]=(*fi).V(1); vv[1]=(*fi).V(1);
vv[2]=(*fi).V(2); vv[2]=(*fi).V(2);
bool e0=RD[fi].ep[0];
bool e1=RD[fi].ep[1];
bool e2=RD[fi].ep[2];
vv[3] = RD[fi].vp[0]; vv[3] = RD[fi].vp[0];
vv[4] = RD[fi].vp[1]; vv[4] = RD[fi].vp[1];
vv[5] = RD[fi].vp[2]; vv[5] = RD[fi].vp[2];

26
vcg/container/vector_occ.h
View File

@ -20,32 +20,6 @@
* for more details. * * for more details. *
* * * *
****************************************************************************/ ****************************************************************************/
/****************************************************************************
History
$Log: not supported by cvs2svn $
Revision 1.4 2006/12/04 11:11:07 ganovelli
add const to IsEnabledAttribute
Revision 1.3 2006/12/03 18:01:01 ganovelli
versione compliant vs2005
Revision 1.2 2006/06/08 20:28:38 ganovelli
Corretto IsEnabledAttribute
Revision 1.1 2005/10/15 16:21:49 ganovelli
Working release (compilata solo su MSVC), vector_occ <EFBFBD> migrato da component_opt
Revision 1.5 2005/07/07 13:33:52 ganovelli
some comment
Revision 1.4 2004/04/05 18:20:08 ganovelli
Aggiunto typename
Revision 1.3 2004/03/31 22:36:44 ganovelli
First Working Release (with this comment)
/****************************************************************************/
#ifndef __VCGLIB_TRACED_VECTOR__ #ifndef __VCGLIB_TRACED_VECTOR__
#define __VCGLIB_TRACED_VECTOR__ #define __VCGLIB_TRACED_VECTOR__

4
wrap/ply/plylib.cpp
View File

@ -82,10 +82,12 @@ Initial commit
#ifdef WIN32 #ifdef WIN32
#define assert ASSERT #define assert ASSERT
#pragma warning( disable : 4267 )
#else #else
#include <assert.h> #include <assert.h>
#endif #endif
#ifdef _MSC_VER
#pragma warning( disable : 4267 )
#endif
#ifdef WIN32 #ifdef WIN32
#include <direct.h> #include <direct.h>