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

Remove SceneManager::notifyAttached

Browse source
This commit is contained in:
scrawl 2017-02-24 00:43:36 +01:00
parent afa39d121f
commit 75677f03e7
5 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwrender/creatureanimation.cpp
View file

@ -122,7 +122,6 @@ void CreatureWeaponAnimation::updatePart(PartHolderPtr& scene, int slot)
if (found == nodeMap.end())
throw std::runtime_error("Can't find attachment node " + bonename);
osg::ref_ptr<osg::Node> attached = SceneUtil::attach(node, mObjectRoot, bonename, found->second.get());
mResourceSystem->getSceneManager()->notifyAttached(attached);
scene.reset(new PartHolder(attached));

1
apps/openmw/mwrender/effectmanager.cpp
View file

@ -52,7 +52,6 @@ void EffectManager::addEffect(const std::string &model, const std::string& textu
overrideTexture(textureOverride, mResourceSystem, node);
mParentNode->addChild(trans);
mResourceSystem->getSceneManager()->notifyAttached(node);
mEffects[trans] = effect;
}

1
apps/openmw/mwrender/npcanimation.cpp
View file

@ -663,7 +663,6 @@ PartHolderPtr NpcAnimation::insertBoundedPart(const std::string& model, const st
throw std::runtime_error("Can't find attachment node " + bonename);
osg::ref_ptr<osg::Node> attached = SceneUtil::attach(instance, mObjectRoot, bonefilter, found->second);
mResourceSystem->getSceneManager()->notifyAttached(attached);
if (enchantedGlow)
addGlow(attached, *glowColor);

18
components/resource/scenemanager.cpp
View file

@ -540,6 +540,13 @@ namespace Resource
// add a ref to the original template, to hint to the cache that it's still being used and should be kept in cache
cloned->getOrCreateUserDataContainer()->addUserObject(new TemplateRef(scene));
// we can skip any scene graphs without update callbacks since we know that particle emitters will have an update callback set
if (cloned->getNumChildrenRequiringUpdateTraversal() > 0)
{
InitParticlesVisitor visitor (mParticleSystemMask);
cloned->accept(visitor);
}
return cloned;
}
@ -566,7 +573,6 @@ namespace Resource
void SceneManager::attachTo(osg::Node *instance, osg::Group *parentNode) const
{
parentNode->addChild(instance);
notifyAttached(instance);
}
void SceneManager::releaseGLObjects(osg::State *state)
@ -580,16 +586,6 @@ namespace Resource
mIncrementalCompileOperation = ico;
}
void SceneManager::notifyAttached(osg::Node *node) const
{
// we can skip any scene graphs without update callbacks since we know that particle emitters will have an update callback set
if (node->getNumChildrenRequiringUpdateTraversal() > 0)
{
InitParticlesVisitor visitor (mParticleSystemMask);
node->accept(visitor);
}
}
Resource::ImageManager* SceneManager::getImageManager()
{
return mImageManager;

3
components/resource/scenemanager.hpp
View file

@ -117,9 +117,6 @@ namespace Resource
/// Set up an IncrementalCompileOperation for background compiling of loaded scenes.
void setIncrementalCompileOperation(osgUtil::IncrementalCompileOperation* ico);
/// @note SceneManager::attachTo calls this method automatically, only needs to be called by users if manually attaching
void notifyAttached(osg::Node* node) const;
Resource::ImageManager* getImageManager();
/// @param mask The node mask to apply to loaded particle system nodes.