Changeset 891 for GTP/trunk/Lib/Geom/shared/GeoTool

Timestamp:

05/04/06 12:56:05 (19 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GeoTool

Files:

• include/GeoMeshLoader.h (modified) (1 diff)
• src/GeoMeshLoader.cpp (modified) (1 diff)
• src/GeoMeshSaver.cpp (modified) (3 diffs)
• src/GeoMeshViewUI.cpp (modified) (10 diffs)

GTP/trunk/Lib/Geom/shared/GeoTool/include/GeoMeshLoader.h

@@ -166 +166 @@
 
                         //      Writes the strips list.
-                        SubMesh* GeoMeshLoader::BuildStripsGeoSubMesh(SubMesh* geoSubMesh);
+                        SubMesh* GeoMeshLoader::BuildStripsGeoSubMesh(SubMesh   *geoSubMesh);
+
+                        //      Remove degenerate triangles of a submesh given.
+                        SubMesh *       removeDegenerateTriangles(SubMesh       *geoSubMesh);
                         
                 public:

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshLoader.cpp

@@ -858 +858 @@
         }
 
+        //      Remove degenerate triangles of a submesh given.
+        geoSubMesh      =       removeDegenerateTriangles(geoSubMesh);
+
+        return  geoSubMesh;
+}
+
+//      Remove degenerate triangles of a submesh given.
+SubMesh *       GeoMeshLoader::removeDegenerateTriangles(SubMesh        *geoSubMesh)
+{
+        Index           *indices;
+        Index           *index;
+        Index           *indexBegin;
+        Index           *indexEnd;
+        Index           *new_strip_starts;
+        size_t  new_index_count;
+        size_t  current_index;
+
+        //      Stores the new starts of strips.
+        new_strip_starts        =       new     Index[geoSubMesh->mStripCount];
+        
+        //      Calculate the new index count.
+        new_index_count =       geoSubMesh->mIndexCount 
+                -
+                (2 * geoSubMesh->mStripCount)
+                +
+                2;
+
+        //      Auxiliar index array.
+        indices =       new     Index[new_index_count];
+
+        //      Initialize the current index;
+        current_index   =       0;
+        
+        //      For each one of the strips.
+        for (int strip = 0; strip < geoSubMesh->mStripCount; strip++)
+        {
+                //      Stars of strip without degenerate triangles.
+                new_strip_starts[strip] =       current_index;
+                
+                //      First index of the strip.
+                indexBegin      =       geoSubMesh->mStrip[strip];
+
+                //      If is the final strip
+                if (strip       == (geoSubMesh->mStripCount - 1))
+                {
+                        //      The end of the index array.
+                        indexEnd        = &geoSubMesh->mIndex[geoSubMesh->mIndexCount];
+                }
+                else
+                {
+                        //      The beginning of the next strip.
+                        indexEnd        = geoSubMesh->mStrip[strip + 1];
+                }
+
+                int i;
+                i       = 0;
+
+                //      If is not the first strip.
+                if (strip != 0)
+                {
+                        indexBegin++;
+                }
+
+                //      If is not the last strip.
+                if (strip       != (geoSubMesh->mStripCount - 1))
+                {
+                        indexEnd--;
+                }
+
+                //      For each index of the strip.
+                for (index = indexBegin; index < indexEnd; index++)
+                {
+                        indices[current_index++]        =       indexBegin[i];
+
+                        //      Increments i.
+                        i++;
+                }
+
+        }
+
+        //      Free Index memory.
+        delete  []geoSubMesh->mIndex;
+
+        //      Update index count.
+        geoSubMesh->mIndexCount =       new_index_count;
+
+        geoSubMesh->mIndex      =       new     Index[new_index_count];
+
+        //      Store new index array without degenerate triangles.
+        for (size_t     i       =       0;      i       <       geoSubMesh->mIndexCount; i++)
+        {
+                geoSubMesh->mIndex[i]   =       indices[i];
+        }
+
+        //      Free auxiliar index array;
+        delete  []indices;
+
+        //      Update start of the strip.
+        for (int        strip   =       0; strip < geoSubMesh->mStripCount; strip++)
+        {
+                geoSubMesh->mStrip[strip]       =       &geoSubMesh->mIndex[new_strip_starts[strip]];
+        }
+
+        //      Free auxiliar strip starts.
+        delete  []new_strip_starts;
+        
         return  geoSubMesh;
 }

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshSaver.cpp

