Merge branch 'cleanup_openmw_includes' into 'master'

Cleanup openmw render, physics, world, dialogue, gui, input includes

See merge request OpenMW/openmw!2291

apps/openmw/mwdialogue/journalimp.cpp

@@ -16,8 +16,6 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/windowmanager.hpp"
 
-#include "../mwgui/messagebox.hpp"
-
 namespace MWDialogue
 {
     Quest& Journal::getQuest (const std::string& id)

apps/openmw/mwgui/bookpage.cpp

@@ -6,6 +6,7 @@
 #include "MyGUI_RenderManager.h"
 #include "MyGUI_TextureUtility.h"
 #include "MyGUI_FactoryManager.h"
+#include "MyGUI_FontManager.h"
 
 #include <components/misc/utf8stream.hpp>
 #include <components/sceneutil/depth.hpp>

apps/openmw/mwgui/bookpage.hpp

@@ -3,7 +3,7 @@
 
 #include "MyGUI_Colour.h"
 #include "MyGUI_Widget.h"
-#include "MyGUI_FontManager.h"
+#include "MyGUI_IFont.h"
 
 #include <functional>
 #include <memory>

apps/openmw/mwgui/console.cpp

@@ -15,6 +15,7 @@
 #include <components/interpreter/interpreter.hpp>
 
 #include "../mwscript/extensions.hpp"
+#include "../mwscript/interpretercontext.hpp"
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/scriptmanager.hpp"

apps/openmw/mwgui/console.hpp

@@ -12,7 +12,6 @@
 #include "../mwbase/windowmanager.hpp"
 
 #include "../mwscript/compilercontext.hpp"
-#include "../mwscript/interpretercontext.hpp"
 
 #include "referenceinterface.hpp"
 #include "windowbase.hpp"

apps/openmw/mwgui/enchantingdialog.cpp

@@ -13,6 +13,7 @@
 #include "../mwbase/environment.hpp"
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
+#include "../mwbase/windowmanager.hpp"
 
 #include "../mwworld/class.hpp"
 #include "../mwworld/containerstore.hpp"

apps/openmw/mwgui/enchantingdialog.hpp

@@ -3,8 +3,6 @@
 
 #include "spellcreationdialog.hpp"
 
-#include "../mwbase/windowmanager.hpp"
-
 #include "../mwmechanics/enchanting.hpp"
 
 namespace MWGui

apps/openmw/mwinput/actionmanager.cpp

@@ -17,7 +17,6 @@
 #include "../mwworld/player.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/inventorystore.hpp"
-#include "../mwworld/esmstore.hpp"
 
 #include "../mwmechanics/npcstats.hpp"
 #include "../mwmechanics/actorutil.hpp"

apps/openmw/mwinput/inputmanagerimp.hpp

@@ -11,8 +11,6 @@
 
 #include "../mwbase/inputmanager.hpp"
 
-#include "../mwgui/mode.hpp"
-
 #include "actions.hpp"
 
 namespace MWWorld

apps/openmw/mwphysics/hasspherecollisioncallback.hpp

@@ -3,6 +3,7 @@
 
 #include <LinearMath/btVector3.h>
 #include <BulletCollision/CollisionDispatch/btCollisionObject.h>
+#include <BulletCollision/BroadphaseCollision/btBroadphaseInterface.h>
 
 #include <algorithm>
 

apps/openmw/mwrender/actoranimation.cpp

@@ -28,6 +28,7 @@
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
 #include "../mwworld/esmstore.hpp"
+#include "../mwworld/inventorystore.hpp"
 #include "../mwmechanics/actorutil.hpp"
 #include "../mwmechanics/weapontype.hpp"
 #include "../mwmechanics/drawstate.hpp"

apps/openmw/mwrender/animation.cpp

@@ -42,6 +42,7 @@
 #include "../mwworld/esmstore.hpp"
 #include "../mwworld/class.hpp"
 #include "../mwworld/cellstore.hpp"
+#include "../mwworld/containerstore.hpp"
 
 #include "../mwmechanics/character.hpp" // FIXME: for MWMechanics::Priority
 

apps/openmw/mwrender/pingpongcanvas.hpp

@@ -10,7 +10,6 @@
 
 #include <components/fx/technique.hpp>
 
-#include "postprocessor.hpp"
 #include "luminancecalculator.hpp"
 
 namespace Shader

apps/openmw/mwrender/recastmesh.cpp

@@ -12,7 +12,6 @@
 
 #include "vismask.hpp"
 
-#include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 
 namespace MWRender

apps/openmw/mwrender/transparentpass.cpp

@@ -11,6 +11,7 @@
 #include <components/shader/shadermanager.hpp>
 #include <components/stereo/multiview.hpp>
 #include <components/stereo/stereomanager.hpp>
+#include <components/sceneutil/depth.hpp>
 
 #include "vismask.hpp"
 

apps/openmw/mwrender/transparentpass.hpp

@@ -2,14 +2,13 @@
 #define OPENMW_MWRENDER_TRANSPARENTPASS_H
 
 #include <array>
+#include <memory>
 
 #include <osg/FrameBufferObject>
 #include <osg/StateSet>
 
 #include <osgUtil/RenderBin>
 
-#include "postprocessor.hpp"
-
 namespace Shader
 {
     class ShaderManager;

apps/openmw/mwworld/action.cpp

@@ -1,7 +1,6 @@
 #include "action.hpp"
 
 #include "../mwbase/environment.hpp"
-#include "../mwbase/world.hpp"
 
 #include "../mwbase/soundmanager.hpp"
 #include "../mwbase/windowmanager.hpp"

apps/openmw/mwworld/inventorystore.hpp

@@ -3,8 +3,6 @@
 
 #include "containerstore.hpp"
 
-#include "../mwmechanics/magiceffects.hpp"
-
 namespace ESM
 {
     struct MagicEffect;

apps/openmw/mwworld/player.hpp

@@ -3,11 +3,9 @@
 
 #include <map>
 
-#include "../mwworld/refdata.hpp"
 #include "../mwworld/livecellref.hpp"
 
 #include "../mwmechanics/drawstate.hpp"
-#include "../mwmechanics/stat.hpp"
 
 #include <components/esm3/loadskil.hpp>
 #include <components/esm/attr.hpp>

apps/openmw/mwworld/scene.hpp

@@ -6,7 +6,6 @@
 #include <osg/ref_ptr>
 
 #include "ptr.hpp"
-#include "globals.hpp"
 
 #include <set>
 #include <memory>

apps/openmw/mwworld/weather.hpp

@@ -11,7 +11,7 @@
 
 #include "../mwbase/soundmanager.hpp"
 
-#include "../mwrender/sky.hpp"
+#include "../mwrender/skyutil.hpp"
 
 namespace ESM
 {