teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Adding new insertCellRefList;Collection switched to a set

Browse source
This commit is contained in:
Jason Hooks 2011-11-15 23:31:18 -05:00
parent bc06d13d30
commit 58f103a75c
4 changed files with 98 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
apps/openmw/mwworld/scene.cpp
View file

@ -17,6 +17,8 @@
namespace { namespace {
template<typename T> template<typename T>
void insertCellRefList (T& cellRefList, ESMS::CellStore<MWWorld::RefData> &cell) void insertCellRefList (T& cellRefList, ESMS::CellStore<MWWorld::RefData> &cell)
{ {
@ -37,6 +39,38 @@ void insertCellRefList (T& cellRefList, ESMS::CellStore<MWWorld::RefData> &cell)
*/ */
} }
} }
}
}
template<typename T>
void insertCellRefList(MWRender::RenderingManager& rendering, MWWorld::Environment& environment,
T& cellRefList, ESMS::CellStore<MWWorld::RefData> &cell, MWWorld::PhysicsSystem& physics)
{
if (!cellRefList.list.empty())
{
const MWWorld::Class& class_ =
MWWorld::Class::get (MWWorld::Ptr (&*cellRefList.list.begin(), &cell));
for (typename T::List::iterator it = cellRefList.list.begin();
it != cellRefList.list.end(); it++)
{
if (it->mData.getCount() || it->mData.isEnabled())
{
MWWorld::Ptr ptr (&*it, &cell);
try
{
class_.insertObjectRendering(ptr, rendering);
class_.insertObject(ptr, physics, environment);
class_.enable (ptr, environment);
}
catch (const std::exception& e)
{
std::string error ("error during rendering: ");
std::cerr << error + e.what() << std::endl;
}
}
}
} }
} }
@ -46,11 +80,11 @@ void insertCellRefList (T& cellRefList, ESMS::CellStore<MWWorld::RefData> &cell)
namespace MWWorld namespace MWWorld
{ {
void Scene::unloadCell (CellRenderCollection::iterator iter) void Scene::unloadCell (CellStoreCollection::iterator iter)
{ {
ListHandles functor; ListHandles functor;
Ptr::CellStore* cellstore = *iter; Ptr::CellStore* cellstore = *iter;
cellstore->forEach<ListHandles>(functor); cellstore->forEach<ListHandles>(functor);
{ // silence annoying g++ warning { // silence annoying g++ warning
@ -73,9 +107,10 @@ namespace MWWorld
mWorld->getLocalScripts().addCell (cell); mWorld->getLocalScripts().addCell (cell);
// This connects the cell data with the rendering scene. // This connects the cell data with the rendering scene.
mActiveCells.push_back(cell); mActiveCells.insert(cell);
mRendering.getObjects().buildStaticGeometry(*cell); mRendering.getObjects().buildStaticGeometry(*cell);
insertCell(*cell, mEnvironment);
} }
@ -96,7 +131,7 @@ namespace MWWorld
// remove active // remove active
mEnvironment.mMechanicsManager->removeActor (mWorld->getPlayer().getPlayer()); mEnvironment.mMechanicsManager->removeActor (mWorld->getPlayer().getPlayer());
CellRenderCollection::iterator active = mActiveCells.begin(); CellStoreCollection::iterator active = mActiveCells.begin();
Ptr::CellStore* cellstore = *active; Ptr::CellStore* cellstore = *active;
while (active!=mActiveCells.end()) while (active!=mActiveCells.end())
@ -120,12 +155,12 @@ namespace MWWorld
for (int x=X-1; x<=X+1; ++x) for (int x=X-1; x<=X+1; ++x)
for (int y=Y-1; y<=Y+1; ++y) for (int y=Y-1; y<=Y+1; ++y)
{ {
CellRenderCollection::iterator iter = mActiveCells.begin(); CellStoreCollection::iterator iter = mActiveCells.begin();
Ptr::CellStore* cellstore = *iter; Ptr::CellStore* cellstore = *iter;
while (iter!=mActiveCells.end()) while (iter!=mActiveCells.end())
{ {
assert (!(iter->first->cell->data.flags & ESM::Cell::Interior)); assert (!(cellstore->cell->data.flags & ESM::Cell::Interior));
if (x==cellstore->cell->data.gridX && if (x==cellstore->cell->data.gridX &&
y==cellstore->cell->data.gridY) y==cellstore->cell->data.gridY)
@ -143,7 +178,7 @@ namespace MWWorld
} }
// find current cell // find current cell
CellRenderCollection::iterator iter = mActiveCells.begin(); CellStoreCollection::iterator iter = mActiveCells.begin();
cellstore = *active; cellstore = *active;
while (iter!=mActiveCells.end()) while (iter!=mActiveCells.end())
@ -171,18 +206,14 @@ namespace MWWorld
} }
//We need the ogre renderer and a scene node. //We need the ogre renderer and a scene node.
Scene::Scene (Environment& environment, World *world, MWRender::RenderingManager& rendering, Ogre::SceneNode *mwRoot, PhysicsSystem *physics) Scene::Scene (Environment& environment, World *world, MWRender::RenderingManager& rendering, PhysicsSystem *physics)
: mRendering(rendering), mCurrentCell (0), : mRendering(rendering), mCurrentCell (0),
mCellChanged (false), mEnvironment (environment), mWorld(world), mPhysics(physics) mCellChanged (false), mEnvironment (environment), mWorld(world), mPhysics(physics)
{ {
mMwRoot = mwRoot;
} }
Scene::~Scene() Scene::~Scene()
{ {
/*for (CellRenderCollection::iterator iter (mActiveCells.begin());
iter!=mActiveCells.end(); ++iter)
delete iter->second;*/
} }
bool Scene::hasCellChanged() const bool Scene::hasCellChanged() const
@ -190,7 +221,7 @@ namespace MWWorld
return mCellChanged; return mCellChanged;
} }
const Scene::CellRenderCollection& Scene::getActiveCells() const const Scene::CellStoreCollection& Scene::getActiveCells() const
{ {
return mActiveCells; return mActiveCells;
} }
@ -198,7 +229,7 @@ namespace MWWorld
void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position) void Scene::changeToInteriorCell (const std::string& cellName, const ESM::Position& position)
{ {
// remove active // remove active
CellRenderCollection::iterator active = mActiveCells.begin(); CellStoreCollection::iterator active = mActiveCells.begin();
while (active!=mActiveCells.end()) while (active!=mActiveCells.end())
{ {
@ -271,7 +302,34 @@ void Scene::insertCell(ESMS::CellStore<MWWorld::RefData> &cell)
insertCellRefList (cell.probes, cell); insertCellRefList (cell.probes, cell);
insertCellRefList (cell.repairs, cell); insertCellRefList (cell.repairs, cell);
insertCellRefList (cell.statics, cell); insertCellRefList (cell.statics, cell);
insertCellRefList (cell.weapons, cell); insertCellRefList(cell.weapons, cell);
} }
void Scene::insertCell(ESMS::CellStore<MWWorld::RefData> &cell,
MWWorld::Environment& environment)
{
// Loop through all references in the cell
insertCellRefList(mRendering, environment, cell.activators, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.potions, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.appas, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.armors, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.books, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.clothes, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.containers, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.creatures, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.doors, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.ingreds, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.creatureLists, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.itemLists, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.lights, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.lockpicks, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.miscItems, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.npcs, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.probes, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.repairs, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.statics, cell, *mPhysics);
insertCellRefList(mRendering, environment, cell.weapons, cell, *mPhysics);
}
} }

