diff --git a/apps/sample/trimesh_isosurface/trimesh_isosurface.cpp b/apps/sample/trimesh_isosurface/trimesh_isosurface.cpp index c89c6b24..c05383aa 100644 --- a/apps/sample/trimesh_isosurface/trimesh_isosurface.cpp +++ b/apps/sample/trimesh_isosurface/trimesh_isosurface.cpp @@ -3,6 +3,10 @@ #include #include #include +#include +#include +#include +#include #include "trivial_walker.h" #include #include @@ -10,10 +14,6 @@ using namespace std; using namespace vcg; -#include -#include -#include -#include typedef float ScalarType; @@ -64,9 +64,9 @@ public: } -enum { XAxis=0,YAxis=1,ZAxis=2} VolumeAxis; +typedef enum { XAxis=0,YAxis=1,ZAxis=2} VolumeAxis; -template < class VertexPointerType, enum VolumeAxis AxisVal > +template < class VertexPointerType, VolumeAxis AxisVal > void GetIntercept(const vcg::Point3i &p1, const vcg::Point3i &p2, VertexPointerType &v, const float thr) { float f1 = Val(p1.X(), p1.Y(), p1.Z())-thr; @@ -100,9 +100,9 @@ public: { // Funzioni superiori UNDEF=0, - BYTE=1; - SHORT=2; - FLOAT=3; + BYTE=1, + SHORT=2, + FLOAT=3 }; static bool Open(const char *filename, VolumeType &V, Point3i sz, DataType d)