From fe439e53fffc53e951cfafa690e22e7c536e114d Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 27 May 2015 22:32:11 +0200
Subject: [PATCH] Bullet include cleanup

---
 apps/openmw/mwphysics/actor.cpp          |  8 +++++---
 apps/openmw/mwphysics/physicssystem.cpp  | 11 +++++++++++
 apps/openmw/mwphysics/physicssystem.hpp  |  7 +++++--
 apps/openmw/mwphysics/trace.cpp          |  5 +++--
 apps/openmw/mwrender/bulletdebugdraw.cpp |  2 ++
 apps/openmw/mwrender/bulletdebugdraw.hpp |  6 ++++--
 components/nifbullet/bulletnifloader.cpp | 20 ++++++++++++++++++++
 components/nifbullet/bulletnifloader.hpp | 24 ++++--------------------
 8 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/apps/openmw/mwphysics/actor.cpp b/apps/openmw/mwphysics/actor.cpp
index 7084af862..c47ecd17c 100644
--- a/apps/openmw/mwphysics/actor.cpp
+++ b/apps/openmw/mwphysics/actor.cpp
@@ -2,12 +2,14 @@
 
 #include <osg/PositionAttitudeTransform>
 
-#include <btBulletCollisionCommon.h>
-
-#include "../mwworld/class.hpp"
+#include <BulletCollision/CollisionShapes/btCylinderShape.h>
+#include <BulletCollision/CollisionShapes/btBoxShape.h>
+#include <BulletDynamics/Dynamics/btDynamicsWorld.h>
 
 #include <components/nifbullet/bulletnifloader.hpp>
 
+#include "../mwworld/class.hpp"
+
 #include "convert.hpp"
 #include "collisiontype.hpp"
 
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 065be083d..b706912ed 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -6,6 +6,15 @@
 #include <osg/PositionAttitudeTransform>
 
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
+#include <BulletCollision/CollisionShapes/btConeShape.h>
+#include <BulletCollision/CollisionShapes/btStaticPlaneShape.h>
+#include <BulletCollision/CollisionShapes/btCompoundShape.h>
+#include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
+#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
+#include <BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
+#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
+#include <BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
 
 #include <components/nifbullet/bulletshapemanager.hpp>
 #include <components/nifbullet/bulletnifloader.hpp>
@@ -600,6 +609,8 @@ namespace MWPhysics
         mDispatcher = new btCollisionDispatcher(mCollisionConfiguration);
         mSolver = new btSequentialImpulseConstraintSolver;
         mBroadphase = new btDbvtBroadphase();
+
+        // Note we don't use any Dynamics at the moment - a btCollisionWorld might be sufficient?
         mDynamicsWorld = new btDiscreteDynamicsWorld(mDispatcher,mBroadphase,mSolver,mCollisionConfiguration);
 
         // Don't update AABBs of all objects every frame. Most objects in MW are static, so we don't need this.
diff --git a/apps/openmw/mwphysics/physicssystem.hpp b/apps/openmw/mwphysics/physicssystem.hpp
index 2ebe16e3b..75666acd7 100644
--- a/apps/openmw/mwphysics/physicssystem.hpp
+++ b/apps/openmw/mwphysics/physicssystem.hpp
@@ -5,8 +5,6 @@
 
 #include <OgreVector3.h>
 
-#include <btBulletCollisionCommon.h>
-
 #include <osg/ref_ptr>
 
 #include "../mwworld/ptr.hpp"
@@ -35,6 +33,11 @@ namespace Resource
 
 class btSequentialImpulseConstraintSolver;
 class btDiscreteDynamicsWorld;
