mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-20 07:53:51 +00:00
Code Issues Releases Wiki Activity

Hiding debugging

Browse source
This commit is contained in:
Jason Hooks 2011-10-30 00:25:29 -04:00
parent db73487623
commit 1083db5582
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwrender/renderingmanager.cpp
View file

@ -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); mSkyManager->setMoonColour(red);
} }
bool RenderingManager::toggleRenderMode(int mode){
return mDebugging.toggleRenderMode(mode);
}
} }

5
apps/openmw/mwrender/renderingmanager.hpp
View file

@ -3,6 +3,7 @@
#include "sky.hpp" #include "sky.hpp"
#include "debugging.hpp"
#include <utility> #include <utility>
#include <openengine/ogre/renderer.hpp> #include <openengine/ogre/renderer.hpp>
@ -50,10 +51,12 @@ class RenderingManager {
OEngine::Physic::PhysicEngine* eng; OEngine::Physic::PhysicEngine* eng;
MWRender::Player *mPlayer; MWRender::Player *mPlayer;
MWRender::Debugging mDebugging;
public: 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(); ~RenderingManager();
bool toggleRenderMode(int mode);
void removeCell (MWWorld::Ptr::CellStore *store); // TODO do we want this? void removeCell (MWWorld::Ptr::CellStore *store); // TODO do we want this?

4
apps/openmw/mwworld/world.cpp
View file

@ -176,7 +176,7 @@ namespace MWWorld
const Files::Collections& fileCollections, const Files::Collections& fileCollections,
const std::string& master, const boost::filesystem::path& resDir, const std::string& master, const boost::filesystem::path& resDir,
bool newGame, Environment& environment, const std::string& encoding) 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) mSky (false), mEnvironment (environment), mNextDynamicRecord (0), mCells (mStore, mEsm, *this)
{ {
std::cout << "Creating myworld\n"; std::cout << "Creating myworld\n";
@ -654,7 +654,7 @@ namespace MWWorld
bool World::toggleRenderMode (RenderMode mode) bool World::toggleRenderMode (RenderMode mode)
{ {
return mDebugging.toggleRenderMode (mode); return mRendering.toggleRenderMode (mode);
} }
std::pair<std::string, const ESM::Potion *> World::createRecord (const ESM::Potion& record) std::pair<std::string, const ESM::Potion *> World::createRecord (const ESM::Potion& record)

2
apps/openmw/mwworld/world.hpp
View file

@ -66,7 +66,7 @@ namespace MWWorld
private: private:
MWRender::RenderingManager mRendering; MWRender::RenderingManager mRendering;
MWRender::Debugging mDebugging;
MWWorld::Scene *mWorldScene; MWWorld::Scene *mWorldScene;
MWWorld::Player *mPlayer; MWWorld::Player *mPlayer;
ESM::ESMReader mEsm; ESM::ESMReader mEsm;