Make BenchmarkDemo a console application, without OpenGL/Glut dependency.

Fix potential division by zero when enabling convex distance utility.
Thanks to linzner http://code.google.com/p/bullet/issues/detail?id=264
This commit is contained in:
erwin.coumans
2009-08-12 08:18:57 +00:00
parent ae3255f5e9
commit e89fe1cbfa
17 changed files with 152 additions and 90 deletions

View File

@@ -18,13 +18,8 @@ subject to the following restrictions:
///ContinuousConvexCollisionDemo shows the working of the continuous collision detection, including linear and angular motion
#ifdef _WINDOWS
#include "Win32DemoApplication.h"
class btContinuousConvexCollisionDemo : public Win32DemoApplication
#else
#include "GlutDemoApplication.h"
class btContinuousConvexCollisionDemo : public GlutDemoApplication
#endif
{
public:

View File

@@ -63,7 +63,7 @@ btTransform toTrans[maxNumObjects];
int screenWidth = 640;
int screenHeight = 480;
#ifndef _WINDOWS
int main(int argc,char** argv)
{
btContinuousConvexCollisionDemo* ccdDemo = new btContinuousConvexCollisionDemo();
@@ -74,16 +74,6 @@ int main(int argc,char** argv)
return glutmain(argc, argv,screenWidth,screenHeight,"Continuous Convex Collision Demo",ccdDemo);
}
#else
DemoApplication* createDemo()
{
btContinuousConvexCollisionDemo* ccdDemo = new btContinuousConvexCollisionDemo();
ccdDemo->setCameraDistance(40.f);
return ccdDemo;
}
#endif //_WINDOWS
void btContinuousConvexCollisionDemo::initPhysics()