Changeset 826 for GTP/trunk/Lib/Geom/shared/GeoTool/src/GeoMeshLoader.cpp

Timestamp:

04/26/06 13:23:34 (19 years ago)

Author:

gumbau

Message:

Modification Stripify for mesh discrimination.
Adds submesh operation type.

Location:

GTP/trunk/Lib/Geom/shared/GeoTool

Files:

• . (modified) (1 prop)
• src/GeoMeshLoader.cpp (modified) (7 diffs)

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

@@ -374 +374 @@
 
 //      Read a submesh operation.
-void GeoMeshLoader::readSubMeshOperation(FILE   *f, Mesh        *geoMesh, int option)
+void GeoMeshLoader::readSubMeshOperation(       FILE    *f,
+                                                                                                                                                                        Mesh    *geoMesh,
+                                                                                                                                                                        int     option)
 {
         unsigned        short   opType;
@@ -384 +386 @@
                 if (opType == 5)
                 {
-                        geoMesh->mType  =       GEO_TRIANGLE_STRIPS;
+                        geoMesh->mSubMesh[currentSubMesh].mType =       GEO_TRIANGLE_STRIPS;
                 }
                 else
                 {
-                        geoMesh->mType  =       GEO_TRIANGLE_LIST;
+                        geoMesh->mSubMesh[currentSubMesh].mType =       GEO_TRIANGLE_LIST;
                 }
         }
@@ -545 +547 @@
                                                                 
                                         cout<<"M_SUBMESH_OPERATION\n";
+
                                         readSubMeshOperation(f, geoMesh, option);
+                                        
                                         break;
                                 case M_SUBMESH_BONE_ASSIGNMENT:
@@ -761 +765 @@
                 Allocate memory to the array of strips
 */
