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

fix ForkLiftDemo update (previous commit)

Browse Source 
implement preallocate{Vertices,Indices} in btTriangleMesh. Fixes Issue 647.
This commit is contained in:
erwin.coumans
2012-09-09 17:59:02 +00:00
parent ff72d64ffa
commit 7bb4e0e1bd
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Demos/ForkLiftDemo/ForkLiftDemo.cpp
View File

@@ -507,12 +507,13 @@ void ForkLiftDemo::clientMoveAndDisplay()
if (m_idle) if (m_idle)
dt = 1.0/420.f; dt = 1.0/420.f;
int numSimSteps;
numSimSteps = m_dynamicsWorld->stepSimulation(dt,maxSimSubSteps);
//#define VERBOSE_FEEDBACK //#define VERBOSE_FEEDBACK
#ifdef VERBOSE_FEEDBACK #ifdef VERBOSE_FEEDBACK
int numSimSteps = m_dynamicsWorld->stepSimulation(dt,maxSimSubSteps); if (!numSimSteps)
if (!numSimSteps)
printf("Interpolated transforms\n"); printf("Interpolated transforms\n");
else else
{ {

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

@@ -138,3 +138,25 @@ int btTriangleMesh::getNumTriangles() const
} }
return m_16bitIndices.size() / 3; return m_16bitIndices.size() / 3;
} }
void btTriangleMesh::preallocateVertices(int numverts)
{
if (m_use4componentVertices)
{
m_4componentVertices.reserve(numverts);
} else
{
m_3componentVertices.reserve(numverts);
}
}
void btTriangleMesh::preallocateIndices(int numindices)
{
if (m_use32bitIndices)
{
m_32bitIndices.reserve(numindices);
} else
{
m_16bitIndices.reserve(numindices);
}
}

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

@@ -55,8 +55,8 @@ class btTriangleMesh : public btTriangleIndexVertexArray
int getNumTriangles() const; int getNumTriangles() const;
virtual void preallocateVertices(int numverts){(void) numverts;} virtual void preallocateVertices(int numverts);
virtual void preallocateIndices(int numindices){(void) numindices;} virtual void preallocateIndices(int numindices);
///findOrAddVertex is an internal method, use addTriangle instead ///findOrAddVertex is an internal method, use addTriangle instead
int findOrAddVertex(const btVector3& vertex, bool removeDuplicateVertices); int findOrAddVertex(const btVector3& vertex, bool removeDuplicateVertices);