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

fixed Dino demo for Mac OS X

Browse Source
This commit is contained in:
ejcoumans
2006-10-29 14:48:55 +00:00
parent 82b310c9cd
commit 507a06bc06
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Demos/BulletDinoDemo/BulletDino.cpp
View File

@@ -38,12 +38,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <math.h> /* for cos(), sin(), and sqrt() */ #include <math.h> /* for cos(), sin(), and sqrt() */
#include <GL/glut.h> /* OpenGL Utility Toolkit header */ #ifdef WIN32//for glut.h
#include <GL/glext.h> #include <windows.h>
/* Some <math.h> files do not define M_PI... */
#ifndef M_PI
#define M_PI 3.14159265
#endif #endif
#ifndef WIN32 #ifndef WIN32
@@ -52,6 +48,24 @@
#endif #endif
#endif #endif
//think different
#if defined(__APPLE__) && !defined (VMDMESA)
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <GLUT/glut.h>
#define GLVOIDPTR GLvoid(*)(...)
#else
#include <GL/glut.h>
#include <GL/glext.h>
#define GLVOIDPTR void(CALLBACK*)()
#endif
/* Some <math.h> files do not define M_PI... */
#ifndef M_PI
#define M_PI 3.14159265
#endif
/* Variable controlling various rendering modes. */ /* Variable controlling various rendering modes. */
static int stencilReflection = 1, stencilShadow = 1, offsetShadow = 1; static int stencilReflection = 1, stencilShadow = 1, offsetShadow = 1;
static int renderShadow = 1, renderDinosaur = 1, renderReflection = 1; static int renderShadow = 1, renderDinosaur = 1, renderReflection = 1;
@@ -237,9 +251,9 @@ extrudeSolidFromPolygon(GLfloat data[][2], unsigned int dataSize,
if (tobj == NULL) { if (tobj == NULL) {
tobj = gluNewTess(); /* create and initialize a GLU tobj = gluNewTess(); /* create and initialize a GLU
polygon * * tesselation object */ polygon * * tesselation object */
gluTessCallback(tobj, (GLenum)GLU_BEGIN, (void(CALLBACK*)())glBegin); gluTessCallback(tobj, (GLenum)GLU_BEGIN, (GLVOIDPTR)glBegin);
gluTessCallback(tobj, (GLenum)GLU_VERTEX, (void(CALLBACK*)())glVertex2fv); /* semi-tricky */ gluTessCallback(tobj, (GLenum)GLU_VERTEX, (GLVOIDPTR)glVertex2fv); /* semi-tricky */
gluTessCallback(tobj, (GLenum)GLU_END, (void(CALLBACK*)())glEnd); gluTessCallback(tobj, (GLenum)GLU_END, (GLVOIDPTR)glEnd);
} }
glNewList(side, GL_COMPILE); glNewList(side, GL_COMPILE);
glShadeModel(GL_SMOOTH); /* smooth minimizes seeing glShadeModel(GL_SMOOTH); /* smooth minimizes seeing
@@ -781,6 +795,7 @@ main(int argc, char **argv)
{ {
int i; int i;
printf("BulletDino\n");
glutInit(&argc, argv); glutInit(&argc, argv);
for (i=1; i<argc; i++) { for (i=1; i<argc; i++) {

2
Demos/BulletDinoDemo/Jamfile
View File

@@ -1,3 +1,3 @@
SubDir TOP Demos BulletDino ; SubDir TOP Demos BulletDinoDemo ;
ExtraDemo BulletDino : [ Wildcard *.h *.cpp ] ; ExtraDemo BulletDino : [ Wildcard *.h *.cpp ] ;

3
Demos/Jamfile
View File

@@ -67,12 +67,13 @@ else
SubInclude TOP Demos CcdPhysicsDemo ; SubInclude TOP Demos CcdPhysicsDemo ;
SubInclude TOP Demos UserCollisionAlgorithm ; SubInclude TOP Demos UserCollisionAlgorithm ;
#SubInclude TOP Demos ForkLiftDemo ; #SubInclude TOP Demos ForkLiftDemo ;
SubInclude TOP Demos BulletDinoDemo ;
SubInclude TOP Demos BspDemo ; SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos BasicDemo ; SubInclude TOP Demos BasicDemo ;
SubInclude TOP Demos ConvexDecompositionDemo ; SubInclude TOP Demos ConvexDecompositionDemo ;
SubInclude TOP Demos ColladaDemo ; SubInclude TOP Demos ColladaDemo ;
SubInclude TOP Demos BspDemo ; SubInclude TOP Demos BspDemo ;
#SubInclude TOP Demos VehicleDemo ; SubInclude TOP Demos VehicleDemo ;
SubInclude TOP Demos CollisionDemo ; SubInclude TOP Demos CollisionDemo ;
SubInclude TOP Demos CollisionInterfaceDemo ; SubInclude TOP Demos CollisionInterfaceDemo ;
SubInclude TOP Demos ConcaveDemo ; SubInclude TOP Demos ConcaveDemo ;