FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Brede Johansen, "I think some nitpicking is required. The loop duration was added in

Browse Source 
OpenFlight version 15.8.  With the attached changes the flasher unit
on the spinnercar and the character_anim model from the Creator
gallery behaves."
This commit is contained in:
Robert Osfield 2006-10-03 09:39:03 +00:00
parent 842b96bbc9
commit e686a9a4a5
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/osgPlugins/OpenFlight/PrimaryRecords.cpp
View File

@ -158,23 +158,6 @@ public:
protected:
virtual ~Group()
{
if (!_group.valid())
return;
if ( (_group->getNumChildren() > 0) &&
(_forwardAnim || _backwardAnim) )
{
// Now that we know the number of children, set the loop duration
// to the best of our ability (currently, osg::Sequence doesn't
// support the OpenFlight last frame duration concept).
osg::Sequence* sequence = dynamic_cast<osg::Sequence*>( _group.get() );
assert( sequence != NULL );
sequence->setDuration( _loopDuration / (float)(_group->getNumChildren()) );
}
}
void readRecord(RecordInputStream& in, Document& document)
{
std::string id = in.readString(8);
@ -188,6 +171,7 @@ protected:
/*uint16 significance =*/ in.readUInt16();
/*int8 layer =*/ in.readInt8();
in.forward(5);
// version >= VERSION_15_8
/*uint32 loopCount =*/ in.readUInt32();
_loopDuration = in.readFloat32();
/*float32 lastFrameDuration =*/ in.readFloat32();
@ -237,6 +221,21 @@ protected:
_parent->addChild(*_group);
}
virtual void popLevel(Document& document)
{
// Set loop duration?
if (document.version() >= VERSION_15_8)
{
// Now that we know the number of children, set the loop duration
// to the best of our ability (currently, osg::Sequence doesn't
// support the OpenFlight last frame duration concept).
osg::Sequence* sequence = dynamic_cast<osg::Sequence*>(_group.get());
if (sequence && sequence->getNumChildren()>0)
{
sequence->setDuration( _loopDuration / (float)(_group->getNumChildren()) );
}
}
}
};
RegisterRecordProxy<Group> g_Group(GROUP_OP);