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

fix Mac build

Browse Source
This commit is contained in:
Erwin Coumans
2014-07-03 22:30:50 -07:00
parent bae303c5da
commit b438b91009
6 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/OpenGL/GL_ShapeDrawer.cpp
View File

@@ -515,8 +515,8 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons
glGenTextures(1,(GLuint*)&m_texturehandle); glGenTextures(1,(GLuint*)&m_texturehandle);
glBindTexture(GL_TEXTURE_2D,m_texturehandle); glBindTexture(GL_TEXTURE_2D,m_texturehandle);
glTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE,GL_MODULATE); glTexEnvf(GL_TEXTURE_ENV,GL_TEXTURE_ENV_MODE,GL_MODULATE);
glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR); //glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR_MIPMAP_LINEAR);
glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR); //glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR_MIPMAP_LINEAR);
glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT); glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_S,GL_REPEAT);
glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT); glTexParameterf(GL_TEXTURE_2D,GL_TEXTURE_WRAP_T,GL_REPEAT);
gluBuild2DMipmaps(GL_TEXTURE_2D,3,256,256,GL_RGB,GL_UNSIGNED_BYTE,image); gluBuild2DMipmaps(GL_TEXTURE_2D,3,256,256,GL_RGB,GL_UNSIGNED_BYTE,image);

2
Demos/OpenGL/GlutStuff.cpp
View File

@@ -71,7 +71,7 @@ static void glutDisplayCallback(void)
gDemoApplication->displayCallback(); gDemoApplication->displayCallback();
} }
#include <GL/glut.h> //#include <GL/glut.h>
int glutmain(int argc, char **argv,int width,int height,const char* title,DemoApplication* demoApp) { int glutmain(int argc, char **argv,int width,int height,const char* title,DemoApplication* demoApp) {

53
Demos/OpenGL/GlutStuff.h
View File

@@ -37,46 +37,51 @@ subject to the following restrictions:
#include <windows.h> #include <windows.h>
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#define BT_ACTIVE_ALT VK_LMENU
#define BT_ACTIVE_SHIFT VK_LSHIFT
#define BT_ACTIVE_CTRL VK_LCONTROL
#else //_WINDOWS #else //_WINDOWS
#ifdef DONT_USE_GLUT #ifdef DONT_USE_GLUT
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
#define BT_ACTIVE_ALT 8192
#define BT_ACTIVE_SHIFT 8193
#define BT_ACTIVE_CTRL 8194
#else//DONT_USE_GLUT #else//DONT_USE_GLUT
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#endif//_WIN32 #endif//_WIN32
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glut.h> #include <GL/glut.h>
#define BT_KEY_K 'k'
#define BT_KEY_LEFT GLUT_KEY_LEFT
#define BT_KEY_RIGHT GLUT_KEY_RIGHT
#define BT_KEY_UP GLUT_KEY_UP
#define BT_KEY_DOWN GLUT_KEY_DOWN
#define BT_KEY_F1 GLUT_KEY_F1
#define BT_KEY_F2 GLUT_KEY_F2
#define BT_KEY_F3 GLUT_KEY_F3
#define BT_KEY_F4 GLUT_KEY_F4
#define BT_KEY_F5 GLUT_KEY_F5
#define BT_KEY_PAGEUP GLUT_KEY_PAGE_UP
#define BT_KEY_PAGEDOWN GLUT_KEY_PAGE_DOWN
#define BT_KEY_END GLUT_KEY_END
#define BT_KEY_HOME GLUT_KEY_HOME
#define BT_ACTIVE_ALT GLUT_ACTIVE_ALT
#define BT_ACTIVE_CTRL GLUT_ACTIVE_ALT
#define BT_ACTIVE_SHIFT GLUT_ACTIVE_SHIFT
#endif//DONT_USE_GLUT #endif//DONT_USE_GLUT
#endif//_WINDOWS #endif//_WINDOWS
#endif //(__APPLE__) && !defined (VMDMESA) #endif //(__APPLE__) && !defined (VMDMESA)
#ifdef _WINDOWS
#define BT_ACTIVE_ALT VK_LMENU
#define BT_ACTIVE_SHIFT VK_LSHIFT
#define BT_ACTIVE_CTRL VK_LCONTROL
#else //_WINDOWS
#ifdef DONT_USE_GLUT
#define BT_ACTIVE_ALT 8192
#define BT_ACTIVE_SHIFT 8193
#define BT_ACTIVE_CTRL 8194
#else//DONT_USE_GLUT
#define BT_KEY_K 'k'
#define BT_KEY_LEFT GLUT_KEY_LEFT
#define BT_KEY_RIGHT GLUT_KEY_RIGHT
#define BT_KEY_UP GLUT_KEY_UP
#define BT_KEY_DOWN GLUT_KEY_DOWN
#define BT_KEY_F1 GLUT_KEY_F1
#define BT_KEY_F2 GLUT_KEY_F2
#define BT_KEY_F3 GLUT_KEY_F3
#define BT_KEY_F4 GLUT_KEY_F4
#define BT_KEY_F5 GLUT_KEY_F5
#define BT_KEY_PAGEUP GLUT_KEY_PAGE_UP
#define BT_KEY_PAGEDOWN GLUT_KEY_PAGE_DOWN
#define BT_KEY_END GLUT_KEY_END
#define BT_KEY_HOME GLUT_KEY_HOME
#define BT_ACTIVE_ALT GLUT_ACTIVE_ALT
#define BT_ACTIVE_CTRL GLUT_ACTIVE_ALT
#define BT_ACTIVE_SHIFT GLUT_ACTIVE_SHIFT
#endif
#endif
#if BT_USE_FREEGLUT #if BT_USE_FREEGLUT
#include "GL/freeglut_ext.h" //to be able to return from glutMainLoop() #include "GL/freeglut_ext.h" //to be able to return from glutMainLoop()

5
Demos3/BasicDemoCustomOpenGL2/premake4.lua
View File

@@ -32,3 +32,8 @@ project "App_BasicDemoCustomOpenGL2"
"../../Demos/OpenGL/GLDebugFont.cpp", "../../Demos/OpenGL/GLDebugFont.cpp",
"../../Demos/OpenGL/GLDebugFont.h" "../../Demos/OpenGL/GLDebugFont.h"
} }
if os.is("Linux") then links{"X11","pthread"} end
if os.is("MacOSX") then
links{"Cocoa.framework"}
end

2
btgui/OpenGLWindow/MacOpenGLWindow.mm
View File

@@ -942,7 +942,7 @@ void MacOpenGLWindow::startRendering()
assert(err==GL_NO_ERROR); assert(err==GL_NO_ERROR);
glClearColor(1,1,1,1); // glClearColor(1,1,1,1);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); //clear buffers glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); //clear buffers
err = glGetError(); err = glGetError();

4
build3/premake4.lua
View File

@@ -104,8 +104,8 @@
if findOpenGL() then if findOpenGL() then
include "../Demos3/AllBullet2Demos" include "../Demos3/AllBullet2Demos"
include "../Demos3/GpuDemos" include "../Demos3/GpuDemos"
--include"../Demos3/BasicDemoConsole" include"../Demos3/BasicDemoConsole"
--include"../Demos3/BasicDemoCustomOpenGL2" include"../Demos3/BasicDemoCustomOpenGL2"