Changeset 2882 for code/trunk/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp

Timestamp:

Mar 31, 2009, 8:05:51 PM (15 years ago)

Author:

rgrieder

Message:

Update from Bullet 2.73 to 2.74.

File:

• code/trunk/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp (modified) (4 diffs)

code/trunk/src/bullet/BulletCollision/CollisionShapes/btTriangleMesh.cpp

@@ -36 +36 @@
         {
                 m_indexedMeshes[0].m_numTriangles = m_32bitIndices.size()/3;
-                m_indexedMeshes[0].m_triangleIndexBase = (unsigned char*) &m_32bitIndices[0];
+                m_indexedMeshes[0].m_triangleIndexBase = 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 = (unsigned char*) &m_16bitIndices[0];
+                m_indexedMeshes[0].m_triangleIndexBase = 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 = (unsigned char*)&m_4componentVertices[0];
+                m_indexedMeshes[0].m_vertexBase = 0;
                 m_indexedMeshes[0].m_vertexStride = sizeof(btVector3);
         } else
         {
                 m_indexedMeshes[0].m_numVertices = m_3componentVertices.size()/3;
-                m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
+                m_indexedMeshes[0].m_vertexBase = 0;
                 m_indexedMeshes[0].m_vertexStride = 3*sizeof(btScalar);
         }
@@ -112 +112 @@
                         }
         }
-                m_3componentVertices.push_back(vertex.getX());
-                m_3componentVertices.push_back(vertex.getY());
-                m_3componentVertices.push_back(vertex.getZ());
+                m_3componentVertices.push_back((float)vertex.getX());
+                m_3componentVertices.push_back((float)vertex.getY());
+                m_3componentVertices.push_back((float)vertex.getZ());
                 m_indexedMeshes[0].m_numVertices++;
                 m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];