mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 15:45:37 +00:00
Code Issues Projects Releases Wiki Activity

Make MWWorld:Cells and MWWorld::Scene to be accessible via Environment

Browse Source
This commit is contained in:
Petr Mikheev 2022-11-06 17:57:01 +01:00
parent ff142b6009
commit 2df993004c
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/openmw/engine.cpp
View File

@ -772,6 +772,8 @@ void OMW::Engine::prepareEngine()
mWorld->setupPlayer(); mWorld->setupPlayer();
mWorld->setRandomSeed(mRandomSeed); mWorld->setRandomSeed(mRandomSeed);
mEnvironment.setWorld(*mWorld); mEnvironment.setWorld(*mWorld);
mEnvironment.setWorldModel(mWorld->getWorldModel());
mEnvironment.setWorldScene(mWorld->getWorldScene());
mWindowManager->setStore(mWorld->getStore()); mWindowManager->setStore(mWorld->getStore());
mWindowManager->initUI(); mWindowManager->initUI();

12
apps/openmw/mwbase/environment.hpp
View File

@ -15,6 +15,12 @@ namespace l10n
class Manager; class Manager;
} }
namespace MWWorld
{
class Cells;
class Scene;
}
namespace MWBase namespace MWBase
{ {
class World; class World;
@ -37,6 +43,8 @@ namespace MWBase
static Environment* sThis; static Environment* sThis;
World* mWorld = nullptr; World* mWorld = nullptr;
MWWorld::Cells* mWorldModel = nullptr; // TODO: rename Cells -> WorldModel
MWWorld::Scene* mWorldScene = nullptr;
SoundManager* mSoundManager = nullptr; SoundManager* mSoundManager = nullptr;
ScriptManager* mScriptManager = nullptr; ScriptManager* mScriptManager = nullptr;
WindowManager* mWindowManager = nullptr; WindowManager* mWindowManager = nullptr;
@ -61,6 +69,8 @@ namespace MWBase
Environment& operator=(const Environment&) = delete; Environment& operator=(const Environment&) = delete;
void setWorld(World& value) { mWorld = &value; } void setWorld(World& value) { mWorld = &value; }
void setWorldModel(MWWorld::Cells& value) { mWorldModel = &value; }
void setWorldScene(MWWorld::Scene& value) { mWorldScene = &value; }
void setSoundManager(SoundManager& value) { mSoundManager = &value; } void setSoundManager(SoundManager& value) { mSoundManager = &value; }
@ -85,6 +95,8 @@ namespace MWBase
void setL10nManager(l10n::Manager& value) { mL10nManager = &value; } void setL10nManager(l10n::Manager& value) { mL10nManager = &value; }
Misc::NotNullPtr<World> getWorld() const { return mWorld; } Misc::NotNullPtr<World> getWorld() const { return mWorld; }
Misc::NotNullPtr<MWWorld::Cells> getWorldModel() const { return mWorldModel; }
Misc::NotNullPtr<MWWorld::Scene> getWorldScene() const { return mWorldScene; }
Misc::NotNullPtr<SoundManager> getSoundManager() const { return mSoundManager; } Misc::NotNullPtr<SoundManager> getSoundManager() const { return mSoundManager; }

3
apps/openmw/mwworld/worldimp.hpp
View File

@ -189,6 +189,9 @@ namespace MWWorld
MWWorld::ConstPtr getClosestMarkerFromExteriorPosition(const osg::Vec3f& worldPos, std::string_view id); MWWorld::ConstPtr getClosestMarkerFromExteriorPosition(const osg::Vec3f& worldPos, std::string_view id);
public: public:
Cells& getWorldModel() { return mCells; }
Scene& getWorldScene() { return *mWorldScene; }
// FIXME // FIXME
void addContainerScripts(const Ptr& reference, CellStore* cell) override; void addContainerScripts(const Ptr& reference, CellStore* cell) override;
void removeContainerScripts(const Ptr& reference) override; void removeContainerScripts(const Ptr& reference) override;