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

fixed some merging conflicts

Browse Source
This commit is contained in:
ejcoumans
2006-09-27 20:58:49 +00:00
parent eb23bb5c0c
commit d0f09040e9
8 changed files with 42 additions and 655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Demos/OpenGL/GL_ShapeDrawer.cpp
View File

@@ -333,12 +333,12 @@ void GL_ShapeDrawer::DrawOpenGL(float* m, const btCollisionShape* shape, const b
glDisable(GL_DEPTH_BUFFER_BIT);
glRasterPos3f(0,0,0);//mvtx.x(), vtx.y(), vtx.z());
if (debugMode&IDebugDraw::DBG_DrawText)
if (debugMode&btIDebugDraw::DBG_DrawText)
{
BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),shape->GetName());
}
if (debugMode&IDebugDraw::DBG_DrawFeaturesText)
if (debugMode& btIDebugDraw::DBG_DrawFeaturesText)
{
BMF_DrawString(BMF_GetFont(BMF_kHelvetica10),shape->GetExtraDebugInfo());
}