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

Don't use GLUT by default under Windows, but a Win32 App instead. All demos have to be fixed (only basic demo works now). Also on Mac OSX, we plan to use cocoa instead of Glut.

Browse Source
This commit is contained in:
erwin.coumans
2010-01-19 22:59:49 +00:00
parent 5d3ba1daa6
commit 7b41af1765
13 changed files with 161 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Demos/OpenGL/GlutStuff.h
View File

@@ -26,13 +26,15 @@ subject to the following restrictions:
#include <GLUT/glut.h>
#else
#include <GL/glut.h>
#ifdef _WINDOWS
#include <windows.h>
#include <GL/gl.h>
#include <GL/glu.h>
#endif
#endif
#define BT_ACTIVE_ALT VK_LMENU
#else
#include <GL/glut.h>
#define BT_KEY_K 'k'
@@ -53,7 +55,8 @@ subject to the following restrictions:
#define BT_ACTIVE_CTRL GLUT_ACTIVE_ALT
#define BT_ACTIVE_SHIFT GLUT_ACTIVE_SHIFT
#endif
#endif
#if BT_USE_FREEGLUT
#include "GL/freeglut_ext.h" //to be able to return from glutMainLoop()