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

fix an issue in the ConvexDecompositionDemo, replacing std::vector by btAlignedObjectArray.

Browse Source
This commit is contained in:
erwin.coumans
2011-04-01 18:09:31 +00:00
parent 852fa3ba30
commit 46be84741c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
View File

@@ -293,24 +293,25 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
} }
// float mass = 1.f; // float mass = 1.f;
//float collisionMargin = 0.01f;
//this is a tools issue: due to collision margin, convex objects overlap, compensate for it here: //this is a tools issue: due to collision margin, convex objects overlap, compensate for it here:
//#define SHRINK_OBJECT_INWARDS 1 //#define SHRINK_OBJECT_INWARDS 1
#ifdef SHRINK_OBJECT_INWARDS #ifdef SHRINK_OBJECT_INWARDS
float collisionMargin = 0.01f;
std::vector<btVector3> planeEquations; btAlignedObjectArray<btVector3> planeEquations;
btGeometryUtil::getPlaneEquationsFromVertices(vertices,planeEquations); btGeometryUtil::getPlaneEquationsFromVertices(vertices,planeEquations);
std::vector<btVector3> shiftedPlaneEquations; btAlignedObjectArray<btVector3> shiftedPlaneEquations;
for (int p=0;p<planeEquations.size();p++) for (int p=0;p<planeEquations.size();p++)
{ {
btVector3 plane = planeEquations[p]; btVector3 plane = planeEquations[p];
plane[3] += 5*collisionMargin; plane[3] += collisionMargin;
shiftedPlaneEquations.push_back(plane); shiftedPlaneEquations.push_back(plane);
} }
std::vector<btVector3> shiftedVertices; btAlignedObjectArray<btVector3> shiftedVertices;
btGeometryUtil::getVerticesFromPlaneEquations(shiftedPlaneEquations,shiftedVertices); btGeometryUtil::getVerticesFromPlaneEquations(shiftedPlaneEquations,shiftedVertices);