Changeset 841 for GTP/trunk/Lib/Geom/shared/GTGeometry

Timestamp:

04/27/06 12:01:26 (19 years ago)

Author:

gumbau

Message:

 

Location:

GTP/trunk/Lib/Geom/shared/GTGeometry

Files:

• include/GeoLodStripsConstructor.h (modified) (3 diffs)
• include/GeoMeshStripifier.h (modified) (2 diffs)
• src/GeoLodStripsConstructor.cpp (modified) (6 diffs)

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

@@ -76 +76 @@
                         uint32 TOTALINDICES;
 
+                        //      Index of the submesh leaves.
+                        size_t  mSubMeshLeaves;
+
                         Mesh    *geoMesh;
                         const   Geometry::Mesh *meshoriginal;
@@ -121 +124 @@
                         LodStripsConstructor(   const Mesh                      *,
                                         const MeshSimplificationSequence        *,
-                                        Geometry::TIPOFUNC                                                              upb);
+                                        size_t                                                                                                          submesh=-1,
+                                        Geometry::TIPOFUNC                                                              upb=NULL);
 
                         // Destructor
@@ -141 +145 @@
                         ///     GetMesh: Return de current Mesh.
                         Mesh    *       GetMesh();
+
+                        // Sets what is the submesh that stores the leaves
+                        void SetSubMeshLeaves(size_t    submesh);
+
         };
 

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

@@ -54 +54 @@
 
                         // Sets what is the mesh that stores the leaves
-                        void setSubMeshLeaves(Geometry::Index);
+                        void setSubMeshLeaves(size_t);
 
                 protected:
@@ -65 +65 @@
 
                         //      Index of the submesh leaves.
-                        Geometry::Index mSubMeshLeaves;
+                        size_t  mSubMeshLeaves;
 
         };

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

@@ -484 +484 @@
 LodStripsConstructor::LodStripsConstructor(const Mesh                                           *m,
                                                                                                                 const MeshSimplificationSequence        *ms,
+                                                                                                                        size_t                                                                                                          submesh,
                                                                                                                         TIPOFUNC                                                                                                        upb)
 {
@@ -493 +494 @@
         this->geoMeshSQ = ms;
 
+        //      Set the leaves submesh.
+        mSubMeshLeaves  =       submesh;
+
+        
         this->GenerarModeloCompleto(upb);
 }
@@ -784 +789 @@
                         }
                 }
-
         }
 
@@ -1012 +1016 @@
                         {
                                 for     (       j = 0;
-                                                        j < this->geoMesh->mSubMesh[i].mVertexBuffer->mVertexCount;
-                                                        j++)
+                                                j < this->geoMesh->mSubMesh[i].mVertexBuffer->mVertexCount;
+                                                j++)
                                 {
                                         //      Si hay mas de un submesh ListaIndices 
                                         //      no se rellena correctamente.
                                         vAux.Vertex[0] = this->geoMesh->mSubMesh[i].
-                                                                                                                                                                        mVertexBuffer->mPosition[j].x;
+                                                mVertexBuffer->mPosition[j].x;
                                         vAux.Vertex[1] = this->geoMesh->mSubMesh[i].
-                                                                                                                                                                        mVertexBuffer->mPosition[j].y;
+                                                mVertexBuffer->mPosition[j].y;
                                         vAux.Vertex[2] = this->geoMesh->mSubMesh[i].
-                                                                                                                                                                        mVertexBuffer->mPosition[j].z;
+                                                mVertexBuffer->mPosition[j].z;
                                         //      Añadimos las normales en cVerts.
                                         vAux.Normal[0] = this->geoMesh->mSubMesh[i].
-                                                                                                                                                                        mVertexBuffer->mNormal[j].x;
+                                                mVertexBuffer->mNormal[j].x;
                                         vAux.Normal[1] = this->geoMesh->mSubMesh[i].
-                                                                                                                                                                        mVertexBuffer->mNormal[j].y;
+                                                mVertexBuffer->mNormal[j].y;
                                         vAux.Normal[2] = this->geoMesh->mSubMesh[i].
-                                                                                                                                                                        mVertexBuffer->mNormal[j].z;
+                                                mVertexBuffer->mNormal[j].z;
 
                                         //      Añadimos las coordenadas de textura a cVerts.
                                         vAux.TexCoords[0]       =       this->geoMesh->mSubMesh[i].
-                                                                                                                                                                                        mVertexBuffer->mTexCoords[j].x;
+                                                mVertexBuffer->mTexCoords[j].x;
                                         vAux.TexCoords[1] = this->geoMesh->mSubMesh[i].
-                                                                                                                                                                                        mVertexBuffer->mTexCoords[j].y;
+                                                mVertexBuffer->mTexCoords[j].y;
 
                                         vAux.Next                       =       -10;
                                         vAux.numMesh    =       i;
-                                        
+
                                         this->cVerts.push_back(vAux);
                                 }
