fix Yosemite build
This commit is contained in:
@@ -69,6 +69,7 @@ public:
|
||||
return m_mouseButtonCallback;
|
||||
}
|
||||
virtual b3ResizeCallback getResizeCallback();
|
||||
|
||||
virtual b3WheelCallback getWheelCallback()
|
||||
{
|
||||
return m_wheelCallback;
|
||||
|
||||
@@ -58,6 +58,7 @@ void dumpInfo(void)
|
||||
-(float) GetWindowHeight;
|
||||
-(void) setResizeCallback:(b3ResizeCallback) callback;
|
||||
-(b3ResizeCallback) getResizeCallback;
|
||||
-(NSOpenGLContext*) getContext;
|
||||
@end
|
||||
|
||||
float loop;
|
||||
@@ -80,6 +81,10 @@ float loop;
|
||||
return m_resizeCallback;
|
||||
}
|
||||
|
||||
-(NSOpenGLContext*) getContext
|
||||
{
|
||||
return m_context;
|
||||
}
|
||||
-(void)setResizeCallback:(b3ResizeCallback)callback
|
||||
{
|
||||
m_resizeCallback = callback;
|
||||
@@ -1038,7 +1043,7 @@ void MacOpenGLWindow::endRendering()
|
||||
//#ifndef NO_OPENGL3
|
||||
// glSwapAPPLE();
|
||||
//#else
|
||||
[m_internalData->m_myview->m_context flushBuffer];
|
||||
[[m_internalData->m_myview getContext] flushBuffer];
|
||||
// #endif
|
||||
|
||||
}
|
||||
@@ -1125,3 +1130,4 @@ b3ResizeCallback MacOpenGLWindow::getResizeCallback()
|
||||
{
|
||||
return [m_internalData->m_myview getResizeCallback];
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
#include "SimpleOpenGL2App.h"
|
||||
#define USE_OPENGL2
|
||||
#include "OpenGLInclude.h"
|
||||
|
||||
#include "Bullet3Common/b3Logging.h"//b3Assert?
|
||||
|
||||
Reference in New Issue
Block a user