Changeset 1007 for GTP/trunk/Lib/Geom/shared/GTGeometry/include

Timestamp:

06/09/06 08:24:19 (19 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry/include

Files:

• GeoLodStripsLibrary.h (modified) (1 diff)
• GeoMeshSimpSequence.h (modified) (2 diffs)
• GeoMeshSimplifier.h (modified) (2 diffs)
• GeoTreeSimplifier.h (modified) (3 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoLodStripsLibrary.h

@@ -78 +78 @@
                         SmallInt        mTotalStrips;           ///Total strips of the multiresolution object.
                         SmallInt        mTotalVertices; ///Total vertices of the multiresolution object.
+                        SmallInt        mMaxVerticesLOD;///Number of vertices of the max LOD.
                         SmallInt        mTotalChanges;  ///Total changes of the multiresolution object.
                         SmallInt        mLods;                                  ///Available Lods.

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoMeshSimpSequence.h

@@ -48 +48 @@
                         struct Step
                         {
-                                Index mV0, mV1;
-                                Index mT0, mT1;
-                                float x,y,z;
-                                std::vector<Index> mModfaces;
+                                Index mV0;
+                                Index   mV1;
+                                Index mT0;
+                                Index   mT1;
+                                float x;
+                                float   y;
+                                float   z;
+                                
+                                std::vector<Index>      mModfaces;
 
                                 //      Indicates the the step is obligatory to execute
@@ -78 +83 @@
 
 #endif
+

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoMeshSimplifier.h

@@ -6 +6 @@
 #include        "GeoMeshSimpSequence.h"
 #include        "vmi_simplifier.h"
+#include        "change.h"
 
 //#include "SimplificationMethod.h"
@@ -86 +87 @@
                 void    findVertex(size_t       submesh, size_t index);
                 
+                //      Gets the VMI mesh simplification sequence.
+                void    GetMeshSimpSequence();
+
         public:
 

GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoTreeSimplifier.h

@@ -6 +6 @@
 #include "Hoja.h"
 
-#define K1              0.8f //distancia
-#define K2              0.2f // coplanar
+#define K1              0.8f //distance factor
+#define K2              0.2f //coplanar factor
+
+class LeafOctree;
 
 namespace Geometry
@@ -34 +36 @@
         public:
                 /// Class constructor. Retrieves a pointer to a valid Mesh object to simplify
-                TreeSimplifier( const Geometry::Mesh    *,
-                                                                                Geometry::TIPOFUNC              upb=0);
+                TreeSimplifier(const Geometry::Mesh *, Geometry::TIPOFUNC upb=0);
 
                 /// Class destructor.
                 ~TreeSimplifier(void);
-
-                /// Copy constructor
-                //TreeSimplifier(const TreeSimplifier&);
-
-                /// Assignment operator
-                //TreeSimplifier& operator =(const TreeSimplifier&);
 
                 /// Starts the simplification process. Receives as a parameter the LOD factor in a range of [0,1].
@@ -55 +50 @@
                 TreeSimplificationSequence *GetSimplificationSequence();
 
-        //private:
-                void Centroh(Hoja       &);
-                void GetNormal(Hoja     &);
-                void DistanciaEntreHojas(void);
-                void CoplanarEntreHojas(FILE*);
-                float DiametroEsferaEnvolvente();
-                void EstableceCriterio(float);
+        private:
+                void CalculateLeafCenter(Hoja &);
+                void CalculateLeafNormal(Hoja &);
+                float CalculateLeafArea(Hoja &) const;
+                void CoplanarBetweenLeaves(void);
+                float BoundingSphereDiameter() const;
+//              void SetCriteria(float);  // to be erased: obsolete!
+                void SetCriteriaOptimized(float);
 
-                float max(float, float);
-                float min(float, float);
+                float max(float, float) const;
+                float min(float, float) const;
 
-                //long int Colapsa (TreeSimplificationSequence *, float);
-                long int Colapsa(float);
-                void DosMayores(float*, int* );
-                void ElijeVertices(Hoja& , Hoja& , long int);
-                float Hausdorff(Hoja &, Hoja&);
-                float distan(float, float, float, float, float, float);
-                long int MinimaDistancia(void);
-                void NormalizaDistancia(float diametro);
-                void EstableceCriterio2(float, long int);
-                long int MinimoCriterio(void);
+                long int Collapse(float);
+                void TwoGreater(float*, int* );
+                void ChooseVertices(Hoja& , Hoja& , long int);
+                float HausdorffOptimized(const Hoja &, const Hoja&) const;
+                float DistanceFromCenters(const Hoja &, const Hoja &) const;
+                float distan(float, float, float, float, float, float) const;
+                long int MinDistance(void);
+                void NormalizeDistance(float diametro);
+//              void SetCriteria2(float, long int); obsolete!
+                void SetCriteria2Optimized(float, long int);
+                long int MinCriteria(void);
 
-                void Mesh2Estructura(   const Geometry::Mesh *,
-                                                                                                        Index);
-                
-                void EscribeMesh(int);
+                void Mesh2Structure(const Geometry::Mesh *,Index);
+                void BuildOutputMesh(int);
+                void CrossProduct(const float *v1, const float *v2, float *res) const;
+                float SquaredModule(const float *v) const;
 
-                Mesh                    *mesh; // objeto mesh simplificado (para la salida)
+                Mesh                    *mesh; // simplified mesh object (for output)
                 const                   Mesh *objmesh;
                 float                   (*Vertex)[3];
-                Hoja                    *Hojasa;  // las activas
-                long int        activas, counth;
+                Hoja                    *Leaves;
+                long int        activeLeaves, countLeaves;
                 TreeSimplificationSequence      *mtreesimpsequence;
                 
-        private:
                 //      Update progress bar.
                 Geometry::TIPOFUNC      mUPB;
+
+                // the octree used to speed up the simplification process
+                LeafOctree *octree;
+                void RecursiveCreateLeafOctree(LeafOctree*, int deep); // this is called from CreateLeafNode
+                void RecursiveFillOctreeWithLeaves(LeafOctree*);
+                LeafOctree* CreateLeafOctree(int deep); // generates a new leaf octree and returns its root node
+                int vertex_count;
+                LeafOctree ** octree_owning_leaf;
+                LeafOctree *GetMinOctreeNodeForLeaf(LeafOctree *start, const Hoja &leaf);
+                bool PruneOctree(LeafOctree *); // erases one octree level and translates its leaves to the parent. Returns true if the node itself was pruned
         };
 }