Ongoing Rearrangement of filepath

replaced the path to comply the filepaths modification.
The replacements are as follows:

/complex/trimesh/base.h --> /complex/complex.h
/complex/trimesh/allocate.h --> /complex/allocate.h
/complex/trimesh/append.h --> /complex/append.h
/complex/trimesh/ --> /complex/algorithms/
/complex/local_optimization/ ---> /complex/algorithms/local_optimization/
/complex/local_optimization.h ---> /complex/algorithms/local_optimization.h
/complex/intersection.h ---> /complex/algorithms/intersection.h
/complex/boundary.h ---> /complex/algorithms/boundary.h
This commit is contained in:
ganovelli 2011-04-01 17:07:57 +00:00
parent 1fc83af05c
commit 5909925947
27 changed files with 153 additions and 153 deletions

View File

@ -12,11 +12,11 @@
#include<vcg/simplex/face/component_rt.h>
#include<vcg/simplex/face/distance.h>
#include<vcg/complex/trimesh/base.h>
#include <vcg/complex/trimesh/create/platonic.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/edges.h>
#include <vcg/complex/trimesh/update/flag.h>
#include<vcg/complex/complex.h>
#include <vcg/complex/algorithms/create/platonic.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/edges.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/space/intersection3.h>
#include <vcg/space/index/aabb_binary_tree/aabb_binary_tree.h>

View File

@ -33,15 +33,15 @@
#include <vcg/connectors/hedge.h>
/*include the base definition for the trimesh*/
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/complex.h>
/*include the algorithms for updating: */
#include <vcg/complex/trimesh/update/topology.h> /* topology */
#include <vcg/complex/trimesh/update/bounding.h> /* bounding box */
#include <vcg/complex/trimesh/update/normal.h> /* normal */
#include <vcg/complex/algorithms/update/topology.h> /* topology */
#include <vcg/complex/algorithms/update/bounding.h> /* bounding box */
#include <vcg/complex/algorithms/update/normal.h> /* normal */
/*include the algorithms for mesh fixing */
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/algorithms/clean.h>
/*include the importer from disk*/
#include <wrap/io_trimesh/import.h>
@ -50,13 +50,13 @@
#include <wrap/io_trimesh/export_ply.h>
/* include the support for polygon meshes (function to convert from/to trimesh)*/
#include <vcg/complex/trimesh/polygon_support.h>
#include <vcg/complex/algorithms/polygon_support.h>
/* include the support for polygon meshes (the component for the face )*/
#include <vcg/simplex/face/component_polygon.h>
/* include the support for half edges */
#include <vcg/complex/trimesh/update/halfedge_indexed.h>
#include <vcg/complex/algorithms/update/halfedge_indexed.h>
using namespace vcg;

View File

@ -35,15 +35,15 @@
#include <vcg/connectors/hedge.h>
/*include the base definition for the trimesh*/
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/complex.h>
/*include the algorithms for updating: */
#include <vcg/complex/trimesh/update/topology.h> /* topology */
#include <vcg/complex/trimesh/update/bounding.h> /* bounding box */
#include <vcg/complex/trimesh/update/normal.h> /* normal */
#include <vcg/complex/algorithms/update/topology.h> /* topology */
#include <vcg/complex/algorithms/update/bounding.h> /* bounding box */
#include <vcg/complex/algorithms/update/normal.h> /* normal */
/*include the algorithms for mesh fixing */
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/algorithms/clean.h>
/*include the importer from disk*/
#include <wrap/io_trimesh/import.h>
@ -51,21 +51,21 @@
#include <wrap/io_trimesh/export_off.h>
/* include the support for polygon meshes (function to convert from/to trimesh)*/
#include <vcg/complex/trimesh/polygon_support.h>
#include <vcg/complex/algorithms/polygon_support.h>
/* include the support for polygon meshes (the component for the face )*/
#include <vcg/simplex/face/component_polygon.h>
/* include the support for half edges */
#include <vcg/complex/trimesh/update/halfedge_indexed.h>
#include <vcg/complex/algorithms/update/halfedge_indexed.h>
#include <vcg/complex/local_optimization/quad_diag_collapse.h>
#include <vcg/complex/algorithms/local_optimization/quad_diag_collapse.h>
#include <vcg/complex/trimesh/update/edges.h>
#include <vcg/complex/algorithms/update/edges.h>
#include <vcg/simplex/face/component_rt.h>
#include <vcg/complex/trimesh/update/fitmaps.h>
#include <vcg/complex/algorithms/update/fitmaps.h>
using namespace vcg;
using namespace std;

View File

