Changeset 1325 for GTP/trunk/Lib/Geom

Timestamp:

09/06/06 13:27:40 (18 years ago)

Author:

gumbau

Message:

Removed unneeded degenerateds in lodstrips

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry

Files:

• include/VertexData.h (modified) (2 diffs)
• src/GeoLodStripsLibrary.cpp (modified) (4 diffs)

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

@@ -29 +29 @@
         private:
                 unsigned int numinds, numvalidinds;
+                unsigned int current_submesh;
         public:
-                IndexData(unsigned int numi):numinds(numi),numvalidinds(numi){}
+                IndexData(unsigned int numi):numinds(numi),numvalidinds(numi){ current_submesh=0; }
                 virtual ~IndexData(void){}
 
@@ -37 +38 @@
                 virtual void End(void)=0;
 
-//              virtual void UpdateData(int*,int)=0;
-
                 virtual unsigned int GetIndex(unsigned int) const =0;
                 unsigned int GetNumMaxIndices(void) const { return numinds; }
                 unsigned int GetNumValidIndices(void) const { return numvalidinds; }
-                void SetNumValidIndices(unsigned int valid){ numvalidinds=valid; }
+                void SetNumValidIndices(unsigned int valid){ numvalidinds=valid; } // this should not be called from client applications
+                void SetCurrentSubmesh(unsigned int c){ current_submesh=c; }  // this should not be called from client applications
+                unsigned int GetCurrentSubmesh(void) const { return current_submesh; }
         };
 

GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoLodStripsLibrary.cpp

@@ -399 +399 @@
         
         //      Copy strips.
-        unsigned int numDegenerated = 2*mTotalStrips - 2;
-        dataRetrievalInterface=create_index_data_func(total_strip_size+numDegenerated); // temporal!
+//      unsigned int numDegenerated = 2*mTotalStrips - 2;
+        dataRetrievalInterface=create_index_data_func(total_strip_size/*+numDegenerated*/); // temporal!
         dataRetrievalInterface->Begin();
 
@@ -612 +612 @@
         dataRetrievalInterface->Begin();
 
-        int                     counter                                 =       0;
-        int                     target_submesh  =       0;
-        size_t  strip_count                     =       0;
+        int     counter = 0;
+        int     target_submesh  = 0;
+        size_t  strip_count     = 0;
+
+        dataRetrievalInterface->SetCurrentSubmesh(target_submesh);
 
         for (unsigned   int     i       =       0;      i < mTotalStrips;       i++,    strip_count++)
@@ -623 +625 @@
 
                         if (target_submesh==0)
-                        {
                                 offsets_x_submesh[target_submesh] = 0;
-                        }
                         else
-                        {
                                 offsets_x_submesh[target_submesh] = indices_x_submesh[target_submesh-1] + offsets_x_submesh[target_submesh-1];
-                        }
-
-                        counter                                                                                                 =       0;
+
+                        counter =       0;
                         mStripsSubmesh[target_submesh]  =       (int)strip_count;
-                        strip_count                                                                                     =       0;
+                        strip_count     =       0;
 
                         target_submesh++;
+                        dataRetrievalInterface->SetCurrentSubmesh(target_submesh);
                 }
                 
@@ -674 +673 @@
                 strip_count = 0;
                 target_submesh++;
+                dataRetrievalInterface->SetCurrentSubmesh(target_submesh);
         }