more include cleanup (most removing Ogre.h)

apps/openmw/mwgui/tooltips.cpp

@@ -2,6 +2,8 @@
 
 #include <boost/lexical_cast.hpp>
 
+#include <OgreResourceGroupManager.h>
+
 #include <components/settings/settings.hpp>
 
 #include "../mwbase/world.hpp"

apps/openmw/mwmechanics/actors.cpp

@@ -3,6 +3,8 @@
 
 #include <typeinfo>
 
+#include <OgreVector3.h>
+
 #include <components/esm/loadnpc.hpp>
 
 #include "../mwworld/class.hpp"

apps/openmw/mwrender/actors.cpp

@@ -1,7 +1,7 @@
 #include "actors.hpp"
-#include <OgreSceneNode.h>
-
 
+#include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
 
 
 using namespace Ogre;

apps/openmw/mwrender/animation.cpp

@@ -1,5 +1,10 @@
 #include "animation.hpp"
 
+#include <OgreHardwarePixelBuffer.h>
+#include <OgreSkeletonInstance.h>
+#include <OgreEntity.h>
+#include <OgreBone.h>
+#include <OgreSubMesh.h>
 
 namespace MWRender{
     std::map<std::string, int> Animation::mUniqueIDs;

apps/openmw/mwrender/creatureanimation.cpp

@@ -1,4 +1,9 @@
 #include "creatureanimation.hpp"
+
+#include <OgreEntity.h>
+#include <OgreSceneManager.h>
+#include <OgreSubEntity.h>
+
 #include "renderconst.hpp"
 
 #include "../mwbase/world.hpp"

apps/openmw/mwrender/debugging.cpp

@@ -6,6 +6,7 @@
 #include <OgreSceneManager.h>
 #include <OgreMaterial.h>
 #include <OgreMaterialManager.h>
+#include <OgreManualObject.h>
 
 #include <components/esm/loadstat.hpp>
 #include <components/esm/loadpgrd.hpp>

apps/openmw/mwrender/localmap.cpp

@@ -2,6 +2,7 @@
 
 #include <OgreOverlayManager.h>
 #include <OgreMaterialManager.h>
+#include <OgreHardwarePixelBuffer.h>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp"

apps/openmw/mwrender/npcanimation.cpp

@@ -1,5 +1,9 @@
 #include "npcanimation.hpp"
 
+#include <OgreSceneManager.h>
+#include <OgreEntity.h>
+#include <OgreSubEntity.h>
+
 #include <components/esm_store/store.hpp>
 
 #include "../mwbase/environment.hpp"

apps/openmw/mwrender/objects.cpp

@@ -1,6 +1,11 @@
 #include "objects.hpp"
 
 #include <OgreSceneNode.h>
+#include <OgreSceneManager.h>
+#include <OgreEntity.h>
+#include <OgreLight.h>
+#include <OgreSubEntity.h>
+#include <OgreStaticGeometry.h>
 
 #include <components/nifogre/ogre_nif_loader.hpp>
 #include <components/settings/settings.hpp>

apps/openmw/mwrender/player.cpp

@@ -1,6 +1,8 @@
 
 #include "player.hpp"
 
+#include <OgreSceneNode.h>
+
 namespace MWRender
 {
     Player::Player (Ogre::Camera *camera, Ogre::SceneNode* node)
@@ -24,4 +26,9 @@ namespace MWRender
             pitchNode->setOrientation(xr);
             yawNode->setOrientation(yr);
     }
+
+    std::string Player::getHandle() const
+    {
+        return mNode->getName();
+    }
 }

apps/openmw/mwrender/player.hpp

@@ -1,12 +1,12 @@
 #ifndef GAME_MWRENDER_PLAYER_H
 #define GAME_MWRENDER_PLAYER_H
 
-#include <iostream>
-#include <Ogre.h>
+#include <string>
 
 namespace Ogre
 {
     class Camera;
+    class SceneNode;
 }
 
 namespace MWRender
@@ -26,7 +26,7 @@ namespace MWRender
                 /// Set where the player is looking at. Uses Morrowind (euler) angles
                 void setRot(float x, float y, float z);
 
-                std::string getHandle() const { return mNode->getName(); }
+                std::string getHandle() const;
                 Ogre::SceneNode* getNode() {return mNode;}
     };
 }

apps/openmw/mwrender/renderingmanager.cpp

@@ -2,12 +2,17 @@
 
 #include <cassert>
 
-#include "OgreRoot.h"
-#include "OgreRenderWindow.h"
-#include "OgreSceneManager.h"
-#include "OgreViewport.h"
-#include "OgreCamera.h"
-#include "OgreTextureManager.h"
+#include <OgreRoot.h>
+#include <OgreRenderWindow.h>
+#include <OgreSceneManager.h>
+#include <OgreViewport.h>
+#include <OgreCamera.h>
+#include <OgreTextureManager.h>
+#include <OgreCompositorManager.h>
+#include <OgreCompositorChain.h>
+#include <OgreCompositionTargetPass.h>
+#include <OgreCompositionPass.h>
+#include <OgreHardwarePixelBuffer.h>
 
 #include <components/esm/loadstat.hpp>
 #include <components/settings/settings.hpp>

apps/openmw/mwrender/shaderhelper.cpp

@@ -5,6 +5,7 @@
 #include <OgreHighLevelGpuProgramManager.h>
 #include <OgreHighLevelGpuProgram.h>
 #include <OgreGpuProgramParams.h>
+#include <OgreShadowCameraSetupPSSM.h>
 
 #include <components/settings/settings.hpp>
 

apps/openmw/mwrender/sky.cpp

