Merge branch 'useless_includes_mwphysics' into 'master'

Remove some useless includes in apps/openmw/mwphysics See merge request OpenMW/openmw!872
4 years ago · 730f1fe2a7
parent 3d61d7ec9a 9373e4ada7
commit 730f1fe2a7
6 changed files with 0 additions and 11 deletions
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@ -10,7 +10,6 @@
 #include <LinearMath/btTransform.h>
 #include <osg/Vec3f>
 #include <osg/Quat>
-#include <osg/ref_ptr>

 class btCollisionShape;
 class btCollisionObject;
--- a/apps/openmw/mwphysics/actorconvexcallback.cpp
+++ b/apps/openmw/mwphysics/actorconvexcallback.cpp
@ -1,5 +1,3 @@
-#include <mutex>
-
 #include "actorconvexcallback.hpp"
 #include "collisiontype.hpp"
 #include "contacttestwrapper.h"
--- a/apps/openmw/mwphysics/contacttestresultcallback.hpp
+++ b/apps/openmw/mwphysics/contacttestresultcallback.hpp
@ -5,8 +5,6 @@

 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>

-#include "../mwworld/ptr.hpp"
-
 #include "physicssystem.hpp"

 class btCollisionObject;
--- a/apps/openmw/mwphysics/movementsolver.hpp
+++ b/apps/openmw/mwphysics/movementsolver.hpp
@ -1,8 +1,6 @@
 #ifndef OPENMW_MWPHYSICS_MOVEMENTSOLVER_H
 #define OPENMW_MWPHYSICS_MOVEMENTSOLVER_H

-#include <map>
-
 #include <osg/Vec3f>

 #include "constants.hpp"
--- a/apps/openmw/mwphysics/projectileconvexcallback.hpp
+++ b/apps/openmw/mwphysics/projectileconvexcallback.hpp
@ -1,8 +1,6 @@
 #ifndef OPENMW_MWPHYSICS_PROJECTILECONVEXCALLBACK_H
 #define OPENMW_MWPHYSICS_PROJECTILECONVEXCALLBACK_H

-#include <vector>
-
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>

 class btCollisionObject;
--- a/apps/openmw/mwphysics/stepper.cpp
+++ b/apps/openmw/mwphysics/stepper.cpp
@ -1,7 +1,5 @@
 #include "stepper.hpp"

-#include <limits>
-
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
 #include <BulletCollision/CollisionDispatch/btCollisionWorld.h>