+class btBroadphaseInterface;
+class btDefaultCollisionConfiguration;
+class btCollisionDispatcher;
+class btCollisionObject;
+class btCollisionShape;
 
 namespace MWPhysics
 {
diff --git a/apps/openmw/mwphysics/trace.cpp b/apps/openmw/mwphysics/trace.cpp
index ddb984821..79d4de1a0 100644
--- a/apps/openmw/mwphysics/trace.cpp
+++ b/apps/openmw/mwphysics/trace.cpp
@@ -2,8 +2,9 @@
 
 #include <map>
 
-#include <btBulletDynamicsCommon.h>
-#include <btBulletCollisionCommon.h>
+#include <BulletDynamics/Dynamics/btDynamicsWorld.h>
+#include <BulletCollision/CollisionShapes/btConvexShape.h>
+#include <BulletCollision/CollisionShapes/btCylinderShape.h>
 
 #include "collisiontype.hpp"
 #include "actor.hpp"
diff --git a/apps/openmw/mwrender/bulletdebugdraw.cpp b/apps/openmw/mwrender/bulletdebugdraw.cpp
index 36fc24226..8ac8e3121 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.cpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.cpp
@@ -2,6 +2,8 @@
 
 #include <iostream>
 
+#include <BulletDynamics/Dynamics/btDynamicsWorld.h>
+
 #include <osg/Geode>
 #include <osg/Geometry>
 #include <osg/Group>
diff --git a/apps/openmw/mwrender/bulletdebugdraw.hpp b/apps/openmw/mwrender/bulletdebugdraw.hpp
index d2a4163cf..66af2f565 100644
--- a/apps/openmw/mwrender/bulletdebugdraw.hpp
+++ b/apps/openmw/mwrender/bulletdebugdraw.hpp
@@ -1,12 +1,14 @@
 #ifndef OPENMW_MWRENDER_BULLETDEBUGDRAW_H
 #define OPENMW_MWRENDER_BULLETDEBUGDRAW_H
 
-#include "btBulletDynamicsCommon.h"
-
 #include <osg/ref_ptr>
 #include <osg/Array>
 #include <osg/PrimitiveSet>
 
+#include <LinearMath/btIDebugDraw.h>
+
+class btDynamicsWorld;
+
 namespace osg
 {
     class Group;
diff --git a/components/nifbullet/bulletnifloader.cpp b/components/nifbullet/bulletnifloader.cpp
index 89daf898a..33c8c449d 100644
--- a/components/nifbullet/bulletnifloader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -6,6 +6,11 @@
 #include <iostream>
 #include <stdexcept>
 
+#include <BulletCollision/CollisionShapes/btBoxShape.h>
+#include <BulletCollision/CollisionShapes/btTriangleMesh.h>
+#include <BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
+#include <BulletCollision/CollisionShapes/btCompoundShape.h>
+
 #include <components/misc/stringops.hpp>
 
 #include "../nif/niffile.hpp"
@@ -36,6 +41,21 @@ btVector3 getbtVector(const osg::Vec3f &v)
 namespace NifBullet
 {
 
+// Subclass btBhvTriangleMeshShape to auto-delete the meshInterface
+struct TriangleMeshShape : public btBvhTriangleMeshShape
+{
+    TriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression)
+        : btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression)
+    {
+    }
+
+    virtual ~TriangleMeshShape()
+    {
+        delete getTriangleInfoMap();
+        delete m_meshInterface;
+    }
+};
+
 BulletNifLoader::BulletNifLoader()
     : mCompoundShape(NULL)
     , mStaticMesh(NULL)
diff --git a/components/nifbullet/bulletnifloader.hpp b/components/nifbullet/bulletnifloader.hpp
index ae4279f40..0865b134a 100644
--- a/components/nifbullet/bulletnifloader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -6,10 +6,6 @@
 #include <set>
 #include <iostream>
 #include <map>
-#include <BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h>
-#include <BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <btBulletDynamicsCommon.h>
 
 #include <osg/Matrixf>
 #include <osg/BoundingBox>
@@ -18,6 +14,10 @@
 
 #include <components/nif/niffile.hpp>
 
+class btTriangleMesh;
+class btCompoundShape;
+class btCollisionShape;
+
 namespace Nif
 {
     class Node;
@@ -70,22 +70,6 @@ private:
     osg::ref_ptr<BulletShape> mSource;
 };
 
-// Subclass btBhvTriangleMeshShape to auto-delete the meshInterface
-struct TriangleMeshShape : public btBvhTriangleMeshShape
-{
-    TriangleMeshShape(btStridingMeshInterface* meshInterface, bool useQuantizedAabbCompression)
-        : btBvhTriangleMeshShape(meshInterface, useQuantizedAabbCompression)
-    {
-    }
-
-    virtual ~TriangleMeshShape()
-    {
-        delete getTriangleInfoMap();
-        delete m_meshInterface;
-    }
-};
-
-
 /**
 *Load bulletShape from NIF files.
 */