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

fix Mac OSX version of preparation of AllBullet2Demo collection

Browse Source
This commit is contained in:
Erwin Coumans
2013-12-19 22:23:50 -08:00
parent 12dd0daebc
commit 999c5ff766
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos3/AllBullet2Demos/main.cpp
View File

@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
GLint err = glGetError(); GLint err = glGetError();
assert(err==GL_NO_ERROR); assert(err==GL_NO_ERROR);
sth_stash* fontstash=0; sth_stash* fontstash=app->getFontStash();
gui = new GwenUserInterface; gui = new GwenUserInterface;
gui->init(width,height,fontstash,app->m_window->getRetinaScale()); gui->init(width,height,fontstash,app->m_window->getRetinaScale());

5
btgui/OpenGLWindow/SimpleOpenGL3App.cpp
View File

@@ -132,7 +132,10 @@ SimpleOpenGL3App::SimpleOpenGL3App( const char* title, int width,int height)
} }
struct sth_stash* SimpleOpenGL3App::getFontStash()
{
return m_data->m_fontStash;
}

1
btgui/OpenGLWindow/SimpleOpenGL3App.h
View File

@@ -21,6 +21,7 @@ struct SimpleOpenGL3App
void drawGrid(int gridSize=10, float yOffset=0.001); void drawGrid(int gridSize=10, float yOffset=0.001);
void swapBuffer(); void swapBuffer();
void drawText( const char* txt, int posX, int posY); void drawText( const char* txt, int posX, int posY);
struct sth_stash* getFontStash();
}; };