From 8f4f99809ee5b36e34448b25d53d2b67ae82bb79 Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 12 Sep 2013 22:22:15 +0000 Subject: [PATCH] use btScalar instead of float for btTriangleMesh thanks to nsarkozi. This fixes issue 704 --- src/BulletCollision/CollisionShapes/btTriangleMesh.cpp | 8 ++++---- src/BulletCollision/CollisionShapes/btTriangleMesh.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp b/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp index 51a2f8a07..5fbed334e 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp +++ b/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp @@ -111,10 +111,10 @@ int btTriangleMesh::findOrAddVertex(const btVector3& vertex, bool removeDuplicat return i/3; } } - } - 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]; return (m_3componentVertices.size()/3)-1; diff --git a/src/BulletCollision/CollisionShapes/btTriangleMesh.h b/src/BulletCollision/CollisionShapes/btTriangleMesh.h index 29d1b5cda..0afc2321f 100644 --- a/src/BulletCollision/CollisionShapes/btTriangleMesh.h +++ b/src/BulletCollision/CollisionShapes/btTriangleMesh.h @@ -27,7 +27,7 @@ subject to the following restrictions: class btTriangleMesh : public btTriangleIndexVertexArray { btAlignedObjectArray m_4componentVertices; - btAlignedObjectArray m_3componentVertices; + btAlignedObjectArray m_3componentVertices; btAlignedObjectArray m_32bitIndices; btAlignedObjectArray m_16bitIndices;