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

add upAxis option for Y or Z up

Browse Source 
remove some warnings
This commit is contained in:
Erwin Coumans
2014-07-27 10:29:10 -07:00
parent 5e9102bf00
commit 0b40e1a899
10 changed files with 255 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
btgui/OpenGLWindow/GwenOpenGL3CoreRenderer.h
View File

@@ -208,8 +208,8 @@ public:
//
//printf("str = %s\n",unicodeText);
int xpos=0;
int ypos=0;
//int xpos=0;
//int ypos=0;
float dx;
int measureOnly=0;
@@ -232,7 +232,7 @@ public:
{
//float width = 0.f;
int pos=0;
float color[]={0.2f,0.2,0.2f,1.f};
//float color[]={0.2f,0.2,0.2f,1.f};
glBindTexture(GL_TEXTURE_2D,m_fontTextureId);
float width = r.x;
@@ -299,7 +299,7 @@ public:
int pos=0;
while (unicodeText[pos])
{
width += m_currentFont->m_CharWidth[unicodeText[pos]]+extraSpacing;
width += m_currentFont->m_CharWidth[(int)unicodeText[pos]]+extraSpacing;
pos++;
}
Gwen::Point pt;
@@ -318,4 +318,4 @@ public:
};
#endif //__GWEN_OPENGL3_CORE_RENDERER_H
#endif //__GWEN_OPENGL3_CORE_RENDERER_H