From 5364f22047d3fb9aa632cdc04044d79897c113be Mon Sep 17 00:00:00 2001 From: "erwin.coumans" Date: Thu, 4 Feb 2010 20:37:06 +0000 Subject: [PATCH] use #include "BulletHeaders.h" instead of #include --- Demos/Box2dDemo/Box2dDemo.cpp | 2 +- src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h | 2 +- src/BulletMultiThreaded/SpuCollisionTaskProcess.h | 4 ++-- src/BulletMultiThreaded/SpuDoubleBuffer.h | 2 +- .../SpuConvexPenetrationDepthSolver.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Demos/Box2dDemo/Box2dDemo.cpp b/Demos/Box2dDemo/Box2dDemo.cpp index cb5fe2f58..6f673886a 100644 --- a/Demos/Box2dDemo/Box2dDemo.cpp +++ b/Demos/Box2dDemo/Box2dDemo.cpp @@ -114,7 +114,7 @@ void Box2dDemo::initPhysics() toggle = m_dialogDynamicsWorld->createToggle(settings,"Toggle 2"); toggle ->m_active = true; toggle = m_dialogDynamicsWorld->createToggle(settings,"Toggle 3"); -// GL_SliderControl* slider = m_dialogDynamicsWorld->createSlider(settings,"Slider"); + GL_SliderControl* slider = m_dialogDynamicsWorld->createSlider(settings,"Slider"); GL_DialogWindow* dialog = m_dialogDynamicsWorld->createDialog(0,200,420,300,"Help"); GL_TextControl* txt = new GL_TextControl; diff --git a/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h b/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h index 11621865d..ea47b0c76 100644 --- a/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h +++ b/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h @@ -2,7 +2,7 @@ #ifndef BT_INTERNAL_EDGE_UTILITY_H #define BT_INTERNAL_EDGE_UTILITY_H -#include +#include "LinearMath/btHashMap.h" #include "LinearMath/btVector3.h" ///The btInternalEdgeUtility helps to avoid or reduce artifacts due to wrong collision normals caused by internal edges. diff --git a/src/BulletMultiThreaded/SpuCollisionTaskProcess.h b/src/BulletMultiThreaded/SpuCollisionTaskProcess.h index a9ffde1a5..2614be6c4 100644 --- a/src/BulletMultiThreaded/SpuCollisionTaskProcess.h +++ b/src/BulletMultiThreaded/SpuCollisionTaskProcess.h @@ -18,7 +18,7 @@ subject to the following restrictions: #include -#include +#include "LinearMath/btScalar.h" #include "PlatformDefinitions.h" #include "LinearMath/btAlignedObjectArray.h" @@ -35,7 +35,7 @@ subject to the following restrictions: #include "BulletCollision/CollisionShapes/btCollisionShape.h" #include "BulletCollision/CollisionShapes/btConvexShape.h" -#include +#include "LinearMath/btAlignedAllocator.h" #include diff --git a/src/BulletMultiThreaded/SpuDoubleBuffer.h b/src/BulletMultiThreaded/SpuDoubleBuffer.h index 801c86080..a0695744b 100644 --- a/src/BulletMultiThreaded/SpuDoubleBuffer.h +++ b/src/BulletMultiThreaded/SpuDoubleBuffer.h @@ -2,7 +2,7 @@ #define DOUBLE_BUFFER_H #include "SpuFakeDma.h" -#include +#include "LinearMath/btScalar.h" ///DoubleBuffer diff --git a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h index 5e4cc2881..449f19288 100644 --- a/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h +++ b/src/BulletMultiThreaded/SpuNarrowPhaseCollisionTask/SpuConvexPenetrationDepthSolver.h @@ -24,7 +24,7 @@ class btStackAlloc; class btIDebugDraw; #include "BulletCollision/NarrowphaseCollision/btConvexPenetrationDepthSolver.h" -#include +#include "LinearMath/btTransform.h" ///ConvexPenetrationDepthSolver provides an interface for penetration depth calculation.