Changeset 1025 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/SimplificationMethod.h

Timestamp:

06/20/06 13:28:51 (18 years ago)

Author:

gumbau

Message:

namespace simplif

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/SimplificationMethod.h (modified) (3 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/SimplificationMethod.h

@@ -6 +6 @@
 #include <list>
 #include <iostream>
-#include <qslim.h>
+#include <simplif.h>
 #include <GeoMeshSimplifier.h>
 
@@ -13 +13 @@
 private:
         Geometry::Mesh  *mGeoMesh;
-        void compute_pair_info(qslim::pair_info*);
-        qslim::Model M0;
-        qslim::array<qslim::vert_info> vinfo;
-        qslim::Heap *heap;
-        qslim::real proximity_limit;    // distance threshold squared
+        void compute_pair_info(simplif::pair_info*);
+        simplif::Model M0;
+        simplif::array<simplif::vert_info> vinfo;
+        simplif::Heap *heap;
+        simplif::real proximity_limit;    // distance threshold squared
         int initialVertCount;
         int initialEdgeCount;
         int initialFaceCount;
 
-        inline qslim::vert_info& vertex_info(qslim::Vertex *v)
+        inline simplif::vert_info& vertex_info(simplif::Vertex *v)
         {
                 return vinfo(v->validID());
         }
         
-        qslim::real pair_mesh_penalty(qslim::Model& M,
-                                                                                                                                qslim::Vertex *v1,
-                                                                                                                                qslim::Vertex *v2,
-                                                                                                                                qslim::Vec3& vnew);
+        simplif::real pair_mesh_penalty(simplif::Model& M,
+                                                                                                                                simplif::Vertex *v1,
+                                                                                                                                simplif::Vertex *v2,
+                                                                                                                                simplif::Vec3& vnew);
         
-        int predict_face(qslim::Face& F,
-                                                                        qslim::Vertex *v1,
-                                                                        qslim::Vertex *v2,
-                                                                        qslim::Vec3& vnew,
-                                                                        qslim::Vec3& f1,
-                                                                        qslim::Vec3& f2,
-                                                                        qslim::Vec3& f3);
+        int predict_face(simplif::Face& F,
+                                                                        simplif::Vertex *v1,
+                                                                        simplif::Vertex *v2,
+                                                                        simplif::Vec3& vnew,
+                                                                        simplif::Vec3& f1,
+                                                                        simplif::Vec3& f2,
+                                                                        simplif::Vec3& f3);
         
-        bool check_for_pair(qslim::Vertex *v0, qslim::Vertex *v1);
+        bool check_for_pair(simplif::Vertex *v0, simplif::Vertex *v1);
         
-        qslim::pair_info *new_pair(qslim::Vertex *v0, qslim::Vertex *v1);
+        simplif::pair_info *new_pair(simplif::Vertex *v0, simplif::Vertex *v1);
         
-        void delete_pair(qslim::pair_info *pair);
+        void delete_pair(simplif::pair_info *pair);
         
-        void do_contract(qslim::Model& m, qslim::pair_info *pair);
+        void do_contract(simplif::Model& m, simplif::pair_info *pair);
         
-        bool decimate_quadric(qslim::Vertex *v, qslim::Mat4& Q);
+        bool decimate_quadric(simplif::Vertex *v, simplif::Mat4& Q);
         
-        void decimate_contract(qslim::Model& m);
+        void decimate_contract(simplif::Model& m);
         
-        qslim::real decimate_error(qslim::Vertex *v);
+        simplif::real decimate_error(simplif::Vertex *v);
         
-        qslim::real decimate_min_error();
+        simplif::real decimate_min_error();
         
-        qslim::real decimate_max_error(qslim::Model& m);
+        simplif::real decimate_max_error(simplif::Model& m);
         
-        void decimate_init(qslim::Model& m, qslim::real limit);
+        void decimate_init(simplif::Model& m, simplif::real limit);
         
-        bool pair_is_valid(qslim::Vertex *u, qslim::Vertex *v);
+        bool pair_is_valid(simplif::Vertex *u, simplif::Vertex *v);
         
         void simplifmethod_run(int,     Geometry::TIPOFUNC      upb=0);
@@ -85 +85 @@
         unsigned int *first_index_submesh;
         
-        //std::vector<qslim::pair_info *> pointers_to_remove;
+        //std::vector<simplif::pair_info *> pointers_to_remove;
 
         int indexMeshLeaves;