diff --git a/apps/openmw/mwrender/renderingmanager.cpp b/apps/openmw/mwrender/renderingmanager.cpp index 46cf89edc..89429d061 100644 --- a/apps/openmw/mwrender/renderingmanager.cpp +++ b/apps/openmw/mwrender/renderingmanager.cpp @@ -22,7 +22,7 @@ namespace MWRender { -RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const boost::filesystem::path& resDir) :rend(_rend) +RenderingManager::RenderingManager (OEngine::Render::OgreRenderer& _rend, const boost::filesystem::path& resDir, OEngine::Physic::PhysicEngine* engine) :rend(_rend), mDebugging(engine) { @@ -134,5 +134,8 @@ void RenderingManager::skySetMoonColour (bool red) { mSkyManager->setMoonColour(red); } +bool RenderingManager::toggleRenderMode(int mode){ + return mDebugging.toggleRenderMode(mode); +} } diff --git a/apps/openmw/mwrender/renderingmanager.hpp b/apps/openmw/mwrender/renderingmanager.hpp index dcac7625d..917be1b22 100644 --- a/apps/openmw/mwrender/renderingmanager.hpp +++ b/apps/openmw/mwrender/renderingmanager.hpp @@ -3,6 +3,7 @@ #include "sky.hpp" +#include "debugging.hpp" #include #include @@ -50,10 +51,12 @@ class RenderingManager { OEngine::Physic::PhysicEngine* eng; MWRender::Player *mPlayer; + MWRender::Debugging mDebugging; public: - RenderingManager(OEngine::Render::OgreRenderer& _rend, const boost::filesystem::path& resDir); + RenderingManager(OEngine::Render::OgreRenderer& _rend, const boost::filesystem::path& resDir, OEngine::Physic::PhysicEngine* engine); ~RenderingManager(); + bool toggleRenderMode(int mode); void removeCell (MWWorld::Ptr::CellStore *store); // TODO do we want this? diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index fafea5e12..2aadaae11 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -176,7 +176,7 @@ namespace MWWorld const Files::Collections& fileCollections, const std::string& master, const boost::filesystem::path& resDir, bool newGame, Environment& environment, const std::string& encoding) - : mRendering (renderer,resDir), mDebugging(physEng), mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0), + : mRendering (renderer,resDir, physEng),mPlayer (0), mLocalScripts (mStore), mGlobalVariables (0), mSky (false), mEnvironment (environment), mNextDynamicRecord (0), mCells (mStore, mEsm, *this) { std::cout << "Creating myworld\n"; @@ -654,7 +654,7 @@ namespace MWWorld bool World::toggleRenderMode (RenderMode mode) { - return mDebugging.toggleRenderMode (mode); + return mRendering.toggleRenderMode (mode); } std::pair World::createRecord (const ESM::Potion& record) diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp index b00b8dead..ca1759e00 100644 --- a/apps/openmw/mwworld/world.hpp +++ b/apps/openmw/mwworld/world.hpp @@ -66,7 +66,7 @@ namespace MWWorld private: MWRender::RenderingManager mRendering; - MWRender::Debugging mDebugging; + MWWorld::Scene *mWorldScene; MWWorld::Player *mPlayer; ESM::ESMReader mEsm;