mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-01 03:39:42 +00:00
Code Issues Releases Wiki Activity

refactor for NiFltAnimationNode

Browse source
This commit is contained in:
Wolfgang Lieff 2022-04-07 00:49:08 +02:00 committed by Bret Curtis
parent c376f3793e
commit 373776170d
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/nif/node.hpp
View file

@ -433,17 +433,17 @@ struct NiLODNode : public NiSwitchNode
struct NiFltAnimationNode : public NiSwitchNode
{
float mInterval;
float mDuration;
enum Flags
{
Flag_Reverse = 0x40
Flag_Swing = 0x40
};
void read(NIFStream *nif) override
{
NiSwitchNode::read(nif);
mInterval = nif->getFloat();
mDuration = nif->getFloat();
}
};

34
components/nifosg/nifloader.cpp
View file

@ -417,19 +417,33 @@ namespace NifOsg
return switchNode;
}
static osg::ref_ptr<osg::Sequence> handleSequenceNode(const Nif::NiFltAnimationNode* niFltAnimationNode)
static osg::ref_ptr<osg::Sequence> prepareSequenceNode(const Nif::Node* nifNode)
{
const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
osg::ref_ptr<osg::Sequence> sequenceNode (new osg::Sequence);
sequenceNode->setName(niFltAnimationNode->name);
sequenceNode->setDefaultTime(niFltAnimationNode->mInterval);
sequenceNode->setMode(osg::Sequence::START);
if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Reverse)
sequenceNode->setDuration(0.2f, -1);
else
sequenceNode->setDuration(-0.2f, -1);
if (niFltAnimationNode->children.length()!=0)
{
if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Swing)
sequenceNode->setDefaultTime(niFltAnimationNode->mDuration/(niFltAnimationNode->children.length()*2));
else
sequenceNode->setDefaultTime(niFltAnimationNode->mDuration/niFltAnimationNode->children.length());
}
return sequenceNode;
}
static void activateSequenceNode(osg::Group* osgNode, const Nif::Node* nifNode)
{
const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
osg::Sequence* sequenceNode = static_cast<osg::Sequence*>(osgNode);
if (niFltAnimationNode->flags & Nif::NiFltAnimationNode::Flag_Swing)
sequenceNode->setInterval(osg::Sequence::SWING, 0,-1);
else
sequenceNode->setInterval(osg::Sequence::LOOP, 0,-1);
sequenceNode->setDuration(1.0f, -1);
sequenceNode->setMode(osg::Sequence::START);
}
osg::ref_ptr<osg::Image> handleSourceTexture(const Nif::NiSourceTexture* st, Resource::ImageManager* imageManager)
{
if (!st)
@ -727,8 +741,7 @@ namespace NifOsg
}
else if (nifNode->recType == Nif::RC_NiFltAnimationNode)
{
const Nif::NiFltAnimationNode* niFltAnimationNode = static_cast<const Nif::NiFltAnimationNode*>(nifNode);
osg::ref_ptr<osg::Sequence> sequenceNode = handleSequenceNode(niFltAnimationNode);
osg::ref_ptr<osg::Sequence> sequenceNode = prepareSequenceNode(nifNode);
node->addChild(sequenceNode);
currentNode = sequenceNode;
}
@ -752,6 +765,9 @@ namespace NifOsg
}
}
if (nifNode->recType == Nif::RC_NiFltAnimationNode)
activateSequenceNode(currentNode,nifNode);
return node;
}