-Mesh* GeoMeshLoader::BuildStripsGeoSubMesh(Mesh* geoMesh)
+SubMesh* GeoMeshLoader::BuildStripsGeoSubMesh(SubMesh* geoSubMesh)
 {
         bool            head_found;
@@ -768 +772 @@
         int                     tailIndex;
         size_t  tail;
-        SubMesh *geoSubMesh;
-
-        //      For each submesh.
-        for (int submesh        =       0; submesh < geoMesh->mSubMeshCount; submesh++)
-        {
-                //      Gets the actual submesh.
-                geoSubMesh      =       &geoMesh->mSubMesh[submesh];
-                
-                head_found                                                      =       false;
-                tail_found                                                      =       false;
-                geoSubMesh->mStripCount =       1;
-        
-                //      Foreachone of the indices.
-                //      Obtains the number of triangle strips.
-                for (int i = 0; i < (geoSubMesh->mIndexCount - 1); i++)
-                {
-                        if (geoSubMesh->mIndex[i] == geoSubMesh->mIndex[i+1])
-                        {
-                                if (head_found)
-                                  {
-                                        tail_found      =       true;
+
+
+        head_found                                                      =       false;
+        tail_found                                                      =       false;
+        geoSubMesh->mStripCount =       1;
+
+        //      Foreachone of the indices.
+        //      Obtains the number of triangle strips.
+        for (int i = 0; i < (geoSubMesh->mIndexCount - 1); i++)
+        {
+                if (geoSubMesh->mIndex[i] == geoSubMesh->mIndex[i+1])
+                {
+                        if (head_found)
+                        {
+                                tail_found      =       true;
+                        }
+                        else
+                        {
+                                head_found      =       true;
+                        }
+
+                        //      Jump one index.
+                        i++;
+                }
+                else
+                {
+                        //      Increments the number of triangle strips.
+                        if (tail_found)
+                        {
+                                geoSubMesh->mStripCount++;
+                        }
+
+                        head_found      =       false;
+                        tail_found      =       false;
+                }
+        }
+
+        geoSubMesh->mStrip              =       (Index**) malloc(       sizeof(Index*)
+                        *
+                        geoSubMesh->mStripCount);
+
+        //      Number of strips. Initially there is one triangle strip.
+        strip_count     =       1;
+
+        head_found                                              =       false;
+        tail_found                                              =       false;
+
+        //      Initialize the fist triangle strip.
+        geoSubMesh->mStrip[0]   =       &geoSubMesh->mIndex[0];
+
+        //      Foreachone of the indices.
+        //      Assigns the beginning of the triangle strips.
+        for(int i = 0;i < (geoSubMesh->mIndexCount - 1); i++)
+        {
+                if(geoSubMesh->mIndex[i] == geoSubMesh->mIndex[i+1])
+                {
+                        if(head_found)
+                        {
+                                if (!tail_found)
+                                {
+                                        tailIndex               =       i;
                                 }
-                                else
-                                {
-                                        head_found      =       true;
-                                }
-
-                                //      Jump one index.
-                                i++;
+
+                                tail_found      =       true;
                         }
                         else
                         {
-                                //      Increments the number of triangle strips.
-                                if (tail_found)
-                                {
-                                        geoSubMesh->mStripCount++;
-                                }
-
-                                head_found      =       false;
-                                tail_found      =       false;
-                        }
-                }
-
-                geoSubMesh->mStrip              =       (Index**) malloc(       sizeof(Index*)
-                                                                                                                                                                                        *
-                                                                                                                                                                                        geoSubMesh->mStripCount);
-
-                //      Number of strips. Initially there is one triangle strip.
-                strip_count     =       1;
-
-                head_found                                              =       false;
-                tail_found                                              =       false;
-
-                //      Initialize the fist triangle strip.
-                geoSubMesh->mStrip[0]   =       &geoSubMesh->mIndex[0];
-
-                //      Foreachone of the indices.
-                //      Assigns the beginning of the triangle strips.
-                for(int i = 0;i < (geoSubMesh->mIndexCount - 1); i++)
-                {
-                        if(geoSubMesh->mIndex[i] == geoSubMesh->mIndex[i+1])
-                        {
-                                if(head_found)
-                                {
-                                        if (!tail_found)
-                                        {
-                                                tailIndex               =       i;
-                                        }
-
-                                        tail_found      =       true;
-                                }
-                                else
-                                {
-                                        head_found      =       true;
-                                }
-
-                                //      Jump one index.
-                                i++;
-                        }
-                        else
-                        {
-                                //      Increments the number of triangle strips.
-                                if(tail_found)
-                                {
-                                        geoSubMesh->mStrip[strip_count++]       =       &geoSubMesh->mIndex[tailIndex];
-                                }
-
-                                head_found      =       false;
-                                tail_found      =       false;
-                        }
-                }
-        }
-
-        return  geoMesh;
+                                head_found      =       true;
+                        }
+
+                        //      Jump one index.
+                        i++;
+                }
+                else
+                {
+                        //      Increments the number of triangle strips.
+                        if(tail_found)
+                        {
+                                geoSubMesh->mStrip[strip_count++]       =       &geoSubMesh->mIndex[tailIndex];
+                        }
+
+                        head_found      =       false;
+                        tail_found      =       false;
+                }
+        }
+
+        return  geoSubMesh;
 }
 
@@ -873 +870 @@
         FILE                                            *salida;
         FILE                                            *pFile;
+        SubMesh                                 *geosubmesh;
 
         //      Initialize the current submesh;
@@ -971 +969 @@
         fclose(pFile);
         
-        if (geoMesh->mType == Geometry::GEO_TRIANGLE_STRIPS)
-        {
-                //      Fill the strips list.
-                geoMesh =       BuildStripsGeoSubMesh(geoMesh);
+        for (int submesh = 0;   submesh < geoMesh->mSubMeshCount; submesh++)
+        {
+                //      Gets the actual submesh.
+                geosubmesh      =       &geoMesh->mSubMesh[submesh];
+                
+                if (geosubmesh->mType == Geometry::GEO_TRIANGLE_STRIPS)
+                {
+                        //      Fill the strips list.
+                        geosubmesh      =       BuildStripsGeoSubMesh(geosubmesh);
+                }
         }