14
apps/openmw/mwworld/scene.hpp
View file

@ -14,6 +14,7 @@
#include "ptr.hpp" #include "ptr.hpp"
#include "globals.hpp" #include "globals.hpp"
#include "../mwrender/renderingmanager.hpp" #include "../mwrender/renderingmanager.hpp"
#include "../mwrender/renderinginterface.hpp"
#include <openengine/bullet/physic.hpp> #include <openengine/bullet/physic.hpp>
namespace Ogre namespace Ogre
@ -52,14 +53,14 @@ namespace MWWorld
public: public:
typedef std::list<Ptr::CellStore *> CellRenderCollection; typedef std::set<Ptr::CellStore *> CellStoreCollection;
private: private:
//OEngine::Render::OgreRenderer& mRenderer; //OEngine::Render::OgreRenderer& mRenderer;
Ogre::SceneNode *mMwRoot; Ogre::SceneNode *mMwRoot;
Ptr::CellStore* mCurrentCell; // the cell, the player is in Ptr::CellStore* mCurrentCell; // the cell, the player is in
CellRenderCollection mActiveCells; CellStoreCollection mActiveCells;
bool mCellChanged; bool mCellChanged;
Environment& mEnvironment; Environment& mEnvironment;
World *mWorld; World *mWorld;
@ -68,13 +69,15 @@ namespace MWWorld
void playerCellChange (Ptr::CellStore *cell, const ESM::Position& position, void playerCellChange (Ptr::CellStore *cell, const ESM::Position& position,
bool adjustPlayerPos = true); bool adjustPlayerPos = true);
public: public:
Scene (Environment& environment, World *world, MWRender::RenderingManager& rendering, Ogre::SceneNode *mwRoot, PhysicsSystem *physics); Scene (Environment& environment, World *world, MWRender::RenderingManager& rendering, PhysicsSystem *physics);
~Scene(); ~Scene();
void unloadCell (CellRenderCollection::iterator iter); void unloadCell (CellStoreCollection::iterator iter);
void loadCell (Ptr::CellStore *cell); void loadCell (Ptr::CellStore *cell);
@ -84,7 +87,7 @@ namespace MWWorld
Ptr::CellStore* getCurrentCell (); Ptr::CellStore* getCurrentCell ();
const CellRenderCollection& getActiveCells () const; const CellStoreCollection& getActiveCells () const;
bool hasCellChanged() const; bool hasCellChanged() const;
///< Has the player moved to a different cell, since the last frame? ///< Has the player moved to a different cell, since the last frame?
@ -100,6 +103,7 @@ namespace MWWorld
// std::string getFacedHandle(); // std::string getFacedHandle();
void insertCell(ESMS::CellStore<MWWorld::RefData> &cell); void insertCell(ESMS::CellStore<MWWorld::RefData> &cell);
void insertCell(ESMS::CellStore<MWWorld::RefData> &cell, MWWorld::Environment& environment);
}; };
} }

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

