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

add support for double precision and 64bit serialization (and compatibility between all versions)

Browse Source 
fix some issue in serialization of nested array data
add some tesing files
This commit is contained in:
erwin.coumans
2010-01-25 19:42:51 +00:00
parent 5d8e6dc3f3
commit e7ff71d99b
48 changed files with 1207 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Demos/ConvexDecompositionDemo/ConvexDecompositionDemo.cpp
View File

@@ -439,6 +439,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
cb.process(desc);
//now create some bodies
if (1)
{
btCompoundShape* compound = new btCompoundShape(false);
m_collisionShapes.push_back (compound);
@@ -456,6 +457,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
btRigidBody* body = localCreateRigidBody( 1.0, trans,convexShape);
}
#if 1
btScalar mass=10.f;
trans.setOrigin(-convexDecompositionObjectOffset);
btRigidBody* body = localCreateRigidBody( mass, trans,compound);
@@ -470,7 +472,7 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
trans.setOrigin(-convexDecompositionObjectOffset);
body = localCreateRigidBody( mass, trans,compound);
body->setCollisionFlags(body->getCollisionFlags() | btCollisionObject::CF_CUSTOM_MATERIAL_CALLBACK);
#endif
}
@@ -499,8 +501,13 @@ void ConvexDecompositionDemo::initPhysics(const char* filename)
setupEmptyDynamicsWorld();
btBulletFileLoader* fileLoader = new btBulletFileLoader(m_dynamicsWorld);
fileLoader->setVerboseMode(true);
fileLoader->loadFileFromMemory("testFile.bullet");
//fileLoader->loadFileFromMemory("testFile64Double.bullet");
//fileLoader->loadFileFromMemory("testFile64Single.bullet");
//fileLoader->loadFileFromMemory("testFile32Single.bullet");

BIN
Demos/ConvexDecompositionDemo/testFile32Single.bullet Normal file
View File

Binary file not shown.

BIN
Demos/ConvexDecompositionDemo/testFile64Double.bullet Normal file
View File

Binary file not shown.

BIN
Demos/ConvexDecompositionDemo/testFile64Single.bullet Normal file
View File

Binary file not shown.

4
Demos/OpenGL/GL_DialogDynamicsWorld.cpp
View File

@@ -343,7 +343,7 @@ static int gPickingConstraintId = 0;
static btVector3 gOldPickingPos;
static btVector3 gHitPos(-1,-1,-1);
static float gOldPickingDist = 0.f;
static btScalar gOldPickingDist = 0.f;
bool GL_DialogDynamicsWorld::mouseFunc(int button, int state, int x, int y)
{
@@ -719,7 +719,7 @@ void GL_DialogDynamicsWorld::mouseMotionFunc(int x,int y)
}
float dx, dy;
btScalar dx, dy;
dx = btScalar(x) - m_mouseOldX;
dy = btScalar(y) - m_mouseOldY;