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

2
Demos/BspDemo/BspDemo.cpp
View File

@@ -134,7 +134,7 @@ void BspDemo::initPhysics(char* bspfilename)
///Setup a Physics Simulation Environment
btCollisionShape* groundShape = new btBoxShape(btVector3(50,3,50));
// btCollisionShape* groundShape = new btBoxShape(btVector3(50,3,50));
btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
btVector3 worldMin(-1000,-1000,-1000);
btVector3 worldMax(1000,1000,1000);

1
Demos/ColladaDemo/ColladaDemo.cpp
View File

@@ -160,7 +160,6 @@ void ColladaDemo::initPhysics(const char* filename)
m_cameraUp = btVector3(0,0,1);
m_forwardAxis = 1;
btCollisionShape* groundShape = new btBoxShape(btVector3(50,3,50));
btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
btVector3 worldMin(-1000,-1000,-1000);
btVector3 worldMax(1000,1000,1000);

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;

2
Demos/ConcaveDemo/ConcavePhysicsDemo.cpp
View File

@@ -152,7 +152,7 @@ void ConcaveDemo::initPhysics()
btCollisionShape* trimeshShape = new btBvhTriangleMeshShape(indexVertexArrays);
btCollisionShape* groundShape = new btBoxShape(btVector3(50,3,50));
// btCollisionShape* groundShape = new btBoxShape(btVector3(50,3,50));
btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
btVector3 worldMin(-1000,-1000,-1000);
btVector3 worldMax(1000,1000,1000);

2
Demos/ConstraintDemo/ConstraintDemo.cpp
View File

@@ -75,7 +75,7 @@ void drawLimit()
void ConstraintDemo::initPhysics()
{
btCollisionShape* groundShape = new btBoxShape(btVector3(50,3,50));
// btCollisionShape* groundShape = new btBoxShape(btVector3(50,3,50));
btCollisionDispatcher* dispatcher = new btCollisionDispatcher();
btVector3 worldMin(-1000,-1000,-1000);
btVector3 worldMax(1000,1000,1000);

100
Demos/Jamfile
View File

@@ -1,57 +1,53 @@
SubDir TOP Demos ;
SubInclude TOP Demos OpenGL ;
if $(GLUT.AVAILABLE) = "yes"
{
# All demo apps have a lot in common, so use this rule to simply things
rule BulletDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../src" ;
}
}
rule BulletBasicDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/src ]
;
MsvcIncDirs $(<) :
"../../src" ;
}
SubDir TOP Demos ;
SubInclude TOP Demos OpenGL ;
if $(GLUT.AVAILABLE) = "yes"
{
# All demo apps have a lot in common, so use this rule to simply things
rule BulletDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletopenglsupport bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/Demos/OpenGL ]
;
MsvcIncDirs $(<) :
"../../Demos/OpenGL"
"../../src" ;
}
}
rule BulletBasicDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/src ]
;
MsvcIncDirs $(<) :
"../../src" ;
}
SubInclude TOP Demos CcdPhysicsDemo ;
SubInclude TOP Demos UserCollisionAlgorithm ;
#SubInclude TOP Demos ForkLiftDemo ;
SubInclude TOP Demos BulletDinoDemo ;
SubInclude TOP Demos EPAPenDepthDemo ;
SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos BasicDemo ;
SubInclude TOP Demos ConvexDecompositionDemo ;
SubInclude TOP Demos ColladaDemo ;
SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos VehicleDemo ;
SubInclude TOP Demos CollisionDemo ;
SubInclude TOP Demos CollisionInterfaceDemo ;
SubInclude TOP Demos MovingConcaveDemo ;
SubInclude TOP Demos ConcaveDemo ;
SubInclude TOP Demos ConstraintDemo ;
SubInclude TOP Demos ContinuousConvexCollision ;
SubInclude TOP Demos GjkConvexCastDemo ;
SubInclude TOP Demos Raytracer ;
SubInclude TOP Demos SimplexDemo ;
SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos BasicDemo ;
SubInclude TOP Demos ConvexDecompositionDemo ;
SubInclude TOP Demos ColladaDemo ;
SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos VehicleDemo ;
SubInclude TOP Demos CollisionDemo ;
SubInclude TOP Demos CollisionInterfaceDemo ;
SubInclude TOP Demos MovingConcaveDemo ;
SubInclude TOP Demos ConcaveDemo ;
SubInclude TOP Demos ConstraintDemo ;
SubInclude TOP Demos ContinuousConvexCollision ;
SubInclude TOP Demos GjkConvexCastDemo ;
SubInclude TOP Demos Raytracer ;
SubInclude TOP Demos SimplexDemo ;