Changeset 986 for GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs

Timestamp:

05/25/06 14:26:04 (19 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/SimplificationMethod.cpp (modified) (15 diffs)

GTP/trunk/Lib/Geom/shared/GTGeometry/src/libs/SimplificationMethod.cpp

@@ -26 +26 @@
 SimplificationMethod::~SimplificationMethod()
 {
-        /*      for (std::vector<qslim::pair_info*>::iterator it=pointers_to_remove.begin(); it!=pointers_to_remove.end(); it++)
-                        {
-                        if (*it!=NULL)
-                        {
-                        delete *it;
-         *it=NULL;
-         }
-         }
-         */
-        
         delete heap;
         delete [] first_index_submesh;
@@ -1012 +1002 @@
 
         mGeoMesh->mSubMeshCount = objmesh->mSubMeshCount;
-        
+
         //      Memory allocation for the submeshes.
         mGeoMesh->mSubMesh = new SubMesh[objmesh->mSubMeshCount];
@@ -1030 +1020 @@
         {
                 mGeoMesh->hasSkeleton   =       true;
-                
+
                 strcpy(mGeoMesh->mSkeletonName,objmesh->mSkeletonName);
         }
@@ -1047 +1037 @@
         for (size_t     i = 0;  i < objmesh->mSubMeshCount;     i++)
         {
-                mGeoMesh->mSubMesh[i].mSharedVertexBuffer       =       false; 
                 mGeoMesh->mSubMesh[i].mStripCount                                       =       0;
                 mGeoMesh->mSubMesh[i].mStrip                                                    =       NULL;
 
+                mGeoMesh->
+                        mSubMesh[i].mSharedVertexBuffer =       false;
+
                 strcpy( mGeoMesh->mSubMesh[i].mMaterialName,
-                                                objmesh->mSubMesh[i].mMaterialName);
+                                objmesh->mSubMesh[i].mMaterialName);
 
                 //      Copy submesh bones.
@@ -1060 +1052 @@
                         {
                                 mGeoMesh->mSubMesh[i].mBones.push_back(objmesh->
-                                                                                                                                                                                                mSubMesh[i].mBones[j]);
+                                                mSubMesh[i].mBones[j]);
                         }
                 }
@@ -1069 +1061 @@
                         mGeoMesh->mSubMesh[i].mIndexCount       =       ver_inds_rep_by_geo[i].size();
                         mGeoMesh->mSubMesh[i].mIndex                    =       new Index[mGeoMesh->
-                                                                                                                                                                                                                mSubMesh[i].mIndexCount];
+                                mSubMesh[i].mIndexCount];
 
                         //      Store the indices.
@@ -1104 +1096 @@
                         mGeoMesh->mSubMesh[i].mVertexBuffer->mTexCoords =       new Vector2[mGeoMesh->mSubMesh[i].mVertexBuffer->mVertexCount];
 
-                        for (MAPAINDIND::iterator mapit = unique_verts_inds_by_geo[i].begin(); mapit != unique_verts_inds_by_geo[i].end(); mapit++)
+                        for (   MAPAINDIND::iterator mapit = unique_verts_inds_by_geo[i].begin();
+                                                mapit != unique_verts_inds_by_geo[i].end();
+                                                mapit++)
                         {
                                 //      Key and value.
@@ -1133 +1127 @@
 
                         //      Copy the leaves submesh indexes.
-                        for (unsigned int j=0; j<mGeoMesh->mSubMesh[i].mIndexCount; j++) 
+                        for (unsigned int j=0; j<mGeoMesh->mSubMesh[i].mIndexCount; j++)
                         {       
                                 mGeoMesh->mSubMesh[i].mIndex[j]=objmesh->mSubMesh[i].mIndex[j];
@@ -1147 +1141 @@
                         mGeoMesh->mSubMesh[i].mVertexBuffer->mNormal=new Vector3[mGeoMesh->mSubMesh[i].mVertexBuffer->mVertexCount];
                         mGeoMesh->mSubMesh[i].mVertexBuffer->mTexCoords=new Vector2[mGeoMesh->mSubMesh[i].mVertexBuffer->mVertexCount];
-                        
+
                         for (   unsigned int j = 0;
-                                                j < mGeoMesh->mSubMesh[i].mVertexBuffer->mVertexCount;
-                                                j++)
+                                        j < mGeoMesh->mSubMesh[i].mVertexBuffer->mVertexCount;
+                                        j++)
                         {
                                 //      Position.
@@ -1175 +1169 @@
         //      Store the simplification steps in MeshSimplificationSequence.
         int acum        =       0;
-        
+
         for (size_t i   =       0; i < objmesh->mSubMeshCount; i++)
         {
@@ -1186 +1180 @@
                         first_index_submesh[i]  =       acum;
                 }
-                
+
                 acum    +=      (int)objmesh->mSubMesh[i].mVertexBuffer->mVertexCount;
         }
-        
+
         MeshSimplificationSequence::Step stepaux, newstep;
         vector<int> v0,v1,submesh0,submesh1;
         MeshSimplificationSequence *msimpseq;
-        
+
         msimpseq        =       new MeshSimplificationSequence();
 
@@ -1203 +1197 @@
                 v1                              =       vertexbuffermap[stepaux.mV1];
                 submesh1        =       submeshmap[stepaux.mV1];
-                
+
                 for (unsigned j = 0;    j < v0.size();  j++)
                 {
@@ -1215 +1209 @@
                                 newstep.y               =       stepaux.y;
                                 newstep.z               =       stepaux.z;
-                                
+
                                 // mT0 y mT1 are unique triangles identifiers
                                 // returned by the simplification method
                                 newstep.mT0     =       stepaux.mT0;
                                 newstep.mT1     =       stepaux.mT1;
-                                
+
                                 if (j == v0.size() - 1 && k == v1.size() - 1)
                                 {
@@ -1229 +1223 @@
                                         newstep.obligatorio     =       1;
                                 }
-                                
+
                                 if (j == 0 && k == 0)
                                 {
@@ -1240 +1234 @@
                                 {
                                         std::vector<Index>      vvacio;
-                                        
+
                                         newstep.mModfaces       =       vvacio;
                                 }