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

Merge branch 'master' of https://github.com/bulletphysics/bullet3

Browse Source
This commit is contained in:
Erwin Coumans
2014-07-02 09:40:39 -07:00
parent 05baa69fa9 dca234ec02
commit 87d44cbb74
12 changed files with 2550 additions and 1406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
btgui/OpenGLWindow/MacOpenGLWindow.mm
View File

@@ -339,8 +339,10 @@ void MacOpenGLWindow::createWindow(const b3gWindowConstructionInfo& ci)
// https://developer.apple.com/library/mac/#documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/CapturingScreenContents/CapturingScreenContents.html#//apple_ref/doc/uid/TP40012302-CH10-SW1
//support HighResolutionOSX for Retina Macbook
[m_internalData->m_myview setWantsBestResolutionOpenGLSurface:YES];
if (ci.m_openglVersion>=3)
{
[m_internalData->m_myview setWantsBestResolutionOpenGLSurface:YES];
}
NSSize sz;
sz.width = 1;
sz.height = 1;
@@ -354,29 +356,18 @@ void MacOpenGLWindow::createWindow(const b3gWindowConstructionInfo& ci)
[m_internalData->m_window setContentView: m_internalData->m_myview];
GLuint n = 1;
GLuint vbo[3]={-1,-1,-1};
glGenBuffers(n, vbo);
checkError("glGenBuffers");
[m_internalData->m_window setDelegate:(id) m_internalData->m_myview];
glGenBuffers(n, vbo);
checkError("glGenBuffers");
[m_internalData->m_window makeKeyAndOrderFront: nil];
[m_internalData->m_myview MakeCurrent];
m_internalData->m_width = m_internalData->m_myview.GetWindowWidth;
m_internalData->m_height = m_internalData->m_myview.GetWindowHeight;
glGenBuffers(n, vbo);
checkError("glGenBuffers");
[NSApp activateIgnoringOtherApps:YES];
glGenBuffers(n, vbo);
checkError("glGenBuffers");
//[m_internalData->m_window setLevel:NSMainMenuWindowLevel];