Changeset 2079

Timestamp:

02/05/07 13:14:05 (17 years ago)

Author:

gumbau

Message:

 

File:

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

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

@@ -988 +988 @@
 //      Update mesh.
 //---------------------------------------------------------------------------
-<<<<<<< .mine
-=======
-void LodStripsConstructor::sortBones()
-{
-        VertexBuffer                                    *mesh_vb;
-        VertexBuffer                                    *copy_vb;
-
-        std::vector<VertexBoneAssignment>       *mesh_bones;
-        std::vector<VertexBoneAssignment>       *copy_bones;
-
-        // 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;
-
-        // 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
-
-        mesh_bones->clear();
-
-        //      Vertex buffers.
-        copy_vb =       mInitialMesh->mVertexBuffer;
-
-        //      Bones.
-        copy_bones = &mInitialMesh->mBones;
-        
-        //      If there are submesh bones.
-        for (int b = 0; b < copy_bones->size(); b++)
-        {
-                VertexBoneAssignment    assign;
-
-                int n   =       (*copy_bones)[b].vertexIndex;
-
-                //      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);
-                        }                       
-                }
-        }
-}
-
->>>>>>> .r2077
 void LodStripsConstructor::UpdateMesh(void)
 {
@@ -1233 +1178 @@
                 }
         }
-
-        //      Sort submesh bones.
-        this->sortBones();
 }
 
@@ -1281 +1223 @@
 
         //      Copy new vertices.
-        std::vector<VertexBoneAssignment> newbones;
         for (unsigned   int     i       =       0;      i < mGeoMeshSQ->mNewVertices.size();    i++)
         {
@@ -1306 +1247 @@
                         {
                                 VertexBoneAssignment vba;
-<<<<<<< .mine
 
                                 vba.boneIndex           =       it->boneIndex;
@@ -1314 +1254 @@
                                 mInitialMesh->mBones.push_back(vba);
                                 bones_count++;
-=======
-                                vba.boneIndex = it->boneIndex;
-                                vba.vertexIndex = mGeoMeshSQ->mNewVertices[i].id;
-                                vba.weight = it->weight;
-                                newbones.push_back(vba);
->>>>>>> .r2077
-                        }
-                }
-        }
-
-        for (std::vector<VertexBoneAssignment>::iterator it = newbones.begin(); it != newbones.end(); it++)
-                mGeoMesh->mBones.push_back(*it);
-
+                        }
+                }
+        }
 
         //      For each submesh.