From b7c9285b24b1d9bd205ee36a5bf6676fd10d35be Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Fri, 14 Sep 2012 21:12:16 +0200
Subject: [PATCH] added support for out of world rendering

---
 apps/openmw/CMakeLists.txt                 |  2 +-
 apps/openmw/mwbase/world.hpp               |  7 +++++++
 apps/openmw/mwrender/externalrendering.hpp | 23 ++++++++++++++++++++++
 apps/openmw/mwrender/renderingmanager.cpp  |  6 ++++++
 apps/openmw/mwrender/renderingmanager.hpp  |  7 +++++--
 apps/openmw/mwworld/worldimp.cpp           |  5 +++++
 apps/openmw/mwworld/worldimp.hpp           |  2 ++
 7 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 apps/openmw/mwrender/externalrendering.hpp

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index b9ea8041d..79d7f7af9 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -16,7 +16,7 @@ source_group(game FILES ${GAME} ${GAME_HEADER})
 add_openmw_dir (mwrender
     renderingmanager debugging sky player animation npcanimation creatureanimation actors objects
     renderinginterface localmap occlusionquery terrain terrainmaterial water shadows
-    compositors
+    compositors externalrendering
     )
 
 add_openmw_dir (mwinput
diff --git a/apps/openmw/mwbase/world.hpp b/apps/openmw/mwbase/world.hpp
index 19405fb7a..a83d6906f 100644
--- a/apps/openmw/mwbase/world.hpp
+++ b/apps/openmw/mwbase/world.hpp
@@ -35,6 +35,11 @@ namespace ESMS
     struct ESMStore;
 }
 
+namespace MWRender
+{
+    class ExternalRendering;
+}
+
 namespace MWWorld
 {
     class CellStore;
@@ -271,6 +276,8 @@ namespace MWBase
             virtual void togglePlayerLooking(bool enable) = 0;
 
             virtual void renderPlayer() = 0;
+            
+            virtual void setupExternalRendering (MWRender::ExternalRendering& rendering) = 0;
     };
 }
 
diff --git a/apps/openmw/mwrender/externalrendering.hpp b/apps/openmw/mwrender/externalrendering.hpp
new file mode 100644
index 000000000..33c9afd87
--- /dev/null
+++ b/apps/openmw/mwrender/externalrendering.hpp
@@ -0,0 +1,23 @@
+#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 70d7de552..da49442f6 100644
--- a/apps/openmw/mwrender/renderingmanager.cpp
+++ b/apps/openmw/mwrender/renderingmanager.cpp
@@ -34,6 +34,7 @@
 #include "water.hpp"
 #include "compositors.hpp"
 #include "npcanimation.hpp"
+#include "externalrendering.hpp"
 
 using namespace MWRender;
 using namespace Ogre;
@@ -882,4 +883,9 @@ 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());
+}
+
 } // namespace
diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp
index e5be238bd..e994e4909 100644
--- a/apps/openmw/mwrender/renderingmanager.hpp
+++ b/apps/openmw/mwrender/renderingmanager.hpp
@@ -43,6 +43,7 @@ namespace MWRender
     class LocalMap;
     class Water;
     class Compositors;
+    class ExternalRendering;
 
 class RenderingManager: private RenderingInterface, public Ogre::WindowEventListener {
 
@@ -185,12 +186,14 @@ class RenderingManager: private RenderingInterface, public Ogre::WindowEventList
 
     static bool waterShaderSupported();
 
-    virtual void getInteriorMapPosition (Ogre::Vector2 position, float& nX, float& nY, int &x, int& y);
+    void getInteriorMapPosition (Ogre::Vector2 position, float& nX, float& nY, int &x, int& y);
     ///< see MWRender::LocalMap::getInteriorMapPosition
 
-    virtual bool isPositionExplored (float nX, float nY, int x, int y, bool interior);
+    bool isPositionExplored (float nX, float nY, int x, int y, bool interior);
     ///< see MWRender::LocalMap::isPositionExplored
 
+    void setupExternalRendering (MWRender::ExternalRendering& rendering);
+
   protected:
 	virtual void windowResized(Ogre::RenderWindow* rw);
     virtual void windowClosed(Ogre::RenderWindow* rw);
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 869ce94d1..27c354aef 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -1222,4 +1222,9 @@ namespace MWWorld
     {
         mRendering->renderPlayer(mPlayer->getPlayer());
     }
+    
+    void World::setupExternalRendering (MWRender::ExternalRendering& rendering)
+    {
+        mRendering->setupExternalRendering (rendering);
+    }
 }
diff --git a/apps/openmw/mwworld/worldimp.hpp b/apps/openmw/mwworld/worldimp.hpp
index 6279343d4..96e6ae3f8 100644
--- a/apps/openmw/mwworld/worldimp.hpp
+++ b/apps/openmw/mwworld/worldimp.hpp
@@ -307,6 +307,8 @@ namespace MWWorld
             }
 
             virtual void renderPlayer();
+            
+            virtual void setupExternalRendering (MWRender::ExternalRendering& rendering);
     };
 }