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

fixed cmake/jam for HelloWorld sample

Browse Source
This commit is contained in:
ejcoumans
2007-12-15 02:42:33 +00:00
parent a77fca6394
commit 4a3c2506d4
6 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Demos/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
SUBDIRS( OpenGL AllBulletDemos MultiThreadedDemo CcdPhysicsDemo ConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm )
SUBDIRS( OpenGL AllBulletDemos HelloWorld MultiThreadedDemo CcdPhysicsDemo ConstraintDemo GenericJointDemo RagdollDemo BasicDemo BspDemo MovingConcaveDemo VehicleDemo ColladaDemo UserCollisionAlgorithm )

4
Demos/GjkConvexCastDemo/LinearConvexCastDemo.cpp
View File

@@ -126,7 +126,9 @@ void LinearConvexCastDemo::displayCallback(void)
gGjkSimplexSolver.reset();
btSubsimplexConvexCast convexCaster( shapePtr[ 0 ], shapePtr[ 1 ], &gGjkSimplexSolver );
btGjkConvexCast convexCaster(shapePtr[ 0 ], shapePtr[ 1 ], &gGjkSimplexSolver );
//btSubsimplexConvexCast convexCaster( shapePtr[ 0 ], shapePtr[ 1 ], &gGjkSimplexSolver );
btConvexCast::CastResult result;
convexCaster.calcTimeOfImpact( tr[ 0 ], toA, tr[ 1 ], toB, result );

14
Demos/HelloWorld/CMakeLists.txt Normal file
View File

@@ -0,0 +1,14 @@
# HelloWorld is a minimal sample creating, stepping and deleting a Bullet dynamics world
INCLUDE_DIRECTORIES(
${BULLET_PHYSICS_SOURCE_DIR}/src }
)
LINK_LIBRARIES(
LibBulletDynamics LibBulletCollision LibLinearMath
)
ADD_EXECUTABLE(HelloWorld
HelloWorld.cpp
)

4
Demos/HelloWorld/HelloWorld.cpp
View File

@@ -116,9 +116,9 @@ int main(int argc, char** argv)
dynamicsWorld->stepSimulation(1.f/60.f,10);
//print positions of all objects
for (i=dynamicsWorld->getNumCollisionObjects()-1; i>=0 ;i--)
for (int j=dynamicsWorld->getNumCollisionObjects()-1; j>=0 ;j--)
{
btCollisionObject* obj = dynamicsWorld->getCollisionObjectArray()[i];
btCollisionObject* obj = dynamicsWorld->getCollisionObjectArray()[j];
btRigidBody* body = btRigidBody::upcast(obj);
if (body && body->getMotionState())
{

3
Demos/HelloWorld/Jamfile Normal file
View File

@@ -0,0 +1,3 @@
SubDir TOP Demos HelloWorld ;
BulletBasicDemo HelloWorld : [ Wildcard *.h *.cpp ] ;

3
Demos/Jamfile
View File

@@ -21,7 +21,7 @@ if $(GLUT.AVAILABLE) = "yes"
rule BulletBasicDemo
{
Application $(<) : $(>) : noinstall console nomanifest ;
LinkWith $(<) : bulletcollision bulletmath ;
LinkWith $(<) : bulletdynamics bulletcollision bulletmath ;
CFlags $(<) :
[ FIncludes $(TOP)/src ]
;
@@ -62,6 +62,7 @@ SubInclude TOP Demos MultiThreadedDemo ;
#SubInclude TOP Demos ForkLiftDemo ;
SubInclude TOP Demos BulletDinoDemo ;
SubInclude TOP Demos EPAPenDepthDemo ;
SubInclude TOP Demos HelloWorld ;
SubInclude TOP Demos BspDemo ;
SubInclude TOP Demos BasicDemo ;
SubInclude TOP Demos ConvexDecompositionDemo ;