@@ -194 +194 @@
         unsigned        long    indexCount;
         String                                  materialName;
+        Index                                           *index;
+        Index                                           *indexBegin;
+        Index                                           *indexEnd;
         
         //      Debug.
@@ -219 +222 @@
         indexCount      =       geoSubMesh->mIndexCount;
 
+        //      If the submesh is in triangle strips.
+        if (geoSubMesh->mType == GEO_TRIANGLE_STRIPS)
+        {
+                indexCount      +=      2 * geoSubMesh->mStripCount - 2;
+        }
+        
         writeInts(indexCount, 1);
 
@@ -229 +238 @@
                                 <<      endl;
 
-        //      Write the index array.
-        for (int i = 0; i < geoSubMesh->mIndexCount; i++)
-        {
-                writeInts(geoSubMesh->mIndex[i], 1);
+        //      If the submesh is in triangle strips.
+        if (geoSubMesh->mType == GEO_TRIANGLE_STRIPS)
+        {
+                //      Debug.
+                cout    <<      "Write triangle strips"
+                                        <<      endl;
+                
+                //      For each one of the strips.
+                for (int strip = 0; strip < geoSubMesh->mStripCount; strip++)
+                {
+                        //      First index of the strip.
+                        indexBegin      =       geoSubMesh->mStrip[strip];
+
+                        //      If is the final strip
+                        if (strip       == (geoSubMesh->mStripCount - 1))
+                        {
+                                //      The end of the index array.
+                                indexEnd        = &geoSubMesh->mIndex[geoSubMesh->mIndexCount];
+                        }
+                        else
+                        {
+                                //      The beginning of the next strip.
+                                indexEnd        = geoSubMesh->mStrip[strip + 1];
+                        }
+
+                        int i;
+                        i       = 0;
+
+                        if (strip != 0)
+                        {
+                                writeInts(indexBegin[i], 1);
+                        }
+                        
+                        //      For each index of the strip.
+                        for (index = indexBegin; index < indexEnd; index++)
+                        {
+                                writeInts(indexBegin[i], 1);
+                                
+                                //      Increments i.
+                                i++;
+                        }
+
+                        if (strip       != (geoSubMesh->mStripCount - 1))
+                        {
+                                writeInts(indexBegin[i - 1], 1);
+                        }
+
+                }
+        }
+        //      If the submesh is in triangle list.
+        else
+        {
+                //      Write the index array.
+                for (int i = 0; i < geoSubMesh->mIndexCount; i++)
+                {
+                        writeInts(geoSubMesh->mIndex[i], 1);
+                }
         }
 

GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshViewUI.cpp

@@ -17 +17 @@
         //      Loads a mesh file.
         openMeshFile();
-        
-        //      Debug.
-        cout    <<      "Vertex Count SubMesh 0:        "
-                                <<      mGeoMesh->mSubMesh[0].mVertexBuffer->mVertexCount
-                                <<      endl;
-        //----------------------------------------------------------
         
         //      Deactive Lod strip visualization.
@@ -854 +848 @@
 inline void GeoMeshViewUI::cb_mButtonProcess_i(fltk::Button*, void*)
 {
+        bool    error;
         Mesh    *mesh_aux;
         
@@ -860 +855 @@
         mProcessBar->position(0);
 
+        //      Initialize error flag.
+        error   =       false;
+        
         //      If there is a mesh object.
         if (mGeoMesh != NULL)
@@ -877 +875 @@
                         case    EDGE_COLLAPSE:
 
+                                //      Check submeshes for triangles strips.
+                                for (int i = 0; i < mGeoMesh->mSubMeshCount; i++)
+                                {
+                                        //      If current submesh is in triangle strips.
+                                        if (mGeoMesh->mSubMesh[i].mType == GEO_TRIANGLE_STRIPS)
+                                        {
+                                                error   =       true;
+                                        }
+                                }
+                                
                                 //      if the mesh is stripified.
-                                if (mGeoMesh->mType == GEO_TRIANGLE_STRIPS)
+                                if (error)
                                 {
                                         fltk::alert("Can't simplify a mesh in triagle strips.");
@@ -903 +911 @@
                         case    LODSTRIPS_AUTO:
 
+                                //      Check submeshes for triangles strips.
+                                for (int i = 0; i < mGeoMesh->mSubMeshCount; i++)
+                                {
+                                        //      If current submesh is in triangle strips.
+                                        if (mGeoMesh->mSubMesh[i].mType == GEO_TRIANGLE_STRIPS)
+                                        {
+                                                error   =       true;
+                                        }
+                                }
+                                
                                 //      if the mesh is stripified.
-                                if (mGeoMesh->mType == GEO_TRIANGLE_STRIPS)
+                                if (error)
                                 {
                                         fltk::alert("Can't simplify a mesh in triagle strips.");
@@ -1617 +1635 @@
                         geoSubMesh      =       &geoMesh->mSubMesh[submesh];
 
-                        switch (geoMesh->mType)
+                        switch (geoSubMesh->mType)
                         {
                                 case    GEO_TRIANGLE_LIST:
@@ -1643 +1661 @@
         strip_count     =       0;
         
-        if (geoMesh->mType == GEO_TRIANGLE_STRIPS)
-        {
-                //      For each submesh.
-                for (int submesh        =       0; submesh < geoMesh->mSubMeshCount; submesh++)
+        //      For each submesh.
+        for (int submesh        =       0; submesh < geoMesh->mSubMeshCount; submesh++)
+        {
+                //      Gets the actual submesh.
+                geoSubMesh      =       &geoMesh->mSubMesh[submesh];
+
+                if (geoSubMesh->mType == GEO_TRIANGLE_STRIPS)
                 {
-                        //      Gets the actual submesh.
-                        geoSubMesh      =       &geoMesh->mSubMesh[submesh];
-
                         strip_count     +=      geoSubMesh->mStripCount;
                 }       
         }
+
         return  strip_count;
 }
@@ -1699 +1718 @@
         simplificacionState     =       QSLIM;
 
-        mMeshSimplifier = new ImageBasedSimplifier(mGeoMesh,    progress_function);
+        mMeshSimplifier = new GeometryBasedSimplifier(mGeoMesh, progress_function);
 
         mMeshSimplifier->setMeshLeaves(idMeshLeaves);
@@ -1765 +1784 @@
 void    GeoMeshViewUI::simplifyLeavesCollapse()
 {
-        uint32                                          vi;
-
+        bool            error;
+        uint32  vi;
+
+        //      Initialize      error flag.
+        error   =       false;
+        
+        //      Check submeshes for triangles strips.
+        for (int i = 0; i < mGeoMesh->mSubMeshCount; i++)
+        {
+                //      If current submesh is in triangle strips.
+                if (mGeoMesh->mSubMesh[i].mType == GEO_TRIANGLE_STRIPS)
+                {
+                        error   =       true;
+                }
+        }
+                                
         //      if the mesh is stripified.
-        if (mGeoMesh->mType == GEO_TRIANGLE_STRIPS)
+        if (error)
         {
                 fltk::alert("Can't simplify a tree in triagle strips.");
@@ -1842 +1875 @@
 void    GeoMeshViewUI::stripify()
 {       
+        bool                                                    error;
         char                                                    char_value[10];
         CustomStripifier        *geoStripifier;
 
+        //      Initialize error flag.
+        error   =       false;
+
+        //      Check submeshes for triangles strips.
+        for (int i = 0; i < mGeoMesh->mSubMeshCount; i++)
+        {
+                //      If current submesh is in triangle strips.
+                if (mGeoMesh->mSubMesh[i].mType == GEO_TRIANGLE_STRIPS)
+                {
+                        error   =       true;
+                }
+        }
+                                
         //      if the mesh is stripified.
-        if (mGeoMesh->mType == GEO_TRIANGLE_STRIPS)
+        if (error)
         {
                 fltk::alert("The mesh is already in strips.");