From b438b910094cc28a38e99fbc0bd758528579f6a7 Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Thu, 3 Jul 2014 22:30:50 -0700 Subject: [PATCH] fix Mac build --- Demos/OpenGL/GL_ShapeDrawer.cpp | 4 +- Demos/OpenGL/GlutStuff.cpp | 2 +- Demos/OpenGL/GlutStuff.h | 53 ++++++++++++---------- Demos3/BasicDemoCustomOpenGL2/premake4.lua | 5 ++ btgui/OpenGLWindow/MacOpenGLWindow.mm | 2 +- build3/premake4.lua | 4 +- 6 files changed, 40 insertions(+), 30 deletions(-) diff --git a/Demos/OpenGL/GL_ShapeDrawer.cpp b/Demos/OpenGL/GL_ShapeDrawer.cpp index f9acd1250..c23355503 100644 --- a/Demos/OpenGL/GL_ShapeDrawer.cpp +++ b/Demos/OpenGL/GL_ShapeDrawer.cpp @@ -515,8 +515,8 @@ void GL_ShapeDrawer::drawOpenGL(btScalar* m, const btCollisionShape* shape, cons glGenTextures(1,(GLuint*)&m_texturehandle); glBindTexture(GL_TEXTURE_2D,m_texturehandle); 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_MAG_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_WRAP_S,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); diff --git a/Demos/OpenGL/GlutStuff.cpp b/Demos/OpenGL/GlutStuff.cpp index b9d5496b9..c40de30e5 100644 --- a/Demos/OpenGL/GlutStuff.cpp +++ b/Demos/OpenGL/GlutStuff.cpp @@ -71,7 +71,7 @@ static void glutDisplayCallback(void) gDemoApplication->displayCallback(); } -#include +//#include int glutmain(int argc, char **argv,int width,int height,const char* title,DemoApplication* demoApp) { diff --git a/Demos/OpenGL/GlutStuff.h b/Demos/OpenGL/GlutStuff.h index 49631b17f..0cf19c304 100644 --- a/Demos/OpenGL/GlutStuff.h +++ b/Demos/OpenGL/GlutStuff.h @@ -37,46 +37,51 @@ subject to the following restrictions: #include #include #include - #define BT_ACTIVE_ALT VK_LMENU - #define BT_ACTIVE_SHIFT VK_LSHIFT - #define BT_ACTIVE_CTRL VK_LCONTROL #else //_WINDOWS #ifdef DONT_USE_GLUT #include #include - #define BT_ACTIVE_ALT 8192 - #define BT_ACTIVE_SHIFT 8193 - #define BT_ACTIVE_CTRL 8194 #else//DONT_USE_GLUT #ifdef _WIN32 #include #endif//_WIN32 #include #include - #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//_WINDOWS #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 #include "GL/freeglut_ext.h" //to be able to return from glutMainLoop() diff --git a/Demos3/BasicDemoCustomOpenGL2/premake4.lua b/Demos3/BasicDemoCustomOpenGL2/premake4.lua index c2cd23b10..e59c3e9ab 100644 --- a/Demos3/BasicDemoCustomOpenGL2/premake4.lua +++ b/Demos3/BasicDemoCustomOpenGL2/premake4.lua @@ -32,3 +32,8 @@ project "App_BasicDemoCustomOpenGL2" "../../Demos/OpenGL/GLDebugFont.cpp", "../../Demos/OpenGL/GLDebugFont.h" } +if os.is("Linux") then links{"X11","pthread"} end + +if os.is("MacOSX") then + links{"Cocoa.framework"} +end diff --git a/btgui/OpenGLWindow/MacOpenGLWindow.mm b/btgui/OpenGLWindow/MacOpenGLWindow.mm index 1327041fa..8cab0de5e 100644 --- a/btgui/OpenGLWindow/MacOpenGLWindow.mm +++ b/btgui/OpenGLWindow/MacOpenGLWindow.mm @@ -942,7 +942,7 @@ void MacOpenGLWindow::startRendering() 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 err = glGetError(); diff --git a/build3/premake4.lua b/build3/premake4.lua index d6a880a22..9d17c5e3c 100644 --- a/build3/premake4.lua +++ b/build3/premake4.lua @@ -104,8 +104,8 @@ if findOpenGL() then include "../Demos3/AllBullet2Demos" include "../Demos3/GpuDemos" - --include"../Demos3/BasicDemoConsole" - --include"../Demos3/BasicDemoCustomOpenGL2" + include"../Demos3/BasicDemoConsole" + include"../Demos3/BasicDemoCustomOpenGL2"