From 171184d9cf8bbdc9c33afbfa2f8699dee6b16dda Mon Sep 17 00:00:00 2001 From: turanszkij Date: Thu, 24 Dec 2015 16:15:37 +0100 Subject: [PATCH] improved bullet physics includes --- WickedEngine/wiBULLET.cpp | 10 ++++++++++ WickedEngine/wiBULLET.h | 16 +++++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/WickedEngine/wiBULLET.cpp b/WickedEngine/wiBULLET.cpp index e875f6785..e1b9aed1c 100644 --- a/WickedEngine/wiBULLET.cpp +++ b/WickedEngine/wiBULLET.cpp @@ -1,6 +1,16 @@ #include "wiBULLET.h" #include "wiLoader.h" + + +#include "LinearMath/btHashMap.h" +#include "BulletSoftBody/btSoftRigidDynamicsWorld.h" +#include "BulletSoftBody/btSoftBodyHelpers.h" + +#include "BulletSoftBody/btSoftBodySolvers.h" +#include "BulletSoftBody/btDefaultSoftBodySolver.h" +#include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" + int PHYSICS::softBodyIterationCount=5; bool PHYSICS::rigidBodyPhysicsEnabled = true, PHYSICS::softBodyPhysicsEnabled = true; bool wiBULLET::grab=false; diff --git a/WickedEngine/wiBULLET.h b/WickedEngine/wiBULLET.h index 9d0990dcb..139bb2646 100644 --- a/WickedEngine/wiBULLET.h +++ b/WickedEngine/wiBULLET.h @@ -1,14 +1,16 @@ #pragma once #include "wiPHYSICS.h" -#include "btBulletDynamicsCommon.h" -#include "LinearMath/btHashMap.h" -#include "BulletSoftBody/btSoftRigidDynamicsWorld.h" -#include "BulletSoftBody/btSoftBodyHelpers.h" +#include "BULLET/btBulletDynamicsCommon.h" -#include "BulletSoftBody/btSoftBodySolvers.h" -#include "BulletSoftBody/btDefaultSoftBodySolver.h" -#include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" +class btCollisionConfiguration; +class btCollisionDispatcher; +class btBroadphaseInterface; +class btSequentialImpulseConstraintSolver; +class btDynamicsWorld; +class btCollisionShape; +class btSoftBodySolver; +class btSoftBodySolverOutput; struct RAY;