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

Merge branch 'master' of https://github.com/erwincoumans/bullet3

Browse Source
This commit is contained in:
erwincoumans
2016-11-04 13:16:30 -07:00
parent d62ac01d14 908cb2def2
commit e35129ceaf
60 changed files with 4420 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/OpenGLWindow/SimpleOpenGL2App.cpp
View File

@@ -280,7 +280,7 @@ void SimpleOpenGL2App::swapBuffer()
m_window->startRendering();
}
void SimpleOpenGL2App::drawText( const char* txt, int posX, int posY)
void SimpleOpenGL2App::drawText( const char* txt, int posX, int posY, float size)
{
}

2
examples/OpenGLWindow/SimpleOpenGL2App.h
View File

@@ -17,7 +17,7 @@ public:
virtual int getUpAxis() const;
virtual void swapBuffer();
virtual void drawText( const char* txt, int posX, int posY);
virtual void drawText( const char* txt, int posX, int posY, float size);
virtual void drawTexturedRect(float x0, float y0, float x1, float y1, float color[4], float u0,float v0, float u1, float v1, int useRGBA){};
virtual void setBackgroundColor(float red, float green, float blue);
virtual int registerCubeShape(float halfExtentsX,float halfExtentsY, float halfExtentsZ, int textureIndex = -1, float textureScaling = 1)

4
examples/OpenGLWindow/SimpleOpenGL3App.cpp
View File

@@ -352,7 +352,7 @@ void SimpleOpenGL3App::drawText3D( const char* txt, float worldPosX, float world
}
void SimpleOpenGL3App::drawText( const char* txt, int posXi, int posYi)
void SimpleOpenGL3App::drawText( const char* txt, int posXi, int posYi, float size)
{
float posX = (float)posXi;
@@ -374,7 +374,7 @@ void SimpleOpenGL3App::drawText( const char* txt, int posXi, int posYi)
{
bool measureOnly = false;
float fontSize= 64;//512;//128;
float fontSize= 64*size;//512;//128;
sth_draw_text(m_data->m_fontStash,
m_data->m_droidRegular,fontSize,posX,posY,
txt,&dx, this->m_instancingRenderer->getScreenWidth(),

2
examples/OpenGLWindow/SimpleOpenGL3App.h
View File

@@ -31,7 +31,7 @@ struct SimpleOpenGL3App : public CommonGraphicsApp
virtual int getUpAxis() const;
virtual void swapBuffer();
virtual void drawText( const char* txt, int posX, int posY);
virtual void drawText( const char* txt, int posX, int posY, float size=1.0f);
virtual void drawText3D( const char* txt, float posX, float posZY, float posZ, float size);
virtual void drawTexturedRect(float x0, float y0, float x1, float y1, float color[4], float u0,float v0, float u1, float v1, int useRGBA);
struct sth_stash* getFontStash();