Changeset 10394

Timestamp:

06/24/09 12:10:09 (4 years ago)

Author:

cedricpinson

Message:

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

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/ActionCallback (modified) (2 diffs)
• src/osgAnimation/ActionCallback.cpp (modified) (1 diff)
• src/osgAnimation/StatsVisitor.cpp (modified) (5 diffs)
• src/osgAnimation/Timeline.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgAnimation/ActionCallback

@@ -16 +16 @@
 #define OSGANIMATION_ACTION_CALLBACK_H
 
+#include <osgAnimation/Export>
 #include <osgAnimation/Action>
 
@@ -22 +23 @@
 
     /** 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;
         
     };

OpenSceneGraph/trunk/src/osgAnimation/ActionCallback.cpp

@@ -19 +19 @@
 {
     Timeline* tm = visitor->getCurrentTimeline();
-    tm->addActionNow(_action.get());
+    tm->addActionNow(_action.get(), _priority);
 }
 

OpenSceneGraph/trunk/src/osgAnimation/StatsVisitor.cpp

@@ -33 +33 @@
 void osgAnimation::StatsActionVisitor::apply(Action& action)
 {
-    _channels.push_back(action.getName());
-    _stats->setAttribute(_frame,action.getName(),0);
     if (isActive())
     {
@@ -44 +42 @@
 void osgAnimation::StatsActionVisitor::apply(BlendIn& action)
 {
-    _channels.push_back(action.getName());
-    _stats->setAttribute(_frame,action.getName(),0);
     if (isActive()) 
     {
@@ -55 +51 @@
 void osgAnimation::StatsActionVisitor::apply(BlendOut& action)
 {
-    _channels.push_back(action.getName());
-    _stats->setAttribute(_frame,action.getName(),0);
     if (isActive()) 
     {
@@ -66 +60 @@
 void osgAnimation::StatsActionVisitor::apply(ActionAnimation& action)
 {
-    _channels.push_back(action.getName());
-    _stats->setAttribute(_frame,action.getName(),0);
     if (isActive()) 
     {
@@ -77 +69 @@
 void osgAnimation::StatsActionVisitor::apply(StripAnimation& action)
 {
-    _channels.push_back(action.getName());
-    _stats->setAttribute(_frame,action.getName(),0);
     if (isActive())
     {

OpenSceneGraph/trunk/src/osgAnimation/Timeline.cpp

@@ -162 +162 @@
 void osgAnimation::Timeline::addActionNow(Action* action, int priority)
 {
-    addActionAt(getCurrentFrame(), action, priority);
+    addActionAt(getCurrentFrame()+1, action, priority);
 }