@ -40,10 +40,10 @@ Initial release.
/// vcg imports
#include <vcg/simplex/vertex/base.h>
#include <vcg/simplex/face/base.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/create/platonic.h>
#include <vcg/complex/complex.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/create/platonic.h>
/// wrapper imports
#include <wrap/io_trimesh/import.h>

View File

@ -3,8 +3,8 @@
#include<vcg/simplex/vertex/component.h>
#include<vcg/simplex/face/base.h>
#include<vcg/simplex/face/component.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/trimesh/allocate.h>
#include<vcg/complex/complex.h>
#include<vcg/complex/allocate.h>
class MyEdge;

View File

@ -2,19 +2,19 @@
// mesh definition
//#include <vcg/simplex/vertex/with/vn.h>
//#include <vcg/simplex/face/with/af.h>
//#include <vcg/complex/trimesh/base.h>
//#include <vcg/complex/complex.h>
#include<vcg/simplex/vertex/base.h>
#include<vcg/simplex/face/base.h>
#include<vcg/simplex/face/topology.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/complex.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/create/ball_pivoting.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/create/ball_pivoting.h>
// input output
#include <wrap/io_trimesh/import_ply.h>

View File

@ -30,17 +30,17 @@
#include<vcg/simplex/face/component.h>
#include<vcg/simplex/face/topology.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/complex.h>
// input output
#include<wrap/io_trimesh/import.h>
#include<wrap/io_trimesh/export.h>
// topology computation
#include<vcg/complex/trimesh/update/topology.h>
#include<vcg/complex/algorithms/update/topology.h>
// normals
#include<vcg/complex/trimesh/update/normal.h>
#include<vcg/complex/algorithms/update/normal.h>
using namespace vcg;
using namespace std;

View File

@ -5,7 +5,7 @@
#include <vcg/simplex/face/base.h>
#include <vcg/simplex/face/component.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/complex.h>
class MyEdge;
class MyFace;

View File

@ -2,19 +2,19 @@
// mesh definition
//#include <vcg/simplex/vertex/with/vn.h>
//#include <vcg/simplex/face/with/af.h>
//#include <vcg/complex/trimesh/base.h>
//#include <vcg/complex/complex.h>
#include<vcg/simplex/vertex/base.h>
#include<vcg/simplex/face/base.h>
#include<vcg/simplex/face/topology.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/complex.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/clustering.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/clustering.h>
// input output
#include <wrap/io_trimesh/import_ply.h>

View File

@ -5,19 +5,19 @@
#include<vcg/simplex/vertex/base.h>
#include<vcg/simplex/face/base.h>
#include<vcg/simplex/face/topology.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/trimesh/hole.h>
#include<vcg/complex/local_optimization.h>
#include<vcg/complex/local_optimization/tri_edge_flip.h>
#include<vcg/complex/trimesh/smooth.h>
#include<vcg/complex/trimesh/refine.h>
#include<vcg/complex/complex.h>
#include<vcg/complex/algorithms/hole.h>
#include<vcg/complex/algorithms/local_optimization.h>
#include<vcg/complex/algorithms/local_optimization/tri_edge_flip.h>
#include<vcg/complex/algorithms/smooth.h>
#include<vcg/complex/algorithms/refine.h>
#include<vcg/complex/trimesh/update/selection.h>
#include<vcg/complex/algorithms/update/selection.h>
// topology computation
#include<vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/update/normal.h>
#include<vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/update/normal.h>
// half edge iterators
#include<vcg/simplex/face/pos.h>

View File

@ -7,13 +7,13 @@ using namespace std;
#include<vcg/simplex/edge/component.h>
#include<vcg/simplex/vertex/base.h>
#include<vcg/simplex/face/base.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/edges.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/intersection.h>
#include <vcg/complex/complex.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/edges.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/clean.h>
#include <vcg/complex/algorithms/intersection.h>
#include <vcg/space/index/grid_static_ptr.h>
//#include <vcg/simplex/edge/with/ae.h>
#include <vcg/complex/edgemesh/base.h>

View File

@ -4,11 +4,11 @@
#include <vcg/math/perlin_noise.h>
#include <vcg/simplex/vertex/base.h>
#include <vcg/simplex/face/base.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/trimesh/allocate.h>
#include <vcg/complex/trimesh/create/marching_cubes.h>
#include <vcg/complex/trimesh/create/extended_marching_cubes.h>
#include <vcg/complex/trimesh/create/mc_trivial_walker.h>
#include <vcg/complex/complex.h>
#include <vcg/complex/allocate.h>
#include <vcg/complex/algorithms/create/marching_cubes.h>
#include <vcg/complex/algorithms/create/extended_marching_cubes.h>
#include <vcg/complex/algorithms/create/mc_trivial_walker.h>
#include <wrap/io_trimesh/export_ply.h>

View File

