From 5d3ba1daa627b9016cace24c68458c407099d4ea Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Tue, 19 Jan 2010 20:12:45 +0000 Subject: [PATCH] fix compile issue, and add BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp/h to CMakeLists.txt/Makefile.am --- .../BulletHfFluid/btHfFluidRigidDynamicsWorld.cpp | 2 +- src/BulletCollision/CMakeLists.txt | 2 ++ src/Makefile.am | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluidRigidDynamicsWorld.cpp b/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluidRigidDynamicsWorld.cpp index 3b8e9354c..17b1fcd68 100644 --- a/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluidRigidDynamicsWorld.cpp +++ b/Demos/HeightFieldFluidDemo/BulletHfFluid/btHfFluidRigidDynamicsWorld.cpp @@ -230,7 +230,7 @@ void btHfFluidRigidDynamicsWorld::drawHfFluidNormal (btIDebugDraw* debugDraw, bt boxMin += com; boxMax += com; - debugDraw->drawBox (boxMin, boxMax, btVector3(btScalar(0.0f), btScalar(0.0f), btScalar(1.0f)), btScalar(1.0f)); + debugDraw->drawBox (boxMin, boxMax, btVector3(btScalar(0.0f), btScalar(0.0f), btScalar(1.0f))); } } } diff --git a/src/BulletCollision/CMakeLists.txt b/src/BulletCollision/CMakeLists.txt index 8c570130f..39d079721 100644 --- a/src/BulletCollision/CMakeLists.txt +++ b/src/BulletCollision/CMakeLists.txt @@ -26,6 +26,8 @@ SET(BulletCollision_SRCS CollisionDispatch/btDefaultCollisionConfiguration.cpp CollisionDispatch/btEmptyCollisionAlgorithm.cpp CollisionDispatch/btGhostObject.cpp + CollisionDispatch/btInternalEdgeUtility.cpp + CollisionDispatch/btInternalEdgeUtility.h CollisionDispatch/btManifoldResult.cpp CollisionDispatch/btSimulationIslandManager.cpp CollisionDispatch/btSphereBoxCollisionAlgorithm.cpp diff --git a/src/Makefile.am b/src/Makefile.am index c8e20d42f..01b6e41a1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -145,6 +145,7 @@ libbulletcollision_la_SOURCES = \ BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp \ BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp \ + BulletCollision/CollisionDispatch/btInternalEdgeUtility.cpp \ BulletCollision/CollisionDispatch/btManifoldResult.cpp \ BulletCollision/CollisionDispatch/btCollisionWorld.cpp \ BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp \ @@ -232,6 +233,7 @@ libbulletcollision_la_SOURCES = \ BulletCollision/CollisionDispatch/btSimulationIslandManager.h \ BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h \ BulletCollision/CollisionDispatch/btCollisionWorld.h \ + BulletCollision/CollisionDispatch/btInternalEdgeUtility.h \ BulletCollision/CollisionDispatch/btManifoldResult.h \ BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btSphereBoxCollisionAlgorithm.h \ @@ -493,6 +495,7 @@ nobase_bullet_include_HEADERS += \ BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.h \ BulletCollision/CollisionDispatch/btBoxBoxDetector.h \ BulletCollision/CollisionDispatch/btSphereSphereCollisionAlgorithm.h \ + BulletCollision/CollisionDispatch/btInternalEdgeUtility.h \ BulletCollision/CollisionDispatch/btManifoldResult.h \ BulletCollision/Gimpact/gim_memory.h \ BulletCollision/Gimpact/gim_clip_polygon.h \