fix Mac OSX version of preparation of AllBullet2Demo collection

This commit is contained in:
Erwin Coumans committed 2013-12-19 22:23:50 -08:00
1 parent 12dd0daebc
commit 999c5ff766
3 files changed
+6 -2

No files matched your search

+1 -1
View File
@@ -66,7 +66,7 @@ int main(int argc, char* argv[])
GLint err = glGetError();
assert(err==GL_NO_ERROR);
sth_stash* fontstash=0;
sth_stash* fontstash=app->getFontStash();
gui = new GwenUserInterface;
gui->init(width,height,fontstash,app->m_window->getRetinaScale());
+4 -1
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
View File
@@ -21,6 +21,7 @@ struct SimpleOpenGL3App
void drawGrid(int gridSize=10, float yOffset=0.001);
void swapBuffer();
void drawText( const char* txt, int posX, int posY);
struct sth_stash* getFontStash();
};