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

fixes in serialization (don't serialize shapes multiple times), hull shape issue,

Browse Source 
fix InternalEdgeDemo compilation using GLUT
This commit is contained in:
erwin.coumans
2010-01-30 06:55:39 +00:00
parent d5f5ddf2f1
commit 01b66a6799
7 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/SerializeDemo/SerializeDemo.cpp
View File

@@ -161,9 +161,9 @@ void SerializeDemo::initPhysics()
btVector3 positions[2] = {btVector3(0.1f,0.2f,0.3f),btVector3(0.4f,0.5f,0.6f)};
btScalar radii[2] = {0.3f,0.4f};
//btMultiSphereShape* colShape = new btMultiSphereShape(positions,radii,numSpheres);
btMultiSphereShape* colShape = new btMultiSphereShape(positions,radii,numSpheres);
btCollisionShape* colShape = new btCapsuleShapeZ(SCALING*1,SCALING*1);
//btCollisionShape* colShape = new btCapsuleShapeZ(SCALING*1,SCALING*1);
//btCollisionShape* colShape = new btCylinderShapeZ(btVector3(SCALING*1,SCALING*1,SCALING*1));
//btCollisionShape* colShape = new btBoxShape(btVector3(SCALING*1,SCALING*1,SCALING*1));
//btCollisionShape* colShape = new btSphereShape(btScalar(1.));