From 728365b48dadeec68279fe445a6bb45f70491299 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 7 Jan 2014 21:07:02 +0100
Subject: [PATCH] Remove an unused hook

---
 apps/openmw/CMakeLists.txt                 |  2 +-
 apps/openmw/mwbase/world.hpp               |  3 ---
 apps/openmw/mwrender/characterpreview.hpp  |  2 --
 apps/openmw/mwrender/externalrendering.hpp | 23 ----------------------
 apps/openmw/mwrender/renderingmanager.cpp  |  6 ------
 apps/openmw/mwrender/renderingmanager.hpp  |  3 ---
 apps/openmw/mwworld/worldimp.cpp           |  5 -----
 apps/openmw/mwworld/worldimp.hpp           |  2 --
 8 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 apps/openmw/mwrender/externalrendering.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 77d442eef..eb5b71ec3 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -19,7 +19,7 @@ source_group(game FILES ${GAME} ${GAME_HEADER})
 add_openmw_dir (mwrender
     renderingmanager debugging sky camera animation npcanimation creatureanimation activatoranimation
     actors objects renderinginterface localmap occlusionquery water shadows
-    characterpreview externalrendering globalmap videoplayer ripplesimulation refraction
+    characterpreview globalmap videoplayer ripplesimulation refraction
     terrainstorage renderconst
     )
 
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 3a8897114..39919012e 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -40,7 +40,6 @@ namespace ESM
 
 namespace MWRender
 {
-    class ExternalRendering;
     class Animation;
 }
 
@@ -366,8 +365,6 @@ namespace MWBase
 
             virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable) = 0;
 
-            virtual void setupExternalRendering (MWRender::ExternalRendering& rendering) = 0;
-
             virtual int canRest() = 0;
             ///< check if the player is allowed to rest \n
             /// 0 - yes \n
diff --git a/apps/openmw/mwrender/characterpreview.hpp b/apps/openmw/mwrender/characterpreview.hpp
index b2dfc9679..cd30cdf46 100644
--- a/apps/openmw/mwrender/characterpreview.hpp
+++ b/apps/openmw/mwrender/characterpreview.hpp
@@ -6,8 +6,6 @@
 
 #include <components/esm/loadnpc.hpp>
 
-#include "externalrendering.hpp"
-
 #include "../mwworld/ptr.hpp"
 
 namespace OEngine
diff --git a/apps/openmw/mwrender/externalrendering.hpp b/apps/openmw/mwrender/externalrendering.hpp
deleted file mode 100644
index 33c9afd87..000000000
--- a/apps/openmw/mwrender/externalrendering.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef GAME_RENDERING_EXTERNALRENDERING_H
-#define GAME_RENDERING_EXTERNALRENDERING_H
-
-namespace Ogre
-{
-    class SceneManager;
-}
-
-namespace MWRender
-{
-    /// \brief Base class for out of world rendering
-    class ExternalRendering
-    {
-        public:
-        
-            virtual void setup (Ogre::SceneManager *sceneManager) = 0;
-        
-            virtual ~ExternalRendering() {}
-    };
-}
-
-#endif
-
diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp
index a68c6af28..d950b8414 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -39,7 +39,6 @@
 #include "localmap.hpp"
 #include "water.hpp"
 #include "npcanimation.hpp"
-#include "externalrendering.hpp"
 #include "globalmap.hpp"
 #include "videoplayer.hpp"
 #include "terrainstorage.hpp"
@@ -932,11 +931,6 @@ bool RenderingManager::isPositionExplored (float nX, float nY, int x, int y, boo
     return mLocalMap->isPositionExplored(nX, nY, x, y, interior);
 }
 
-void RenderingManager::setupExternalRendering (MWRender::ExternalRendering& rendering)
-{
-    rendering.setup (mRendering.getScene());
-}
-
 Animation* RenderingManager::getAnimation(const MWWorld::Ptr &ptr)
 {
     Animation *anim = mActors->getAnimation(ptr);
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index 37488b157..9f77f0a3c 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -48,7 +48,6 @@ namespace MWRender
     class Shadows;
     class LocalMap;
     class Water;
-    class ExternalRendering;
     class GlobalMap;
     class VideoPlayer;
     class Animation;
@@ -204,8 +203,6 @@ public:
     bool isPositionExplored (float nX, float nY, int x, int y, bool interior);
     ///< see MWRender::LocalMap::isPositionExplored
 
-    void setupExternalRendering (MWRender::ExternalRendering& rendering);
-
     Animation* getAnimation(const MWWorld::Ptr &ptr);
 
     void playVideo(const std::string& name, bool allowSkipping);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 2d3d3d07f..b72433e5a 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1705,11 +1705,6 @@ namespace MWWorld
         mPhysics->addActor(mPlayer->getPlayer());
     }
 
-    void World::setupExternalRendering (MWRender::ExternalRendering& rendering)
-    {
-        mRendering->setupExternalRendering (rendering);
-    }
-
     int World::canRest ()
     {
         Ptr::CellStore *currentCell = mWorldScene->getCurrentCell();
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 1aecb6fb6..92a993157 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -456,8 +456,6 @@ namespace MWWorld
 
             virtual void enableActorCollision(const MWWorld::Ptr& actor, bool enable);
 
-            virtual void setupExternalRendering (MWRender::ExternalRendering& rendering);
-
             virtual int canRest();
             ///< check if the player is allowed to rest \n
             /// 0 - yes \n