Changeset 2908 for code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) (4 diffs)

code/branches/questsystem5/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp

@@ -36 +36 @@
         {
                 m_indexedMeshes[0].m_numTriangles = m_32bitIndices.size()/3;
-                m_indexedMeshes[0].m_triangleIndexBase = 0;
+                m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_32bitIndices[0];
                 m_indexedMeshes[0].m_indexType = PHY_INTEGER;
                 m_indexedMeshes[0].m_triangleIndexStride = 3*sizeof(int);
@@ -42 +42 @@
         {
                 m_indexedMeshes[0].m_numTriangles = m_16bitIndices.size()/3;
-                m_indexedMeshes[0].m_triangleIndexBase = 0;
+                m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_16bitIndices[0];
                 m_indexedMeshes[0].m_indexType = PHY_SHORT;
                 m_indexedMeshes[0].m_triangleIndexStride = 3*sizeof(short int);
@@ -50 +50 @@
         {
                 m_indexedMeshes[0].m_numVertices = m_4componentVertices.size();
-                m_indexedMeshes[0].m_vertexBase = 0;
+                m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_4componentVertices[0];
                 m_indexedMeshes[0].m_vertexStride = sizeof(btVector3);
         } else
         {
                 m_indexedMeshes[0].m_numVertices = m_3componentVertices.size()/3;
-                m_indexedMeshes[0].m_vertexBase = 0;
+                m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
                 m_indexedMeshes[0].m_vertexStride = 3*sizeof(btScalar);
         }
@@ -112 +112 @@
                         }
         }
-                m_3componentVertices.push_back((float)vertex.getX());
-                m_3componentVertices.push_back((float)vertex.getY());
-                m_3componentVertices.push_back((float)vertex.getZ());
+                m_3componentVertices.push_back(vertex.getX());
+                m_3componentVertices.push_back(vertex.getY());
+                m_3componentVertices.push_back(vertex.getZ());
                 m_indexedMeshes[0].m_numVertices++;
                 m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];