Changeset 1526 for GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoLodStripsLibrary.h

Timestamp:

09/28/06 17:49:37 (18 years ago)

Author:

gumbau

Message:

Updated modules to the new interface and the new simplification algorithm improvements.

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/include/GeoLodStripsLibrary.h (modified) (4 diffs)

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

@@ -34 +34 @@
         typedef struct
         {
-                unsigned        long    strip;
-                char                                            position;
-                char                                            vertexRepetition;
-                char                                            edgeRepetition;
+                unsigned        long    strip; // change this to uint32
+                char            position;
+                char            vertexRepetition;
+                char            edgeRepetition;
+                char            obligatory;
         }       LODRegisterType;
 
         typedef struct
         {
-                float                   Vertex[3];
+                float           Vertex[3];
                 SmallInt        Next;
         } VertexType;
@@ -130 +131 @@
 
                         //      Copa STL vectors to C arrays.
-                        void    CopyVectors2Arrays();
+                        void    CopyVectors2Arrays(void);
 
                         //      Loads Mesh.
                         void    LoadStripMesh(const LodStripsLibraryData *, Mesh *geomesh);
 
-                        Geometry::CREATEINDEXDATAFUNC create_index_data_func;
+//                      Geometry::CREATEINDEXDATAFUNC create_index_data_func;
 
                         //      Strips vector.
@@ -146 +147 @@
                         //Number of strips in each submesh
                         int* mStripsSubmesh;
+                        bool delete_indexdata;
+                        int *submesh_x_strip;
+                        Real lodFactor;
+                        IndexData *dataRetrievalInterface;
+                        uint32 current_triangle_count;
 
                 public:
 
-                        IndexData *dataRetrievalInterface;
+                        IndexData *GetIndexDataInterface(void){ return dataRetrievalInterface; }
                         
                         /**     Constructor, receives as a parameter the name of the file
                          *      including the multiresolution object.
                         */
-                        LodStripsLibrary(const LodStripsLibraryData *, Mesh *geomesh, CREATEINDEXDATAFUNC idfun=NULL);
+                        LodStripsLibrary(const LodStripsLibraryData *, Mesh *geomesh, IndexData * userindexdata = NULL);
 
                         /// Destructor.
@@ -182 +188 @@
                         uint32 GetTotalStripCount(void) const { return mTotalStrips; }
                         uint32 GetSubMeshtripCount(int submeshid) const { return mStripsSubmesh[submeshid]; }
+                        uint32 GetCurrentTriangleCount(void) const { return current_triangle_count; }
+
+                        virtual Real GetCurrentLodFactor(void) const { return lodFactor; }
         };
 }