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

Clean up about a bazillion compilation warnings.

Browse Source
This commit is contained in:
sjbaker
2006-12-22 02:33:42 +00:00
parent 4685bb8c4b
commit db573e4a59
23 changed files with 854 additions and 4260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Demos/CollisionDemo/CollisionDemo.cpp
View File

@@ -113,8 +113,10 @@ void CollisionDemo::initPhysics()
btVector3 boxHalfExtentsA(1.0000004768371582f,1.0000004768371582f,1.0000001192092896f);
btVector3 boxHalfExtentsB(3.2836332321166992f,3.2836332321166992f,3.2836320400238037f);
btBoxShape* boxA = new btBoxShape(boxHalfExtentsA);
btBoxShape* boxB = new btBoxShape(boxHalfExtentsB);
#ifndef CHECK_GENSHER_TRIANGLE_CASE
btBoxShape* boxA = new btBoxShape(boxHalfExtentsA);
btBoxShape* boxB = new btBoxShape(boxHalfExtentsB);
#endif
float p1[3], p2[3], p3[3], q1[3],q2[3], q3[3];
@@ -155,8 +157,8 @@ void CollisionDemo::initPhysics()
#ifdef CHECK_GENSHER_TRIANGLE_CASE
shapePtr[0] = trishapeA;//boxA;
shapePtr[1] = trishapeB;//boxB;
shapePtr[0] = trishapeA;
shapePtr[1] = trishapeB;
#else
shapePtr[0] = boxA;
shapePtr[1] = boxB;