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:
@@ -1,5 +1,5 @@
|
||||
|
||||
#ifndef _WINDOWS
|
||||
|
||||
#include "GlutDemoApplication.h"
|
||||
|
||||
#include "GlutStuff.h"
|
||||
@@ -81,5 +81,5 @@ void GlutDemoApplication::swapBuffers()
|
||||
|
||||
}
|
||||
|
||||
#endif //_WINDOWS
|
||||
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ static void glutDisplayCallback(void)
|
||||
gDemoApplication->displayCallback();
|
||||
}
|
||||
|
||||
#ifndef _WINDOWS
|
||||
|
||||
int glutmain(int argc, char **argv,int width,int height,const char* title,DemoApplication* demoApp) {
|
||||
|
||||
gDemoApplication = demoApp;
|
||||
@@ -104,4 +104,4 @@ int glutmain(int argc, char **argv,int width,int height,const char* title,DemoAp
|
||||
return 0;
|
||||
}
|
||||
|
||||
#endif //_WINDOWS
|
||||
|
||||
|
||||
@@ -34,26 +34,7 @@ subject to the following restrictions:
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef _WINDOWS
|
||||
#define BT_KEY_K 'K'
|
||||
#define BT_KEY_LEFT VK_LEFT
|
||||
#define BT_KEY_RIGHT VK_RIGHT
|
||||
#define BT_KEY_UP VK_UP
|
||||
#define BT_KEY_DOWN VK_DOWN
|
||||
#define BT_KEY_F1 VK_F1
|
||||
#define BT_KEY_F2 VK_F2
|
||||
#define BT_KEY_F3 VK_F3
|
||||
#define BT_KEY_F4 VK_F4
|
||||
#define BT_KEY_F5 VK_F5
|
||||
#define BT_KEY_PAGEUP VK_PRIOR
|
||||
#define BT_KEY_PAGEDOWN VK_NEXT
|
||||
#define BT_KEY_END VK_END
|
||||
#define BT_KEY_HOME VK_HOME
|
||||
#define BT_ACTIVE_ALT VK_LMENU
|
||||
|
||||
|
||||
|
||||
#else
|
||||
#define BT_KEY_K 'k'
|
||||
#define BT_KEY_LEFT GLUT_KEY_LEFT
|
||||
#define BT_KEY_RIGHT GLUT_KEY_RIGHT
|
||||
@@ -72,7 +53,6 @@ subject to the following restrictions:
|
||||
#define BT_ACTIVE_CTRL GLUT_ACTIVE_ALT
|
||||
#define BT_ACTIVE_SHIFT GLUT_ACTIVE_SHIFT
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
#if BT_USE_FREEGLUT
|
||||
|
||||
Reference in New Issue
Block a user