@ -4,12 +4,12 @@
#include<vcg/simplex/face/base.h>
#include<vcg/simplex/face/topology.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/trimesh/allocate.h>
#include<vcg/complex/trimesh/append.h>
#include<vcg/complex/trimesh/clean.h>
#include<vcg/complex/trimesh/clip.h>
#include<vcg/complex/trimesh/update/bounding.h>
#include<vcg/complex/complex.h>
#include<vcg/complex/allocate.h>
#include<vcg/complex/append.h>
#include<vcg/complex/algorithms/clean.h>
#include<vcg/complex/algorithms/clip.h>
#include<vcg/complex/algorithms/update/bounding.h>
// input output

View File

@ -1,7 +1,7 @@
#ifndef _MESH_DEF_
#define _MESH_DEF_
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/complex.h>
#include<vcg/simplex/vertex/base.h>
#include<vcg/simplex/face/base.h>
#include<vcg/simplex/face/topology.h>

View File

@ -2,13 +2,13 @@
#include <time.h>
#include "mesh_definition.h"
#include<vcg/complex/trimesh/allocate.h>
#include<vcg/complex/trimesh/create/platonic.h>
#include<vcg/complex/trimesh/update/topology.h>
#include<vcg/complex/trimesh/update/flag.h>
#include<vcg/complex/trimesh/update/normal.h>
#include<vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/refine.h>
#include<vcg/complex/allocate.h>
#include<vcg/complex/algorithms/create/platonic.h>
#include<vcg/complex/algorithms/update/topology.h>
#include<vcg/complex/algorithms/update/flag.h>
#include<vcg/complex/algorithms/update/normal.h>
#include<vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/refine.h>
using namespace vcg;
using namespace std;
@ -60,33 +60,33 @@ cmof.face.EnableFFAdjacency();
cmof.vert.EnableQuality();
unsigned int hh = 0;
for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi,++hh){
if(hh%3==0)
vcg::tri::Allocator<CMeshOcf>::DeleteVertex(cmof,*vi);
}
for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi)
{
if(!(*vi).IsD())
{
float q =vi->Q();
float r =vi->R();
int ii = vi - cmof.vert.begin();
assert(q==r);
}
}
tri::Allocator<CMeshOcf>::CompactVertexVector(cmof);
tri::UpdateBounding<CMeshOcf>::Box(cmof);
for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi)
{
if(!(*vi).IsD())
{
float q =vi->Q();
float r =vi->R();
int ii = vi - cmof.vert.begin();
assert(q==r);
}
for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi,++hh){
if(hh%3==0)
vcg::tri::Allocator<CMeshOcf>::DeleteVertex(cmof,*vi);
}
for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi)
{
if(!(*vi).IsD())
{
float q =vi->Q();
float r =vi->R();
int ii = vi - cmof.vert.begin();
assert(q==r);
}
}
tri::Allocator<CMeshOcf>::CompactVertexVector(cmof);
tri::UpdateBounding<CMeshOcf>::Box(cmof);
for(CMeshOcf::VertexIterator vi = cmof.vert.begin(); vi!=cmof.vert.end();++vi)
{
if(!(*vi).IsD())
{
float q =vi->Q();
float r =vi->R();
int ii = vi - cmof.vert.begin();
assert(q==r);
}
}

View File

@ -4,9 +4,9 @@
#include <vcg/simplex/face/base.h>
#include <vcg/simplex/face/component.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/complex.h>
#include<vcg/complex/trimesh/create/platonic.h>
#include<vcg/complex/algorithms/create/platonic.h>
class MyEdge;
class MyFace;

View File

@ -4,9 +4,9 @@
#include <vcg/simplex/face/base.h>
#include <vcg/simplex/face/component.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/complex.h>
#include<vcg/complex/trimesh/create/platonic.h>
#include<vcg/complex/algorithms/create/platonic.h>
class MyEdge;
class MyFace;

View File

@ -5,10 +5,10 @@
#include <vcg/simplex/face/base.h>
#include <vcg/simplex/face/component.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/complex.h>
#include<vcg/container/simple_temporary_data.h>
#include<vcg/complex/trimesh/create/platonic.h>
#include<vcg/complex/algorithms/create/platonic.h>
class MyEdge;
class MyFace;

View File

@ -45,9 +45,9 @@ cvs problem during frist committ. repeated
#include <wrap/gl/picking.h>
#include <wrap/gl/space.h>
#include <wrap/gl/pos.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/topology.h>
GLWidget::GLWidget(QWidget *parent)

View File

@ -34,7 +34,7 @@ first draft. Working but ugly interface. right mouse of the button to place a p
/** the definition of face */
#include<vcg/simplex/face/base.h>
/** definition of triangle mesh */
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/complex.h>
/** allocation vertices and faces of triangle mesh */
#include<wrap/io_trimesh/import_PLY.h>

