Cleanup some #defines in parallel collision detector, add conditional freeglut support to return from glutMainLoop.

This commit is contained in:
ejcoumans
2007-12-15 00:40:34 +00:00
parent 335c79a2a2
commit 6dff743d68
8 changed files with 98 additions and 290 deletions

View File

@@ -225,7 +225,7 @@ void MouseMotion(int x, int y)
demo->mouseMotionFunc(x,y);
}
#if (defined (WIN32) && defined (_MSC_VER))
#ifdef BT_USE_FREEGLUT
#include "GL/freeglut_ext.h"
#endif
@@ -241,7 +241,7 @@ int main(int argc, char** argv)
glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE |GLUT_DEPTH);
glutInitWindowSize(width, height);
mainWindow = glutCreateWindow("http://bulletphysics.com");
#if (defined (WIN32) && defined (_MSC_VER))
#ifdef BT_USE_FREEGLUT
glutSetOption (GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
#endif
entry = g_demoEntries + testIndex;