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

fix doubleprecision build

Browse Source
This commit is contained in:
ejcoumans
2008-01-24 02:40:15 +00:00
parent f7b8023fbc
commit 30e1c56520
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Demos/ConcaveConvexcastDemo/ConcaveConvexcastDemo.cpp
View File

@@ -200,8 +200,13 @@ public:
btScalar m[16]; btScalar m[16];
T.getOpenGLMatrix (&m[0]); T.getOpenGLMatrix (&m[0]);
glPushMatrix (); glPushMatrix ();
#ifdef BT_USE_DOUBLE_PRECISION
glMultMatrixd (&m[0]);
glScaled (2.0 * boxShapeHalfExtents[0], 2.0 * boxShapeHalfExtents[1], 2.0 * boxShapeHalfExtents[2]);
#else
glMultMatrixf (&m[0]); glMultMatrixf (&m[0]);
glScalef (2.0 * boxShapeHalfExtents[0], 2.0 * boxShapeHalfExtents[1], 2.0 * boxShapeHalfExtents[2]); glScalef (2.0 * boxShapeHalfExtents[0], 2.0 * boxShapeHalfExtents[1], 2.0 * boxShapeHalfExtents[2]);
#endif //BT_USE_DOUBLE_PRECISION
glutSolidCube (1.0); glutSolidCube (1.0);
glPopMatrix (); glPopMatrix ();
} }

2
Extras/BulletMultiThreaded/SpuRaycastTaskProcess.cpp
View File

@@ -99,7 +99,7 @@ void SpuRaycastTaskProcess::issueTask2()
} }
} }
void SpuRaycastTaskProcess::addWorkToTask(SpuRaycastTaskWorkUnit workunit) void SpuRaycastTaskProcess::addWorkToTask(SpuRaycastTaskWorkUnit& workunit)
{ {
m_spuRaycastTaskDesc[m_currentTask].workUnits[m_currentWorkUnitInTask] = workunit; m_spuRaycastTaskDesc[m_currentTask].workUnits[m_currentWorkUnitInTask] = workunit;
m_currentWorkUnitInTask++; m_currentWorkUnitInTask++;

2
Extras/BulletMultiThreaded/SpuRaycastTaskProcess.h
View File

@@ -61,7 +61,7 @@ public:
void initialize2(void* spuCollisionObjectsWrappers, int numSpuCollisionObjectWrappers); void initialize2(void* spuCollisionObjectsWrappers, int numSpuCollisionObjectWrappers);
/// batch up additional work to a current task for SPU processing. When batch is full, it issues the task. /// batch up additional work to a current task for SPU processing. When batch is full, it issues the task.
void addWorkToTask(struct SpuRaycastTaskWorkUnit); void addWorkToTask(struct SpuRaycastTaskWorkUnit&);
/// call flush to submit potential outstanding work to SPUs and wait for all involved SPUs to be finished /// call flush to submit potential outstanding work to SPUs and wait for all involved SPUs to be finished
void flush2(); void flush2();

21
src/BulletCollision/CollisionShapes/btShapeHull.cpp
View File

@@ -100,7 +100,8 @@ btShapeHull::buildHull (btScalar margin)
} }
btVector3 supportPoints[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2]; btVector3 supportPoints[NUM_UNITSPHERE_POINTS+MAX_PREFERRED_PENETRATION_DIRECTIONS*2];
for (int i = 0; i < numSampleDirections; i++) int i;
for (i = 0; i < numSampleDirections; i++)
{ {
supportPoints[i] = m_shape->localGetSupportingVertex(btUnitSpherePoints[i]); supportPoints[i] = m_shape->localGetSupportingVertex(btUnitSpherePoints[i]);
} }
@@ -108,9 +109,23 @@ btShapeHull::buildHull (btScalar margin)
HullDesc hd; HullDesc hd;
hd.mFlags = QF_TRIANGLES; hd.mFlags = QF_TRIANGLES;
hd.mVcount = numSampleDirections; hd.mVcount = numSampleDirections;
hd.mVertices = &supportPoints[0][0];
hd.mVertexStride = sizeof (btVector3);
#ifdef BT_USE_DOUBLE_PRECISION
float* tmpVerts = new float[numSampleDirections*3];
for (i=0;i<numSampleDirections;i++)
{
tmpVerts[i*3] = supportPoints[i].getX();
tmpVerts[i*3+1] = supportPoints[i].getY();
tmpVerts[i*3+2] = supportPoints[i].getZ();
}
hd.mVertices = tmpVerts;
hd.mVertexStride = 3*sizeof(float);//sizeof (btVector3);
#else
hd.mVertices = &supportPoints[0];
hd.mVertexStride = sizeof (btVector3);
#endif
HullLibrary hl; HullLibrary hl;
HullResult hr; HullResult hr;