View File

@ -5,10 +5,10 @@
#include <vcg/simplex/face/base.h>
#include <vcg/simplex/face/component.h>
#include <vcg/complex/trimesh/base.h>
#include<vcg/complex/trimesh/create/platonic.h>
#include <vcg/complex/complex.h>
#include<vcg/complex/algorithms/create/platonic.h>
#include<vcg/complex/trimesh/update/topology.h>
#include<vcg/complex/algorithms/update/topology.h>
#include <vcg/simplex/face/pos.h>

View File

@ -5,10 +5,10 @@
#include <vcg/simplex/face/base.h>
#include <vcg/simplex/face/component.h>
#include <vcg/complex/trimesh/base.h>
#include<vcg/complex/trimesh/create/platonic.h>
#include <vcg/complex/complex.h>
#include<vcg/complex/algorithms/create/platonic.h>
#include<vcg/complex/trimesh/update/topology.h>
#include<vcg/complex/algorithms/update/topology.h>
#include <vcg/simplex/face/pos.h>

View File

@ -6,19 +6,19 @@ using namespace std;
#include<vcg/simplex/edge/base.h>
#include<vcg/simplex/vertex/base.h>
#include<vcg/simplex/face/base.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/edges.h>
#include <vcg/complex/trimesh/update/bounding.h>
#include <vcg/complex/trimesh/update/quality.h>
#include <vcg/complex/trimesh/update/color.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/stat.h>
#include <vcg/complex/trimesh/clean.h>
#include <vcg/complex/intersection.h>
#include <vcg/complex/complex.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/edges.h>
#include <vcg/complex/algorithms/update/bounding.h>
#include <vcg/complex/algorithms/update/quality.h>
#include <vcg/complex/algorithms/update/color.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/stat.h>
#include <vcg/complex/algorithms/clean.h>
#include <vcg/complex/algorithms/intersection.h>
#include <vcg/space/index/grid_static_ptr.h>
#include <vcg/space/index/spatial_hashing.h>
#include <vcg/complex/trimesh/closest.h>
#include <vcg/complex/algorithms/closest.h>
// VCG File Format Importer/Exporter
#include <wrap/io_trimesh/import.h>

View File

@ -3,15 +3,15 @@
#include<vcg/simplex/face/component_ocf.h>
#include<vcg/simplex/face/topology.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/complex.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/trimesh/update/flag.h>
#include <vcg/complex/trimesh/refine.h>
#include <vcg/complex/trimesh/refine_loop.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/normal.h>
#include <vcg/complex/algorithms/update/flag.h>
#include <vcg/complex/algorithms/refine.h>
#include <vcg/complex/algorithms/refine_loop.h>
#include <vcg/complex/trimesh/bitquad_creation.h>
#include <vcg/complex/algorithms/bitquad_creation.h>
// input output
#include <wrap/io_trimesh/import_ply.h>

View File

@ -4,13 +4,13 @@
#include<vcg/simplex/face/base.h>
#include<vcg/simplex/face/topology.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/complex.h>
#include <vcg/complex/trimesh/update/topology.h>
#include <vcg/complex/trimesh/update/normal.h>
#include <vcg/complex/algorithms/update/topology.h>
#include <vcg/complex/algorithms/update/normal.h>
// to clean up a mesh
#include<vcg/complex/trimesh/clean.h>
#include<vcg/complex/trimesh/smooth.h>
#include<vcg/complex/algorithms/clean.h>
#include<vcg/complex/algorithms/smooth.h>
// input output
#include <wrap/io_trimesh/import.h>

View File

@ -4,8 +4,8 @@
#include <vcg/simplex/vertex/component_ocf.h>
#include <vcg/simplex/face/base.h>
#include <vcg/simplex/face/component_ocf.h>
#include <vcg/complex/trimesh/base.h>
#include <vcg/complex/trimesh/attribute_seam.h>
#include <vcg/complex/complex.h>
#include <vcg/complex/algorithms/attribute_seam.h>
#include <wrap/io_trimesh/import_ply.h>
#include <wrap/io_trimesh/export_ply.h>

View File

@ -3,11 +3,11 @@
#include<vcg/simplex/vertex/base.h>
#include<vcg/simplex/face/base.h>
#include<vcg/simplex/face/topology.h>
#include<vcg/complex/trimesh/base.h>
#include<vcg/complex/trimesh/create/platonic.h>
#include<vcg/complex/complex.h>
#include<vcg/complex/algorithms/create/platonic.h>
// topology computation
#include<vcg/complex/trimesh/update/topology.h>
#include<vcg/complex/algorithms/update/topology.h>
// half edge iterators
#include<vcg/simplex/face/pos.h>