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

Fix broken CDTestFramework

Browse Source 
Avoid crash in BulletWorldImporter, ignoring 'invalid' constraints between two static bodies
Use a bitfield for btCollisionObject::CollisionObjectTypes (to allow custom types that are derived from build-in types such as btRigidBody)
Revert/improve softbody debug rendering
This commit is contained in:
erwin.coumans
2010-08-15 20:45:55 +00:00
parent 4f9b450200
commit 844a54a409
14 changed files with 187 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Demos/AllBulletDemos/CMakeLists.txt
View File

@@ -48,6 +48,9 @@ SET(AllBulletDemos_SRCS
../ForkLiftDemo/ForkLiftDemo.cpp
../SoftDemo/SoftDemo.cpp
../ConstraintDemo/ConstraintDemo.cpp
../Benchmarks/BenchmarkDemo.cpp
../Box2dDemo/Box2dDemo.cpp
)
IF (WIN32)

10
Demos/AllBulletDemos/DemoEntries.cpp
View File

@@ -30,8 +30,10 @@ subject to the following restrictions:
#include "../GjkConvexCastDemo/LinearConvexCastDemo.h"
#include "../ForkLiftDemo/ForkLiftDemo.h"
#include "../ConstraintDemo/ConstraintDemo.h"
//#include "../Benchmarks/BenchmarkDemo.h"
#include "../Benchmarks/BenchmarkDemo.h"
#include "../SoftDemo/SoftDemo.h"
#include "../Box2dDemo/Box2dDemo.h"
#include "GLDebugFont.h"
#include "GlutStuff.h"//OpenGL stuff
@@ -104,7 +106,7 @@ public:
btDemoEntry g_demoEntries[] =
{
{"Box2dDemo",Box2dDemo::Create},
{"ConstraintDemo",ConstraintDemo::Create},
{"ForkLift Demo",ForkLiftDemo::Create},
{"Ragdoll Demo",RagdollDemo::Create},
@@ -122,7 +124,7 @@ btDemoEntry g_demoEntries[] =
{"SoftBody Cloth Attach",SoftDemo5::Create},
{"SoftBody Cloth",SoftDemo0::Create},
// {"SoftBody Volume",SoftDemo2::Create},
{"SoftBody Pressure",SoftDemo1::Create},
{"SoftBody Cluster Car",SoftDemo24::Create},
@@ -159,7 +161,7 @@ btDemoEntry g_demoEntries[] =
//{"BspDemo", BspDemo::Create},
// {"Raytracer Test",Raytracer::Create},
// {"GjkConvexCast",LinearConvexCastDemo::Create},
// {"Benchmark 3000 FALL",BenchmarkDemo1::Create},
{"Benchmark 3000 FALL",BenchmarkDemo1::Create},
// {"Benchmark 1000 STACK",BenchmarkDemo2::Create},
// {"Benchmark 136 RAGDOLLS",BenchmarkDemo3::Create},
// {"Benchmark 1000 CONVEX",BenchmarkDemo4::Create},

4
Demos/AllBulletDemos/Main.cpp
View File

@@ -75,8 +75,8 @@ void setDefaultSettings()
viewY = 0.0f;
framePeriod = 6;//16;//16;//todo: test if this value should be 0
width = 800;//640;
height = 600;//1024;//480;
width = 1280;
height = 768;//480;
iterationCount = 10;
gDrawAabb=0;
gWireFrame=0;

1
Demos/SoftDemo/SoftDemo.cpp
View File

@@ -1454,6 +1454,7 @@ void SoftDemo::renderme()
{
btIDebugDraw* idraw=m_dynamicsWorld->getDebugDrawer();
glDisable(GL_TEXTURE_2D);
m_dynamicsWorld->debugDrawWorld();
/* Bodies */