Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use btScalar instead of float for btTriangleMesh

Browse Source 
thanks to nsarkozi. This fixes issue 704
This commit is contained in:
erwin.coumans
2013-09-12 22:22:15 +00:00
parent 29915ba7fd
commit 8f4f99809e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
View File

@@ -111,10 +111,10 @@ int btTriangleMesh::findOrAddVertex(const btVector3& vertex, bool removeDuplicat
return i/3; return i/3;
} }
} }
} }
m_3componentVertices.push_back((float)vertex.getX()); m_3componentVertices.push_back(vertex.getX());
m_3componentVertices.push_back((float)vertex.getY()); m_3componentVertices.push_back(vertex.getY());
m_3componentVertices.push_back((float)vertex.getZ()); m_3componentVertices.push_back(vertex.getZ());
m_indexedMeshes[0].m_numVertices++; m_indexedMeshes[0].m_numVertices++;
m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0]; m_indexedMeshes[0].m_vertexBase = (unsigned char*)&m_3componentVertices[0];
return (m_3componentVertices.size()/3)-1; return (m_3componentVertices.size()/3)-1;

2
src/BulletCollision/CollisionShapes/btTriangleMesh.h
View File

@@ -27,7 +27,7 @@ subject to the following restrictions:
class btTriangleMesh : public btTriangleIndexVertexArray class btTriangleMesh : public btTriangleIndexVertexArray
{ {
btAlignedObjectArray<btVector3> m_4componentVertices; btAlignedObjectArray<btVector3> m_4componentVertices;
btAlignedObjectArray<float> m_3componentVertices; btAlignedObjectArray<btScalar> m_3componentVertices;
btAlignedObjectArray<unsigned int> m_32bitIndices; btAlignedObjectArray<unsigned int> m_32bitIndices;
btAlignedObjectArray<unsigned short int> m_16bitIndices; btAlignedObjectArray<unsigned short int> m_16bitIndices;