diff --git a/apps/openmw/mwworld/world.cpp b/apps/openmw/mwworld/world.cpp index d6cb8f110..a759b9384 100644 --- a/apps/openmw/mwworld/world.cpp +++ b/apps/openmw/mwworld/world.cpp @@ -28,15 +28,23 @@ namespace if (!iter->base->script.empty()) { if (const ESM::Script *script = store.scripts.find (iter->base->script)) - { + { iter->mData.setLocals (*script); - + scriptList.push_back ( std::make_pair (iter->base->script, MWWorld::Ptr (&*iter, cell))); } } } } + + template + ESMS::LiveCellRef *searchViaHandle (const std::string& handle, + ESMS::CellRefList& refList) + { + + return 0; + } } namespace MWWorld @@ -61,7 +69,7 @@ namespace MWWorld listCellScripts (mStore, cell.repairs, mLocalScripts, &cell); listCellScripts (mStore, cell.weapons, mLocalScripts, &cell); } - + Ptr World::getPtr (const std::string& name, Ptr::CellStore& cell) { if (ESMS::LiveCellRef *ref = cell.activators.find (name)) @@ -69,68 +77,131 @@ namespace MWWorld if (ESMS::LiveCellRef *ref = cell.potions.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.appas.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.armors.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.books.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.clothes.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.containers.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.creatures.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.doors.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.ingreds.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.creatureLists.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.itemLists.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.lights.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.lockpicks.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.miscItems.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.npcs.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.probes.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.repairs.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.statics.find (name)) return Ptr (ref, &cell); - + if (ESMS::LiveCellRef *ref = cell.weapons.find (name)) return Ptr (ref, &cell); - + return Ptr(); } - + + Ptr World::getPtrViaHandle (const std::string& handle, Ptr::CellStore& cell) + { + if (ESMS::LiveCellRef *ref = + searchViaHandle (handle, cell.activators)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.potions)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.appas)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.armors)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.books)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.clothes)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = + searchViaHandle (handle, cell.containers)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = + searchViaHandle (handle, cell.creatures)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.doors)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = + searchViaHandle (handle, cell.ingreds)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.lights)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.lockpicks)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.miscItems)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.npcs)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.probes)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.repairs)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.statics)) + return Ptr (ref, &cell); + + if (ESMS::LiveCellRef *ref = searchViaHandle (handle, cell.weapons)) + return Ptr (ref, &cell); + + return Ptr(); + } + MWRender::CellRender *World::searchRender (Ptr::CellStore *store) { CellRenderCollection::iterator iter = mActiveCells.find (store); - + if (iter!=mActiveCells.end()) { return iter->second; @@ -141,10 +212,10 @@ namespace MWWorld if (iter!=mBufferedCells.end()) return iter->second; } - + return 0; } - + int World::getDaysPerMonth (int month) const { switch (month) @@ -162,84 +233,84 @@ namespace MWWorld case 10: return 30; case 11: return 31; } - + throw std::runtime_error ("month out of range"); } - + World::World (OEngine::Render::OgreRenderer& renderer, const boost::filesystem::path& dataDir, const std::string& master, bool newGame, Environment& environment) : mSkyManager (0), mScene (renderer), mPlayerPos (0), mCurrentCell (0), mGlobalVariables (0), mSky (false), mCellChanged (false), mEnvironment (environment) - { + { boost::filesystem::path masterPath (dataDir); masterPath /= master; - + std::cout << "Loading ESM " << masterPath.string() << "\n"; // This parses the ESM file and loads a sample cell mEsm.open (masterPath.file_string()); mStore.load (mEsm); - + mPlayerPos = new MWRender::PlayerPos (mScene.getCamera(), mStore.npcs.find ("player")); // global variables mGlobalVariables = new Globals (mStore); - + if (newGame) - { + { // set new game mark mGlobalVariables->setInt ("chargenstate", 1); } - + mSkyManager = - MWRender::SkyManager::create(renderer.getWindow(), mScene.getCamera()); + MWRender::SkyManager::create(renderer.getWindow(), mScene.getCamera()); } - + World::~World() { for (CellRenderCollection::iterator iter (mActiveCells.begin()); iter!=mActiveCells.end(); ++iter) delete iter->second; - + for (CellRenderCollection::iterator iter (mBufferedCells.begin()); iter!=mBufferedCells.end(); ++iter) delete iter->second; - + delete mPlayerPos; delete mSkyManager; delete mGlobalVariables; } - + MWRender::PlayerPos& World::getPlayerPos() { return *mPlayerPos; } - + ESMS::ESMStore& World::getStore() { return mStore; } - + const World::ScriptList& World::getLocalScripts() const { return mLocalScripts; } - + bool World::hasCellChanged() const { return mCellChanged; } - + Globals::Data& World::getGlobalVariable (const std::string& name) { return (*mGlobalVariables)[name]; } - + char World::getGlobalVariableType (const std::string& name) const { return mGlobalVariables->getType (name); - } - + } + Ptr World::getPtr (const std::string& name, bool activeOnly) { // the player is always in an active cell. @@ -247,35 +318,51 @@ namespace MWWorld { return mPlayerPos->getPlayer(); } - + // active cells for (CellRenderCollection::iterator iter (mActiveCells.begin()); iter!=mActiveCells.end(); ++iter) { Ptr ptr = getPtr (name, *iter->first); - + if (!ptr.isEmpty()) return ptr; } - + if (!activeOnly) { // TODO: inactive cells } - + throw std::runtime_error ("unknown ID: " + name); } - + + Ptr World::getPtrViaHandle (const std::string& handle) + { + // TODO player + + for (CellRenderCollection::iterator iter (mActiveCells.begin()); + iter!=mActiveCells.end(); ++iter) + { + Ptr ptr = getPtrViaHandle (handle, *iter->first); + + if (!ptr.isEmpty()) + return ptr; + } + + throw std::runtime_error ("unknown Ogre handle: " + handle); + } + void World::enable (Ptr reference) { if (!reference.getRefData().isEnabled()) { reference.getRefData().enable(); - + if (MWRender::CellRender *render = searchRender (reference.getCell())) { render->enable (reference.getRefData().getHandle()); - + if (mActiveCells.find (reference.getCell())!=mActiveCells.end() && (reference.getType()==typeid (ESMS::LiveCellRef) || reference.getType()==typeid (ESMS::LiveCellRef))) @@ -285,69 +372,69 @@ namespace MWWorld } } } - + void World::disable (Ptr reference) { if (!reference.getRefData().isEnabled()) { reference.getRefData().enable(); - + if (MWRender::CellRender *render = searchRender (reference.getCell())) { render->disable (reference.getRefData().getHandle()); - + if (mActiveCells.find (reference.getCell())!=mActiveCells.end() && (reference.getType()==typeid (ESMS::LiveCellRef) || reference.getType()==typeid (ESMS::LiveCellRef))) { mEnvironment.mMechanicsManager->removeActor (reference); - } + } } - } + } } - + void World::advanceTime (double hours) { hours += mGlobalVariables->getFloat ("gamehour"); setHour (hours); - + int days = hours / 24; - + if (days>0) mGlobalVariables->setInt ("dayspassed", days + mGlobalVariables->getInt ("dayspassed")); } - + void World::setHour (double hour) { if (hour<0) hour = 0; - + int days = hour / 24; - + hour = std::fmod (hour, 24); - + mGlobalVariables->setFloat ("gamehour", hour); - + mSkyManager->setHour (hour); - + if (days>0) setDay (days + mGlobalVariables->getInt ("day")); } - + void World::setDay (int day) { if (day<0) day = 0; int month = mGlobalVariables->getInt ("month"); - + while (true) { - int days = getDaysPerMonth (month); + int days = getDaysPerMonth (month); if (daysetInt ("year", mGlobalVariables->getInt ("year")+1); } - + day -= days; - } - - mGlobalVariables->setInt ("day", day); + } + + mGlobalVariables->setInt ("day", day); mGlobalVariables->setInt ("month", month); mSkyManager->setDate (day, month); - } - + } + void World::setMonth (int month) { if (month<0) month = 0; - + int years = month / 12; month = month % 12; - + int days = getDaysPerMonth (month); - + if (mGlobalVariables->getInt ("day")>=days) mGlobalVariables->setInt ("day", days-1); - + mGlobalVariables->setInt ("month", month); - + if (years>0) mGlobalVariables->setInt ("year", years+mGlobalVariables->getInt ("year")); mSkyManager->setDate (mGlobalVariables->getInt ("day"), month); } - + void World::toggleSky() { if (mSky) @@ -405,36 +492,36 @@ namespace MWWorld mSkyManager->enable(); } } - + int World::getMasserPhase() const { return mSkyManager->getMasserPhase(); } - + int World::getSecundaPhase() const { return mSkyManager->getSecundaPhase(); } - + void World::setMoonColour (bool red) { - mSkyManager->setMoonColour (red); + mSkyManager->setMoonColour (red); } - + float World::getTimeScaleFactor() const { return mGlobalVariables->getInt ("timescale"); } - + void World::changeCell (const std::string& cellName, const ESM::Position& position) { - // Load cell. + // Load cell. mInteriors[cellName].loadInt (cellName, mStore, mEsm); Ptr::CellStore *cell = &mInteriors[cellName]; - + // remove active CellRenderCollection::iterator active = mActiveCells.begin(); - + if (active!=mActiveCells.end()) { mEnvironment.mMechanicsManager->dropActors (active->first); @@ -444,7 +531,7 @@ namespace MWWorld } // register local scripts - mLocalScripts.clear(); // FIXME won't work with exteriors + mLocalScripts.clear(); // FIXME won't work with exteriors insertInteriorScripts (*cell); // adjust player @@ -458,11 +545,11 @@ namespace MWWorld new MWRender::InteriorCellRender (*cell, mStore, mScene))); if (result.second) - { + { // Load the cell and insert it into the renderer result.first->second->show(); } - + // Actors mEnvironment.mMechanicsManager->addActor (mPlayerPos->getPlayer()); mEnvironment.mMechanicsManager->watchActor (mPlayerPos->getPlayer()); @@ -496,12 +583,12 @@ namespace MWWorld // TODO set weather toggleSky(); } - + mCellChanged = true; } - + void World::markCellAsUnchanged() { - mCellChanged = false; + mCellChanged = false; } } diff --git a/apps/openmw/mwworld/world.hpp b/apps/openmw/mwworld/world.hpp index 953fe93e4..9030b0c1b 100644 --- a/apps/openmw/mwworld/world.hpp +++ b/apps/openmw/mwworld/world.hpp @@ -30,23 +30,23 @@ namespace MWRender class SkyManager; class CellRender; } - + namespace MWWorld { class Environment; /// \brief The game world and its visual representation - + class World { public: - + typedef std::vector > ScriptList; - + private: - + typedef std::map CellRenderCollection; - + MWRender::SkyManager* mSkyManager; MWRender::MWScene mScene; MWRender::PlayerPos *mPlayerPos; @@ -61,70 +61,75 @@ namespace MWWorld bool mSky; bool mCellChanged; Environment& mEnvironment; - + // not implemented World (const World&); World& operator= (const World&); - + void insertInteriorScripts (ESMS::CellStore& cell); - + Ptr getPtr (const std::string& name, Ptr::CellStore& cellStore); - + + Ptr getPtrViaHandle (const std::string& handle, Ptr::CellStore& cellStore); + MWRender::CellRender *searchRender (Ptr::CellStore *store); - + int getDaysPerMonth (int month) const; - + public: - + World (OEngine::Render::OgreRenderer& renderer, const boost::filesystem::path& master, const std::string& dataDir, bool newGame, Environment& environment); - + ~World(); - + MWRender::PlayerPos& getPlayerPos(); - + ESMS::ESMStore& getStore(); - + const ScriptList& getLocalScripts() const; ///< Names and local variable state of all local scripts in active cells. - + bool hasCellChanged() const; ///< Has the player moved to a different cell, since the last frame? - + Globals::Data& getGlobalVariable (const std::string& name); - + char getGlobalVariableType (const std::string& name) const; ///< Return ' ', if there is no global variable with this name. - + Ptr getPtr (const std::string& name, bool activeOnly); ///< Return a pointer to a liveCellRef with the given name. /// \param activeOnly do non search inactive cells. + Ptr getPtrViaHandle (const std::string& handle); + ///< Return a pointer to a liveCellRef with the given Ogre handle. + void enable (Ptr reference); - + void disable (Ptr reference); - + void advanceTime (double hours); - + void setHour (double hour); - + void setMonth (int month); - + void setDay (int day); - + void toggleSky(); - + int getMasserPhase() const; - + int getSecundaPhase() const; - + void setMoonColour (bool red); - + float getTimeScaleFactor() const; - + void changeCell (const std::string& cellName, const ESM::Position& position); ///< works only for interior cells currently. - + void markCellAsUnchanged(); }; }