From f3d28fb7106bd7dfb87fc3c459f959f222806a6c Mon Sep 17 00:00:00 2001 From: nicopietroni Date: Fri, 20 Jan 2006 16:37:23 +0000 Subject: [PATCH] erased extended marching cube method call. --- vcg/complex/trimesh/create/resampler.h | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/vcg/complex/trimesh/create/resampler.h b/vcg/complex/trimesh/create/resampler.h index 45fcba96..fda6c0fe 100644 --- a/vcg/complex/trimesh/create/resampler.h +++ b/vcg/complex/trimesh/create/resampler.h @@ -4,7 +4,7 @@ #include #include #include -#include +//#include #include #include #include @@ -15,12 +15,6 @@ namespace vcg { namespace trimesh { -class RES -{ -public: - - enum MarchMode {MMarchingCubes,MExtendedMarchingCubes} ; -}; /** \addtogroup trimesh */ /*@{*/ @@ -29,11 +23,10 @@ public: This is class reasmpling a mesh using marching cubes methods @param OLD_MESH_TYPE (Template Parameter) Specifies the type of mesh to be resampled @param NEW_MESH_TYPE (Template Parameter) Specifies the type of output mesh. - @param MARCHING_ALGORITHM (Template Parameter) Specifies the type of marching cube algorithm (extended or not). */ template -class Resampler:RES +class Resampler { typedef typename OLD_MESH_TYPE Old_Mesh; typedef typename NEW_MESH_TYPE New_Mesh; @@ -620,10 +613,8 @@ public: typedef typename Walker< Old_Mesh,New_Mesh> MyWalker; typedef typename vcg::tri::MarchingCubes MarchingCubes; -typedef typename vcg::tri::ExtendedMarchingCubes ExtendedMarchingCubes; ///resample the mesh using marching cube algorithm ,the accuracy is the dimension of one cell the parameter -template static void Resample(Old_Mesh &old_mesh,New_Mesh &new_mesh,vcg::Point3 accuracy,float max_dist) { new_mesh.Clear(); @@ -666,16 +657,16 @@ static void Resample(Old_Mesh &old_mesh,New_Mesh &new_mesh,vcg::Point3 accu /*new_mesh.vert.reserve(old_mesh.vn*2); new_mesh.face.reserve(old_mesh.fn*2);*/ - if (mm==MMarchingCubes) - { + /*if (mm==MMarchingCubes) + {*/ MarchingCubes mc(new_mesh, walker); walker.BuildMesh(old_mesh,new_mesh,mc); - } - else if (mm==MExtendedMarchingCubes) + /*}*/ + /*else if (mm==MExtendedMarchingCubes) { ExtendedMarchingCubes mc(new_mesh, walker,30); walker.BuildMesh(old_mesh,new_mesh,mc); - } + }*/