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

Cell changing fixes

Browse source
This commit is contained in:
Jason Hooks 2011-12-24 21:53:12 -05:00
parent 7cf3fc8991
commit 1b835d6702
5 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/creature.cpp
View file

@ -47,7 +47,7 @@ namespace MWClass
const std::string &model = ref->base->model; const std::string &model = ref->base->model;
assert (ref->base != NULL); assert (ref->base != NULL);
if(!model.empty()){ if(!model.empty()){
// physics.insertActorPhysics(ptr, "meshes\\" + model); physics.insertActorPhysics(ptr, "meshes\\" + model);
} }
} }

4
apps/openmw/mwclass/npc.cpp
View file

@ -38,7 +38,7 @@ namespace MWClass
void Npc::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics, MWWorld::Environment& environment) const void Npc::insertObject(const MWWorld::Ptr& ptr, MWWorld::PhysicsSystem& physics, MWWorld::Environment& environment) const
{ {
/*
ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref = ESMS::LiveCellRef<ESM::NPC, MWWorld::RefData> *ref =
ptr.get<ESM::NPC>(); ptr.get<ESM::NPC>();
@ -47,7 +47,7 @@ namespace MWClass
assert (ref->base != NULL); assert (ref->base != NULL);
if(!model.empty()){ if(!model.empty()){
physics.insertActorPhysics(ptr, "meshes\\" + model); physics.insertActorPhysics(ptr, "meshes\\" + model);
}*/ }
} }

22
apps/openmw/mwrender/actors.cpp
View file

@ -12,9 +12,13 @@ void Actors::setMwRoot(Ogre::SceneNode* root){
mMwRoot = root; mMwRoot = root;
} }
void Actors::insertNPC(const MWWorld::Ptr& ptr){ void Actors::insertNPC(const MWWorld::Ptr& ptr){
insertBegin(ptr, true, true); insertBegin(ptr, true, true);
NpcAnimation* anim = new MWRender::NpcAnimation(ptr, mEnvironment, mRend); NpcAnimation* anim = new MWRender::NpcAnimation(ptr, mEnvironment, mRend);
mAllActors.push_back(anim);
//
mAllActors[ptr] = anim;
} }
@ -57,17 +61,20 @@ void Actors::insertBegin (const MWWorld::Ptr& ptr, bool enabled, bool static_){
} }
void Actors::insertCreature (const MWWorld::Ptr& ptr){ void Actors::insertCreature (const MWWorld::Ptr& ptr){
insertBegin(ptr, true, true); insertBegin(ptr, true, true);
CreatureAnimation* anim = new MWRender::CreatureAnimation(ptr, mEnvironment, mRend); CreatureAnimation* anim = new MWRender::CreatureAnimation(ptr, mEnvironment, mRend);
//mAllActors.insert(std::pair<MWWorld::Ptr, Animation*>(ptr,anim)); //mAllActors.insert(std::pair<MWWorld::Ptr, Animation*>(ptr,anim));
mAllActors.push_back(anim); mAllActors[ptr] = anim;
//mAllActors.push_back(&anim); //mAllActors.push_back(&anim);*/
} }
bool Actors::deleteObject (const MWWorld::Ptr& ptr) bool Actors::deleteObject (const MWWorld::Ptr& ptr)
{ {
mAllActors.erase(ptr);
if (Ogre::SceneNode *base = ptr.getRefData().getBaseNode()) if (Ogre::SceneNode *base = ptr.getRefData().getBaseNode())
{ {
Ogre::SceneNode *parent = base->getParentSceneNode(); Ogre::SceneNode *parent = base->getParentSceneNode();
for (std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *>::const_iterator iter ( for (std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *>::const_iterator iter (
@ -91,6 +98,15 @@ void Actors::removeCell(MWWorld::Ptr::CellStore* store){
{ {
Ogre::SceneNode* base = mCellSceneNodes[store]; Ogre::SceneNode* base = mCellSceneNodes[store];
base->removeAndDestroyAllChildren(); base->removeAndDestroyAllChildren();
mCellSceneNodes.erase(store); mCellSceneNodes.erase(store);
mRend.getScene()->destroySceneNode(base); mRend.getScene()->destroySceneNode(base);
base = 0; base = 0;

2
apps/openmw/mwrender/actors.hpp
View file

@ -23,7 +23,7 @@ namespace MWRender{
std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *> mCellSceneNodes; std::map<MWWorld::Ptr::CellStore *, Ogre::SceneNode *> mCellSceneNodes;
Ogre::SceneNode* mMwRoot; Ogre::SceneNode* mMwRoot;
MWWorld::Environment& mEnvironment; MWWorld::Environment& mEnvironment;
std::list<Animation*> mAllActors; std::map<MWWorld::Ptr, Animation*> mAllActors;

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

@ -59,7 +59,9 @@ namespace MWWorld
ListHandles functor; ListHandles functor;
MWWorld::Ptr::CellStore* active = *iter; MWWorld::Ptr::CellStore* active = *iter;
mRendering.removeCell(active);
active->forEach<ListHandles>(functor); active->forEach<ListHandles>(functor);
@ -73,11 +75,13 @@ namespace MWWorld
mPhysics->removeObject (node->getName()); mPhysics->removeObject (node->getName());
} }
} }
mRendering.removeCell(active);
//mPhysics->removeObject("Unnamed_43"); //mPhysics->removeObject("Unnamed_43");
mWorld->getLocalScripts().clearCell (active); mWorld->getLocalScripts().clearCell (active);
mEnvironment.mMechanicsManager->dropActors (active); mEnvironment.mMechanicsManager->dropActors (active);
mEnvironment.mSoundManager->stopSound (active); mEnvironment.mSoundManager->stopSound (active);
mActiveCells.erase (iter); mActiveCells.erase(active);
} }
void Scene::loadCell (Ptr::CellStore *cell) void Scene::loadCell (Ptr::CellStore *cell)