@@ -4,9 +4,16 @@
 #include <OgreRenderWindow.h>
 #include <OgreSceneNode.h>
 #include <OgreMesh.h>
+#include <OgreSubMesh.h>
 #include <OgreSceneManager.h>
 #include <OgreHardwareVertexBuffer.h>
 #include <OgreHighLevelGpuProgramManager.h>
+#include <OgreBillboardSet.h>
+#include <OgreEntity.h>
+#include <OgreSubEntity.h>
+#include <OgreOverlay.h>
+#include <OgreOverlayManager.h>
+#include <OgreOverlayContainer.h>
 
 #include <components/nifogre/ogre_nif_loader.hpp>
 

apps/openmw/mwrender/terrain.cpp

@@ -2,6 +2,7 @@
 
 #include <OgreTerrain.h>
 #include <OgreTerrainGroup.h>
+#include <OgreHardwarePixelBuffer.h>
 
 #include <components/esm_store/store.hpp>
 

apps/openmw/mwrender/water.cpp

@@ -1,5 +1,14 @@
 #include "water.hpp"
 
+#include <OgreRenderTarget.h>
+#include <OgreEntity.h>
+#include <OgreMeshManager.h>
+#include <OgreHardwarePixelBuffer.h>
+#include <OgreCompositorManager.h>
+#include <OgreCompositorInstance.h>
+#include <OgreCompositorChain.h>
+#include <OgreRoot.h>
+
 #include "sky.hpp"
 #include "renderingmanager.hpp"
 #include "compositors.hpp"

apps/openmw/mwrender/water.hpp

@@ -1,12 +1,27 @@
 #ifndef GAME_MWRENDER_WATER_H
 #define GAME_MWRENDER_WATER_H
 
-#include <Ogre.h>
+#include <OgrePlane.h>
+#include <OgreRenderQueue.h>
+#include <OgreRenderQueueListener.h>
+#include <OgreRenderTargetListener.h>
+#include <OgreMaterial.h>
+#include <OgreTexture.h>
+
 #include <components/esm/loadcell.hpp>
 #include <components/settings/settings.hpp>
 
 #include "renderconst.hpp"
 
+namespace Ogre
+{
+    class Camera;
+    class SceneManager;
+    class SceneNode;
+    class Entity;
+    class Vector3;
+    struct RenderTargetEvent;
+};
 
 namespace MWRender {
 

apps/openmw/mwworld/refdata.cpp

@@ -1,6 +1,8 @@
 
 #include "refdata.hpp"
 
+#include <OgreSceneNode.h>
+
 #include "customdata.hpp"
 #include "cellstore.hpp"
 

apps/openmw/mwworld/refdata.hpp

@@ -3,12 +3,15 @@
 
 #include <string>
 
-#include <Ogre.h>
-
 #include <components/esm/defs.hpp>
 
 #include "../mwscript/locals.hpp"
 
+namespace Ogre
+{
+    class SceneNode;
+}
+
 namespace ESM
 {
     class Script;

components/nif/data.hpp

@@ -25,8 +25,9 @@
 #define _NIF_DATA_H_
 
 #include "controlled.hpp"
-#include <iostream>
-#include <Ogre.h>
+
+#include <OgreQuaternion.h>
+#include <OgreVector3.h>
 
 namespace Nif
 {

components/nifogre/ogre_nif_loader.cpp

@@ -25,6 +25,14 @@
 
 #include "ogre_nif_loader.hpp"
 
+#include <OgreMaterialManager.h>
+#include <OgreMeshManager.h>
+#include <OgreHardwareBufferManager.h>
+#include <OgreSkeletonManager.h>
+#include <OgreTechnique.h>
+#include <OgreSubMesh.h>
+#include <OgreRoot.h>
+
 #include <components/settings/settings.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 

components/nifogre/ogre_nif_loader.hpp

@@ -26,12 +26,10 @@
 
 #include <OgreResource.h>
 #include <OgreMesh.h>
-#include <assert.h>
+
+#include <cassert>
 #include <string>
 #include <boost/algorithm/string.hpp>
-#include <Ogre.h>
-#include <stdio.h>
-#include <iostream>
 
 #include <libs/mangle/vfs/servers/ogre_vfs.hpp>
 #include "../nif/nif_file.hpp"
@@ -45,7 +43,6 @@
 #include <vector>
 #include <list>
 // For warning messages
-#include <iostream>
 #include <limits>
 using namespace boost::algorithm;
 

libs/openengine/bullet/BtOgre.cpp

@@ -17,6 +17,10 @@
 #include "BtOgreGP.h"
 #include "BtOgreExtras.h"
 
+#include <OgreEntity.h>
+#include <OgreSubMesh.h>
+#include <OgreSubEntity.h>
+
 using namespace Ogre;
 
 namespace BtOgre {

libs/openengine/bullet/BtOgreGP.h

@@ -19,7 +19,10 @@
 
 #include "btBulletDynamicsCommon.h"
 #include "BtOgreExtras.h"
-#include "Ogre.h"
+
+#include <OgreMatrix4.h>
+#include <OgreMesh.h>
+#include <OgreVector3.h>
 
 namespace BtOgre {
 

libs/openengine/bullet/pmove.h

@@ -6,12 +6,12 @@ which was released under the GNU GPL (v2) in 2005.
 Quake 3 Arena is copyright (C) 1999-2005 Id Software, Inc.
 */
 
-#include <Ogre.h>
 #include <OgreMath.h>
 #include <float.h>
 #include "trace.h"
 #include "physic.hpp"
 
+#include <OgreVector3.h>
 
 //#include "GameMath.h"
 //#include "GameTime.h"