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

From Cedric Pinson, Fix the drop of the first frame of action when adding action with addActionNow\nReport stats only for active animations\nAdd priority to RunAction callback

Browse Source
This commit is contained in:
Cedric Pinson
2009-06-24 10:10:09 +00:00
parent 8955321dcc
commit 51579cf436
4 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgAnimation/ActionCallback
View File

@@ -15,20 +15,22 @@
#ifndef OSGANIMATION_ACTION_CALLBACK_H
#define OSGANIMATION_ACTION_CALLBACK_H
#include <osgAnimation/Export>
#include <osgAnimation/Action>
namespace osgAnimation
{
/** Callback used to run new action on the timeline.*/
class RunAction : public Action::Callback
class OSGANIMATION_EXPORT RunAction : public Action::Callback
{
public:
RunAction(Action* a) : _action(a) {}
RunAction(Action* a, int priority = 0) : _action(a), _priority(priority) {}
virtual void operator()(Action* action, ActionVisitor* visitor);
protected:
osg::ref_ptr<Action> _action;
int _priority;
};

2
src/osgAnimation/ActionCallback.cpp
View File

@@ -18,6 +18,6 @@
void osgAnimation::RunAction::operator()(Action* action, ActionVisitor* visitor)
{
Timeline* tm = visitor->getCurrentTimeline();
tm->addActionNow(_action.get());
tm->addActionNow(_action.get(), _priority);
}

10
src/osgAnimation/StatsVisitor.cpp
View File

@@ -32,8 +32,6 @@ void osgAnimation::StatsActionVisitor::apply(Timeline& tm)
void osgAnimation::StatsActionVisitor::apply(Action& action)
{
_channels.push_back(action.getName());
_stats->setAttribute(_frame,action.getName(),0);
if (isActive())
{
_channels.push_back(action.getName());
@@ -43,8 +41,6 @@ void osgAnimation::StatsActionVisitor::apply(Action& action)
void osgAnimation::StatsActionVisitor::apply(BlendIn& action)
{
_channels.push_back(action.getName());
_stats->setAttribute(_frame,action.getName(),0);
if (isActive())
{
_channels.push_back(action.getName());
@@ -54,8 +50,6 @@ void osgAnimation::StatsActionVisitor::apply(BlendIn& action)
void osgAnimation::StatsActionVisitor::apply(BlendOut& action)
{
_channels.push_back(action.getName());
_stats->setAttribute(_frame,action.getName(),0);
if (isActive())
{
_channels.push_back(action.getName());
@@ -65,8 +59,6 @@ void osgAnimation::StatsActionVisitor::apply(BlendOut& action)
void osgAnimation::StatsActionVisitor::apply(ActionAnimation& action)
{
_channels.push_back(action.getName());
_stats->setAttribute(_frame,action.getName(),0);
if (isActive())
{
_channels.push_back(action.getName());
@@ -76,8 +68,6 @@ void osgAnimation::StatsActionVisitor::apply(ActionAnimation& action)
void osgAnimation::StatsActionVisitor::apply(StripAnimation& action)
{
_channels.push_back(action.getName());
_stats->setAttribute(_frame,action.getName(),0);
if (isActive())
{
_channels.push_back(action.getName());

2
src/osgAnimation/Timeline.cpp
View File

@@ -161,7 +161,7 @@ void osgAnimation::Timeline::addActionAt(double t, Action* action, int priority)
void osgAnimation::Timeline::addActionNow(Action* action, int priority)
{
addActionAt(getCurrentFrame(), action, priority);
addActionAt(getCurrentFrame()+1, action, priority);
}
void osgAnimation::Timeline::processPendingOperation()