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

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

Browse Source
This commit is contained in:
Erwin Coumans
2014-06-24 15:32:19 -07:00
parent c1db34a046 3480cb5eee
commit fd7a2b3a17
1 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
btgui/OpenGLWindow/SimpleOpenGL3App.cpp
View File

@@ -210,8 +210,7 @@ void SimpleOpenGL3App::drawText( const char* txt, int posX, int posY)
glDisable(GL_BLEND); glDisable(GL_BLEND);
} }
int SimpleOpenGL3App::registerCubeShape(float halfExtentsX,float halfExtentsY, float halfExtentsZ)
{
struct GfxVertex struct GfxVertex
{ {
float x,y,z,w; float x,y,z,w;
@@ -219,6 +218,10 @@ int SimpleOpenGL3App::registerCubeShape(float halfExtentsX,float halfExtentsY, f
float u,v; float u,v;
}; };
int SimpleOpenGL3App::registerCubeShape(float halfExtentsX,float halfExtentsY, float halfExtentsZ)
{
int strideInBytes = 9*sizeof(float); int strideInBytes = 9*sizeof(float);
int numVertices = sizeof(cube_vertices)/strideInBytes; int numVertices = sizeof(cube_vertices)/strideInBytes;
int numIndices = sizeof(cube_indices)/sizeof(int); int numIndices = sizeof(cube_indices)/sizeof(int);