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

fix OSX build

Browse Source
This commit is contained in:
Erwin Coumans
2013-07-02 21:08:52 -07:00
parent 0f78c696b5
commit 8faf5bca21
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
btgui/GwenOpenGLTest/premake4.lua
View File

@@ -42,8 +42,6 @@
"../../src/Bullet3Common/b3Logging.h", "../../src/Bullet3Common/b3Logging.h",
"../../src/Bullet3Common/b3Logging.cpp", "../../src/Bullet3Common/b3Logging.cpp",
"../../src/Bullet3Common/b3AlignedAllocator.cpp", "../../src/Bullet3Common/b3AlignedAllocator.cpp",
"../../btgui/Timing/b3Quickprof.cpp",
"../../btgui/Timing/b3Quickprof.h",
"../../btgui/Timing/b3Clock.cpp", "../../btgui/Timing/b3Clock.cpp",
"../../btgui/Timing/b3Clock.h", "../../btgui/Timing/b3Clock.h",
"**.cpp", "**.cpp",

7
btgui/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -1192,6 +1192,10 @@ void GLInstancingRenderer::renderSceneInternal(int renderMode)
// glEnable(GL_DEPTH_TEST); // glEnable(GL_DEPTH_TEST);
GLint dims[4];
glGetIntegerv(GL_VIEWPORT, dims);
//we need to get the viewport dims, because on Apple Retina the viewport dimension is different from screenWidth
//printf("dims=%d,%d,%d,%d\n",dims[0],dims[1],dims[2],dims[3]);
// Accept fragment if it closer to the camera than the former one // Accept fragment if it closer to the camera than the former one
//glDepthFunc(GL_LESS); //glDepthFunc(GL_LESS);
@@ -1504,7 +1508,8 @@ void GLInstancingRenderer::renderSceneInternal(int renderMode)
{ {
// writeTextureToPng(shadowMapWidth,shadowMapHeight,"shadowmap.png",4); // writeTextureToPng(shadowMapWidth,shadowMapHeight,"shadowmap.png",4);
m_data->m_shadowMap->disable(); m_data->m_shadowMap->disable();
glViewport(0,0,m_screenWidth,m_screenHeight); glViewport(dims[0],dims[1],dims[2],dims[3]);
} }
err = glGetError(); err = glGetError();