enable option to use GLFW, instead of our own cross-platform X11/Cocoa/Windows OpenGLWindow classes

This commit is contained in:
erwincoumans
2017-09-19 21:10:54 -07:00
parent 2919e51d9d
commit 390f111547
11 changed files with 127 additions and 25 deletions

View File

@@ -13,6 +13,11 @@
#include "stdlib.h"
#include "TwFonts.h"
#include "SimpleOpenGL2Renderer.h"
#ifdef B3_USE_GLFW
#include "GLFWOpenGLWindow.h"
#else
#ifdef __APPLE__
#include "MacOpenGLWindow.h"
#else
@@ -30,6 +35,8 @@
#endif //BT_USE_EGL
#endif //_WIN32
#endif//__APPLE__
#endif //#ifdef B3_USE_GLFW
#include <stdio.h>
#include "../CommonInterfaces/CommonRenderInterface.h"
@@ -129,7 +136,7 @@ SimpleOpenGL2App::SimpleOpenGL2App(const char* title, int width, int height)
glewExperimental = GL_TRUE;
#endif //_WIN32
#ifndef B3_USE_GLFW
if (glewInit() != GLEW_OK)
{
b3Error("glewInit failed");
@@ -140,7 +147,7 @@ SimpleOpenGL2App::SimpleOpenGL2App(const char* title, int width, int height)
b3Error("GLEW_VERSION_2_1 needs to support 2_1");
exit(1); // or handle the error in a nicer way
}
#endif //B3_USE_GLFW
#endif //__APPLE__
#endif //NO_GLEW
@@ -580,4 +587,4 @@ int SimpleOpenGL2App::registerCubeShape(float halfExtentsX,float halfExtentsY, f
int shapeId = m_renderer->registerShape(&verts[0].xyzw[0],numVertices,cube_indices,numIndices,B3_GL_TRIANGLES,textureIndex);
return shapeId;
}
}