Changeset 2086 for GTP/trunk/Lib/Geom/shared/GTGeometry/src

Timestamp:

02/05/07 13:27:05 (18 years ago)

Author:

gumbau

Message:

 

File:

• GTP/trunk/Lib/Geom/shared/GTGeometry/src/GeoMeshSimplifier.cpp (modified) (5 diffs)

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

@@ -71 +71 @@
 void MeshSimplifier::sortBones()
 {
-<<<<<<< .mine
         VertexBuffer    *simplified_vb;
         VertexBuffer    *initial_vb;
-=======
-        VertexBuffer                                    *mesh_vb;
-        VertexBuffer                                    *copy_vb;
->>>>>>> .r2080
-
-<<<<<<< .mine
+
         std::vector<VertexBoneAssignment>       *simplified_bones;
         std::vector<VertexBoneAssignment>       *initial_bones;
-=======
-        std::vector<VertexBoneAssignment>       *mesh_bones;
-        std::vector<VertexBoneAssignment>       *copy_bones;
->>>>>>> .r2080
-
-<<<<<<< .mine
+
         // After simplifying, the object always is shared vertex
         // so, the bones must be placed in the GeoMesh
         simplified_bones        =       &mGeoMesh->mBones;
         simplified_vb                   =       mGeoMesh->mVertexBuffer;
-=======
-        // After simplifying, the object always is shared vertex
-        // so, the bones must be placed in the GeoMesh
-        mesh_bones      =       &mGeoMesh->mBones;
-        mesh_vb =       mGeoMesh->mVertexBuffer;
->>>>>>> .r2080
-
-<<<<<<< .mine
+
         // we assume the original mesh is shared vertex
         // because before the simplification process
@@ -105 +87 @@
         // so, the original bones must be searched in the
         // Mesh, not in every submesh
-=======
-        // we assume the original mesh is shared vertex 
-        // because before the simplification process
-        // the mesh becomes converted to shared vertex
-        // so, the original bones must be searched in the
-        // Mesh, not in every submesh
->>>>>>> .r2080
-
-<<<<<<< .mine
+
         simplified_bones->clear();
-=======
-        mesh_bones->clear();
->>>>>>> .r2080
-
-<<<<<<< .mine
+
         //    Vertex buffers.
         initial_vb      =       mInitialMesh->mVertexBuffer;
-=======
-        //      Vertex buffers.
-        copy_vb =       mInitialMesh->mVertexBuffer;
->>>>>>> .r2080
-
-<<<<<<< .mine
+
         //    Bones.
         initial_bones   =       &mInitialMesh->mBones;
-=======
-        //      Bones.
-        copy_bones = &mInitialMesh->mBones;
-        
-        //      If there are submesh bones.
-        for (int b = 0; b < copy_bones->size(); b++)
-        {
-                VertexBoneAssignment    assign;
->>>>>>> .r2080
-
-<<<<<<< .mine
+
         //  For each bone assignment.
         for (int b = 0; b < initial_bones->size(); b++)
         {
                 VertexBoneAssignment    assign;
-=======
-                int n   =       (*copy_bones)[b].vertexIndex;
->>>>>>> .r2080
-
-<<<<<<< .mine
+
                 int n   =       (*initial_bones)[b].vertexIndex;
 
@@ -165 +116 @@
                                 simplified_bones->push_back(assign);
                         }
-=======
-                //      Initialize o.
-                
-                int o=0;
-                for (o=0; o<mesh_vb->mVertexCount; o++)
-                {
-                        if (mesh_vb->mPosition[o].x == copy_vb->mPosition[n].x &&
-                                mesh_vb->mPosition[o].y == copy_vb->mPosition[n].y &&
-                                mesh_vb->mPosition[o].z == copy_vb->mPosition[n].z)
-                        {
-                                assign.vertexIndex = o;
-                                assign.boneIndex   = (*copy_bones)[b].boneIndex;
-                                assign.weight      = 1.0f;
-                                mesh_bones->push_back(assign);
-                        }                       
->>>>>>> .r2080
                 }
         }
@@ -234 +169 @@
         //mGeoMesh = sharedMesh;
 
-        // if the initial mesh had shared vertex, 
-        // convert the mesh to shared vertex
-        for (int i=0; i<mInitialMesh->mSubMeshCount; i++)
-        {
-                if (mInitialMesh->mSubMesh[i].mSharedVertexBuffer)
-                {
-                        Mesh *sharedMesh = mGeoMesh->toSharedVertex();
-                        delete mGeoMesh;
-                        mGeoMesh = sharedMesh;
-                        break;
-                }
-        }
-
         //      Sort bones.
         //sortBones();
@@ -275 +197 @@
         //mGeoMesh = sharedMesh;
         
-        // if the initial mesh had shared vertex, 
-        // convert the mesh to shared vertex
-        for (int i=0; i<mInitialMesh->mSubMeshCount; i++)
-        {
-                if (mInitialMesh->mSubMesh[i].mSharedVertexBuffer)
-                {
-                        Mesh *sharedMesh = mGeoMesh->toSharedVertex();
-                        delete mGeoMesh;
-                        mGeoMesh = sharedMesh;
-                        break;
-                }
-        }
-
         //      Sort bones.
         //sortBones();