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

report when compound pair capacity is exceeded (and avoid crash)

Browse Source 
add tetrahedron, reorganized demos
This commit is contained in:
erwincoumans
2013-07-30 17:00:50 -07:00
parent 2793a174c6
commit 1c0fc6bc2d
14 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
btgui/OpenGLWindow/ShapeData.h
View File

@@ -263,7 +263,7 @@ static const int quad_indices[]=
static const float tetra_vertices[] =
static const float pyramid_vertices[] =
{
-1.f, 0, -1.f, 0.5f, 0, 1,0, 0,0,
-1.f, 0, 1.f, 0.5f, 0, 1,0, 1,0,
@@ -275,13 +275,35 @@ static const float tetra_vertices[] =
static const int tetra_indices[]=
static const int pyramid_indices[]=
{
0,1,2,0,2,3,//ground face
4,1,2,4,2,3,
4,3,0,4,0,1
};
static const float tetra_vertices[] =
{
1.f, 1.f, 1.f, 0.5f, 0, 1,0, 0,0,
1.f, -1.f, -1.f, 0.5f, 0, 1,0, 1,0,
-1.f, 1.f, -1.f, 0.5f, 0, 1,0, 1,1,
-1.f, -1, 1.f, 0.5f, 0, 1,0, 0,1
};
static const int tetra_indices[]=
{
0,1,2,//ground face
3,1,2,
3,0,1,
3,2,0
};
static const float detailed_sphere_vertices[] =
{
0.000000,-0.183479,-0.983024,0.000000,0.000000,-0.183479,-0.983024,0.500000,0.408260,