mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-29 17:15:34 +00:00
Code Issues Releases Wiki Activity

Dead animation code removal

Browse source
This commit is contained in:
JanuarySnow 2021-09-08 10:07:54 +00:00 committed by psi29a
parent 41f9671841
commit bdbc6c0cba
3 changed files with 4 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AUTHORS.md
View file

@ -99,6 +99,7 @@ Programmers
James Stephens (james-h-stephens)
Jan-Peter Nilsson (peppe)
Jan Borsodi (am0s)
JanuarySnow
Jason Hooks (jhooks)
jeaye
jefetienne

1
CHANGELOG.md
View file

@ -48,6 +48,7 @@
Feature #6162: Refactor GUI to use shaders and to be GLES and GL3+ friendly
Feature #6199: Support FBO Rendering
Feature #6251: OpenMW-CS: Set instance movement based on camera zoom
Task #6264: Remove the old classes in animation.cpp
0.47.0
------

114
apps/openmw/mwrender/animation.cpp
View file

@ -196,32 +196,6 @@ namespace
return 0.0f;
}
/// @brief Base class for visitors that remove nodes from a scene graph.
/// Subclasses need to fill the mToRemove vector.
/// To use, node->accept(removeVisitor); removeVisitor.remove();
class RemoveVisitor : public osg::NodeVisitor
{
public:
RemoveVisitor()
: osg::NodeVisitor(TRAVERSE_ALL_CHILDREN)
{
}
void remove()
{
for (RemoveVec::iterator it = mToRemove.begin(); it != mToRemove.end(); ++it)
{
if (!it->second->removeChild(it->first))
Log(Debug::Error) << "Error removing " << it->first->getName();
}
}
protected:
// <node to remove, parent node to remove it from>
typedef std::vector<std::pair<osg::Node*, osg::Group*> > RemoveVec;
std::vector<std::pair<osg::Node*, osg::Group*> > mToRemove;
};
class GetExtendedBonesVisitor : public osg::NodeVisitor
{
public:
@ -244,7 +218,7 @@ namespace
std::vector<std::pair<osg::Node*, osg::Group*> > mFoundBones;
};
class RemoveFinishedCallbackVisitor : public RemoveVisitor
class RemoveFinishedCallbackVisitor : public SceneUtil::RemoveVisitor
{
public:
bool mHasMagicEffects;
@ -289,7 +263,7 @@ namespace
}
};
class RemoveCallbackVisitor : public RemoveVisitor
class RemoveCallbackVisitor : public SceneUtil::RemoveVisitor
{
public:
bool mHasMagicEffects;
@ -397,90 +371,6 @@ namespace
private:
int mEffectId;
};
// Removes all drawables from a graph.
class CleanObjectRootVisitor : public RemoveVisitor
{
public:
void apply(osg::Drawable& drw) override
{
applyDrawable(drw);
}
void apply(osg::Group& node) override
{
applyNode(node);
}
void apply(osg::MatrixTransform& node) override
{
applyNode(node);
}
void apply(osg::Node& node) override
{
applyNode(node);
}
void applyNode(osg::Node& node)
{
if (node.getStateSet())
node.setStateSet(nullptr);
if (node.getNodeMask() == 0x1 && node.getNumParents() == 1)
mToRemove.emplace_back(&node, node.getParent(0));
else
traverse(node);
}
void applyDrawable(osg::Node& node)
{
osg::NodePath::iterator parent = getNodePath().end()-2;
// We know that the parent is a Group because only Groups can have children.
osg::Group* parentGroup = static_cast<osg::Group*>(*parent);
// Try to prune nodes that would be empty after the removal
if (parent != getNodePath().begin())
{
// This could be extended to remove the parent's parent, and so on if they are empty as well.
// But for NIF files, there won't be a benefit since only TriShapes can be set to STATIC dataVariance.
osg::Group* parentParent = static_cast<osg::Group*>(*(parent - 1));
if (parentGroup->getNumChildren() == 1 && parentGroup->getDataVariance() == osg::Object::STATIC)
{
mToRemove.emplace_back(parentGroup, parentParent);
return;
}
}
mToRemove.emplace_back(&node, parentGroup);
}
};
class RemoveTriBipVisitor : public RemoveVisitor
{
public:
void apply(osg::Drawable& drw) override
{
applyImpl(drw);
}
void apply(osg::Group& node) override
{
traverse(node);
}
void apply(osg::MatrixTransform& node) override
{
traverse(node);
}
void applyImpl(osg::Node& node)
{
const std::string toFind = "tri bip";
if (Misc::StringUtils::ciCompareLen(node.getName(), toFind, toFind.size()) == 0)
{
osg::Group* parent = static_cast<osg::Group*>(*(getNodePath().end()-2));
// Not safe to remove in apply(), since the visitor is still iterating the child list
mToRemove.emplace_back(&node, parent);
}
}
};
}
namespace MWRender