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

testing ImGUI

Browse Source
This commit is contained in:
Erwin Coumans
2017-04-11 20:16:49 -07:00
parent a43f3b026a
commit f73b54e4ab
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
examples/OpenGLWindow/SimpleOpenGL2App.cpp
View File

@@ -12,6 +12,7 @@
#include "GLInstanceGraphicsShape.h"
#include "stdlib.h"
#include "TwFonts.h"
#include "SimpleOpenGL2Renderer.h"
#ifdef __APPLE__
#include "MacOpenGLWindow.h"
#else
@@ -177,6 +178,8 @@ SimpleOpenGL2App::SimpleOpenGL2App(const char* title, int width, int height)
m_window->setWheelCallback(Simple2WheelCallback);
m_window->setResizeCallback(Simple2ResizeCallback);
m_renderer = new SimpleOpenGL2Renderer(width,height);
}
SimpleOpenGL2App::~SimpleOpenGL2App()

2
examples/OpenGLWindow/SimpleOpenGL3App.h
View File

@@ -16,7 +16,7 @@ struct SimpleOpenGL3App : public CommonGraphicsApp
class GLInstancingRenderer* m_instancingRenderer;
virtual void setBackgroundColor(float red, float green, float blue);
SimpleOpenGL3App(const char* title, int width,int height, bool allowRetina);
SimpleOpenGL3App(const char* title, int width,int height, bool allowRetina=true);
virtual ~SimpleOpenGL3App();
virtual int registerCubeShape(float halfExtentsX=1.f,float halfExtentsY=1.f, float halfExtentsZ = 1.f, int textureIndex = -1, float textureScaling = 1);