Merge branch 'bullet_includes' into 'master'

Clean up bullet includes See merge request OpenMW/openmw!1974
3 years ago · c7449dc272
parent 58fd560ce9 72a6d1f69f
commit c7449dc272
11 changed files with 8 additions and 18 deletions
--- a/apps/navmeshtool/worldspacedata.hpp
+++ b/apps/navmeshtool/worldspacedata.hpp
@ -8,7 +8,6 @@
 #include <components/resource/bulletshape.hpp>

 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
-#include <BulletCollision/Gimpact/btBoxCollision.h>
 #include <LinearMath/btVector3.h>

 #include <memory>
--- a/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
+++ b/apps/openmw/mwphysics/hasspherecollisioncallback.hpp
@ -2,9 +2,7 @@
 #define OPENMW_MWPHYSICS_HASSPHERECOLLISIONCALLBACK_H

 #include <LinearMath/btVector3.h>
-#include <BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>

 #include <algorithm>

--- a/apps/openmw/mwphysics/object.cpp
+++ b/apps/openmw/mwphysics/object.cpp
@ -9,7 +9,6 @@
 #include <components/bullethelpers/collisionobject.hpp>

 #include <BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <BulletCollision/CollisionDispatch/btCollisionObject.h>

 #include <LinearMath/btTransform.h>

--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@ -1,8 +1,5 @@
 #include "physicssystem.hpp"

-#include <LinearMath/btIDebugDraw.h>
-#include <LinearMath/btVector3.h>
-
 #include <memory>
 #include <algorithm>
 #include <vector>
@ -14,12 +11,12 @@
 #include <BulletCollision/CollisionShapes/btConeShape.h>
 #include <BulletCollision/CollisionShapes/btSphereShape.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 <LinearMath/btVector3.h>
 #include <LinearMath/btQuickprof.h>

 #include <components/nifbullet/bulletnifloader.hpp>
--- a/apps/openmw/mwphysics/projectile.cpp
+++ b/apps/openmw/mwphysics/projectile.cpp
@ -1,7 +1,6 @@
 #include <memory>

 #include <BulletCollision/CollisionShapes/btSphereShape.h>
-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>

 #include <components/misc/convert.hpp>

--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@ -4,9 +4,6 @@
 #include <osg/ComputeBoundsVisitor>
 #include <osg/Timer>

-#include <BulletCollision/CollisionDispatch/btCollisionWorld.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
-
 #include <MyGUI_TextIterator.h>

 #include <components/debug/debuglog.hpp>
--- a/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
+++ b/apps/openmw_test_suite/detournavigator/asyncnavmeshupdater.cpp
@ -7,6 +7,8 @@
 #include <components/detournavigator/navmeshdbutils.hpp>
 #include <components/detournavigator/dbrefgeometryobject.hpp>

+#include <BulletCollision/CollisionShapes/btBoxShape.h>
+
 #include <DetourNavMesh.h>

 #include <gtest/gtest.h>
--- a/components/bullethelpers/aabb.hpp
+++ b/components/bullethelpers/aabb.hpp
@ -1,10 +1,8 @@
 #ifndef OPENMW_COMPONENTS_BULLETHELPERS_AABB_H
 #define OPENMW_COMPONENTS_BULLETHELPERS_AABB_H

-#include <LinearMath/btVector3.h>
 #include <LinearMath/btTransform.h>
 #include <BulletCollision/CollisionShapes/btCollisionShape.h>
-#include <BulletCollision/Gimpact/btBoxCollision.h>

 inline bool operator==(const btAABB& lhs, const btAABB& rhs)
 {
--- a/components/bullethelpers/operators.hpp
+++ b/components/bullethelpers/operators.hpp
@ -6,10 +6,10 @@
 #include <ostream>
 #include <tuple>

-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
-#include <BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <BulletCollision/CollisionShapes/btBoxShape.h>
+#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
+
 #include <LinearMath/btTransform.h>
+#include <LinearMath/btAabbUtil2.h>

 inline std::ostream& operator <<(std::ostream& stream, const btVector3& value)
 {
--- a/components/detournavigator/asyncnavmeshupdater.cpp
+++ b/components/detournavigator/asyncnavmeshupdater.cpp
@ -11,6 +11,8 @@
 #include <components/misc/thread.hpp>
 #include <components/loadinglistener/loadinglistener.hpp>

+#include <BulletCollision/CollisionShapes/btBoxShape.h>
+
 #include <DetourNavMesh.h>

 #include <osg/Stats>
--- a/components/detournavigator/navmeshmanager.hpp
+++ b/components/detournavigator/navmeshmanager.hpp
@ -8,7 +8,6 @@
 #include "waitconditiontype.hpp"
 #include "heightfieldshape.hpp"

-#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>

 #include <osg/Vec3f>