@ -130,20 +130,6 @@ namespace MWWorld
return Ptr(); return Ptr();
} }
/*
MWRender::CellRender *World::searchRender (Ptr::CellStore *store)
{
for (Scene::CellRenderCollection::const_iterator iter (mWorldScene->getActiveCells().begin());
iter!=mWorldScene->getActiveCells().end(); ++iter)
{
Ptr::CellStore* cellstore = *iter;
if(store == cellstore){
//return iter->second;
}
}
return 0;
}*/
int World::getDaysPerMonth (int month) const int World::getDaysPerMonth (int month) const
{ {
@ -211,7 +197,7 @@ namespace MWWorld
mPhysEngine = physEng; mPhysEngine = physEng;
mWorldScene = new Scene(environment, this, mRendering, mRendering.getRoot(), mPhysics); mWorldScene = new Scene(environment, this, mRendering, mPhysics);
} }
@ -308,7 +294,7 @@ namespace MWWorld
} }
// active cells // active cells
for (Scene::CellRenderCollection::const_iterator iter (mWorldScene->getActiveCells().begin()); for (Scene::CellStoreCollection::const_iterator iter (mWorldScene->getActiveCells().begin());
iter!=mWorldScene->getActiveCells().end(); ++iter) iter!=mWorldScene->getActiveCells().end(); ++iter)
{ {
Ptr::CellStore* cellstore = *iter; Ptr::CellStore* cellstore = *iter;
@ -334,7 +320,7 @@ namespace MWWorld
if (mPlayer->getPlayer().getRefData().getHandle()==handle) if (mPlayer->getPlayer().getRefData().getHandle()==handle)
return mPlayer->getPlayer(); return mPlayer->getPlayer();
for (Scene::CellRenderCollection::const_iterator iter (mWorldScene->getActiveCells().begin()); for (Scene::CellStoreCollection::const_iterator iter (mWorldScene->getActiveCells().begin());
iter!=mWorldScene->getActiveCells().end(); ++iter) iter!=mWorldScene->getActiveCells().end(); ++iter)
{ {
Ptr::CellStore* cellstore = *iter; Ptr::CellStore* cellstore = *iter;
@ -355,17 +341,9 @@ namespace MWWorld
//render->enable (reference.getRefData().getHandle()); //render->enable (reference.getRefData().getHandle());
for (Scene::CellRenderCollection::const_iterator iter (mWorldScene->getActiveCells().begin()); if(mWorldScene->getActiveCells().find (reference.getCell()) != mWorldScene->getActiveCells().end())
iter!=mWorldScene->getActiveCells().end(); ++iter) Class::get (reference).enable (reference, mEnvironment);
{
Ptr::CellStore* cellstore = *iter;
if(reference.getCell() == cellstore){
Class::get (reference).enable (reference, mEnvironment);
break;
}
}
} }
} }
@ -378,16 +356,10 @@ namespace MWWorld
//render->disable (reference.getRefData().getHandle()); //render->disable (reference.getRefData().getHandle());
for (Scene::CellRenderCollection::const_iterator iter (mWorldScene->getActiveCells().begin()); if(mWorldScene->getActiveCells().find (reference.getCell())!=mWorldScene->getActiveCells().end()){
iter!=mWorldScene->getActiveCells().end(); ++iter) Class::get (reference).disable (reference, mEnvironment);
{ mEnvironment.mSoundManager->stopSound3D (reference);
Ptr::CellStore* cellstore = *iter; }
if(reference.getCell() == cellstore){
Class::get (reference).disable (reference, mEnvironment);
mEnvironment.mSoundManager->stopSound3D (reference);
break;
}
}
} }
@ -548,19 +520,14 @@ namespace MWWorld
ptr.getRefData().setCount (0); ptr.getRefData().setCount (0);
for (Scene::CellRenderCollection::const_iterator iter (mWorldScene->getActiveCells().begin()); if (mWorldScene->getActiveCells().find (ptr.getCell())!=mWorldScene->getActiveCells().end()){
iter!=mWorldScene->getActiveCells().end(); ++iter)
{
Ptr::CellStore* cellstore = *iter;
if(ptr.getCell() == cellstore){
Class::get (ptr).disable (ptr, mEnvironment); Class::get (ptr).disable (ptr, mEnvironment);
mEnvironment.mSoundManager->stopSound3D (ptr); mEnvironment.mSoundManager->stopSound3D (ptr);
mPhysics->removeObject (ptr.getRefData().getHandle()); mPhysics->removeObject (ptr.getRefData().getHandle());
mRendering.removeObject(ptr);
mLocalScripts.remove (ptr); mLocalScripts.remove (ptr);
break;
}
} }

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

@ -88,7 +88,6 @@ namespace MWWorld
Ptr getPtrViaHandle (const std::string& handle, Ptr::CellStore& cellStore); Ptr getPtrViaHandle (const std::string& handle, Ptr::CellStore& cellStore);
//MWRender::CellRender *searchRender (Ptr::CellStore *store);
int getDaysPerMonth (int month) const; int getDaysPerMonth (int month) const;
@ -133,9 +132,11 @@ namespace MWWorld
Ptr getPtrViaHandle (const std::string& handle); Ptr getPtrViaHandle (const std::string& handle);
///< Return a pointer to a liveCellRef with the given Ogre handle. ///< Return a pointer to a liveCellRef with the given Ogre handle.
/// \todo enable reference in the OGRE scene
void enable (Ptr reference); void enable (Ptr reference);
/// \todo 5disable reference in the OGRE scene
void disable (Ptr reference); void disable (Ptr reference);
void advanceTime (double hours); void advanceTime (double hours);