Changeset 10701

Timestamp:

10/29/09 17:09:07 (4 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson, Fix warning in osgAnimation, UpdateCallback?. Fix bug removing callback in Action. Fix warning Stats

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/Action (modified) (2 diffs)
• include/osgAnimation/TimelineAnimationManager (modified) (2 diffs)
• include/osgAnimation/UpdateCallback (modified) (1 diff)
• src/osgAnimation/ActionVisitor.cpp (modified) (1 diff)
• src/osgAnimation/StatsHandler.cpp (modified) (2 diffs)
• src/osgAnimation/StatsVisitor.cpp (modified) (1 diff)

OpenSceneGraph/trunk/include/osgAnimation/Action

@@ -52 +52 @@
             void addNestedCallback(Callback* callback) 
             { 
-                if (_nestedCallback.valid())
-                    _nestedCallback->addNestedCallback(callback);
-                else
-                    _nestedCallback = callback;
+                if (callback) {
+                    if (_nestedCallback.valid())
+                        _nestedCallback->addNestedCallback(callback);
+                    else
+                        _nestedCallback = callback;
+                }
             }
 
@@ -65 +67 @@
                 if (_nestedCallback.get() == cb)
                     _nestedCallback = _nestedCallback->getNestedCallback();
-                else
+                else if (_nestedCallback.valid())
                     _nestedCallback->removeCallback(cb);
             }

OpenSceneGraph/trunk/include/osgAnimation/TimelineAnimationManager

@@ -1 +1 @@
 /*  -*-c++-*- 
- *  Copyright (C) 2008 Cedric Pinson <mornifle@plopbyte.net>
+ *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
  * This library is open source and may be redistributed and/or modified under  
@@ -11 +11 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
  * OpenSceneGraph Public License for more details.
-*/
+ */
 
 #ifndef OSGANIMATION_TIMELINE_ANIMATION_MANAGER_H

OpenSceneGraph/trunk/include/osgAnimation/UpdateCallback

@@ -38 +38 @@
     {
     public:
+        AnimationUpdateCallback() {}
         AnimationUpdateCallback(const std::string& name) { T::setName(name);}
         AnimationUpdateCallback(const AnimationUpdateCallback& apc,const osg::CopyOp& copyop):
             T(apc, copyop) {}
 
+        META_Object(osgAnimation, AnimationUpdateCallback<T>);
+
         const std::string& getName() const { return T::getName(); }
+        bool link(osgAnimation::Channel* channel) { return 0; }
         int link(osgAnimation::Animation* animation)
         {

OpenSceneGraph/trunk/src/osgAnimation/ActionVisitor.cpp

@@ -141 +141 @@
         unsigned int frame = getLocalFrame();
         apply(static_cast<Action&>(action));
-//        action.updateAnimation(frame, getCurrentLayer());
-        action.updateAnimation(frame, -_currentAnimationPriority++);
+                int pri = static_cast<int>(_currentAnimationPriority);
+                _currentAnimationPriority++;
+        action.updateAnimation(frame, -pri);
     }
 }

OpenSceneGraph/trunk/src/osgAnimation/StatsHandler.cpp

@@ -425 +425 @@
 
              for (std::map<std::string, StatAction >::iterator it = _actions.begin(); it != _actions.end(); it++) {
-                 //if ((*it).second.update())
-                 (*it).second._group->setNodeMask(~1);
+                 (*it).second._group->setNodeMask(~osg::Node::NodeMask(1));
              }
 
@@ -442 +441 @@
                     //_actions[name].touch();
                 }
-                _actions[name]._group->setNodeMask(~0);
+                                _actions[name]._group->setNodeMask(~osg::Node::NodeMask(0x0));
                 size[name] = 0;
                 pos.y() -= characterSize + graphSpacing;

OpenSceneGraph/trunk/src/osgAnimation/StatsVisitor.cpp

@@ -78 +78 @@
     {
         _channels.push_back(action.getName());
-        _stats->setAttribute(_frame,action.getName(), action.getAnimation()->getAnimation()->getWeight());
+        double value;
+        std::string name = action.getName();
+        if (_stats->getAttribute(_frame, name, value))
+            name += "+";
+        _stats->setAttribute(_frame, action.getName(), action.getAnimation()->getAnimation()->getWeight());
     }
 }