@@ -1052 +1056 @@
                 for     (i = 0; i < this->geoMesh->mSubMeshCount; i++)
                 {
-                        indice_acum     =       0;
-                        
-                        for     (j = 0; j < this->geoMesh->mSubMesh[i].mStripCount; j++)
-                        {
-                                Index   *aux    =       this->geoMesh->mSubMesh[i].mStrip[j];
-                                
-                                if (j != 0)
-                                {
-                                        // La primera tira no empieza por índices repetidos.
-                                        aux     =       aux+1;
-                                        
-                                        indice_acum++;
-                                }
-                                
-                                if (j+1 < this->geoMesh->mSubMesh[i].mStripCount)
-                                {
-                                        Index   *siguiente      =       this->geoMesh->mSubMesh[i].mStrip[j+1];
-                                        
-                                        tira.clear();
-                                        
-                                        while (aux != siguiente)
-                                        {
-                                                tira.push_back(*aux);
+                        //      If is not the leaves submesh.
+                        if (mSubMeshLeaves != i)
+                        {
+                                indice_acum     =       0;
+
+                                for     (j = 0; j < this->geoMesh->mSubMesh[i].mStripCount; j++)
+                                {
+                                        Index   *aux    =       this->geoMesh->mSubMesh[i].mStrip[j];
+
+                                        if (j != 0)
+                                        {
+                                                // La primera tira no empieza por índices repetidos.
+                                                aux     =       aux+1;
+
                                                 indice_acum++;
-                                                
-                                                aux     =       aux + 1;
-                                        }
-                                        
-                                        tira.pop_back();
-                                        this->cStrips.push_back(tira);
-                                }
-                                else
-                                {
-                                        // Insertar los indices de la última tira en el cStrips
-                                        tira.clear();
-                                        
-                                        for     (       unsigned int k = indice_acum;
+                                        }
+
+                                        if (j+1 < this->geoMesh->mSubMesh[i].mStripCount)
+                                        {
+                                                Index   *siguiente      =       this->geoMesh->mSubMesh[i].mStrip[j+1];
+
+                                                tira.clear();
+
+                                                while (aux != siguiente)
+                                                {
+                                                        tira.push_back(*aux);
+                                                        indice_acum++;
+
+                                                        aux     =       aux + 1;
+                                                }
+
+                                                tira.pop_back();
+                                                this->cStrips.push_back(tira);
+                                        }
+                                        else
+                                        {
+                                                // Insertar los indices de la última tira en el cStrips
+                                                tira.clear();
+
+                                                for     (       unsigned int k = indice_acum;
                                                                 k < this->geoMesh->mSubMesh[i].mIndexCount;
                                                                 k++)
-                                        {
-                                                tira.push_back(this->geoMesh->mSubMesh[i].mIndex[k]);
-                                        }
-                                        
-                                        this->cStrips.push_back(tira);
-                                }
-                        }
-                        
-                        num_vert        +=      this->geoMesh->mSubMesh[i].
-                                                                                                                                                mVertexBuffer->mVertexCount;
+                                                {
+                                                        tira.push_back(this->geoMesh->mSubMesh[i].mIndex[k]);
+                                                }
+
+                                                this->cStrips.push_back(tira);
+                                        }
+                                }
+
+                                num_vert        +=      this->geoMesh->mSubMesh[i].
+                                        mVertexBuffer->mVertexCount;
+                        }
                 }
 
@@ -1123 +1131 @@
 }
 
+// Sets what is the submesh that stores the leaves.
+void LodStripsConstructor::SetSubMeshLeaves(size_t      submesh)
+{
+        mSubMeshLeaves  =       submesh;
+}
+