Changeset 10697 for OpenSceneGraph/trunk/examples/osganimationtimeline/osganimationtimeline.cpp

Timestamp:

10/28/09 14:31:24 (4 years ago)

Author:

robert

Message:

From Cedric Pinson, updates to osganimation example to keep in sync with changes with osgAnimation, and introduction of a hardware skinning example

Files:

• OpenSceneGraph/trunk/examples/osganimationtimeline/osganimationtimeline.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osganimationtimeline/osganimationtimeline.cpp

@@ -27 +27 @@
 #include <osgAnimation/Skeleton>
 #include <osgAnimation/RigGeometry>
-#include <osgAnimation/Skinning>
 #include <osgAnimation/Timeline>
 #include <osgAnimation/AnimationManagerBase>
 #include <osgAnimation/TimelineAnimationManager>
 
+#include <osgAnimation/ActionStripAnimation>
+#include <osgAnimation/ActionBlendIn>
+#include <osgAnimation/ActionBlendOut>
+#include <osgAnimation/ActionAnimation>
+
 
 struct NoseBegin : public osgAnimation::Action::Callback
@@ -53 +57 @@
 struct ExampleTimelineUsage : public osgGA::GUIEventHandler
 {
-    osg::ref_ptr<osgAnimation::StripAnimation> _mainLoop;
-    osg::ref_ptr<osgAnimation::StripAnimation> _scratchHead;
-    osg::ref_ptr<osgAnimation::StripAnimation> _scratchNose;
+    osg::ref_ptr<osgAnimation::ActionStripAnimation> _mainLoop;
+    osg::ref_ptr<osgAnimation::ActionStripAnimation> _scratchHead;
+    osg::ref_ptr<osgAnimation::ActionStripAnimation> _scratchNose;
     osg::ref_ptr<osgAnimation::TimelineAnimationManager> _manager;
 
@@ -70 +74 @@
             map[(*it)->getName()] = *it;
 
-        _mainLoop = new osgAnimation::StripAnimation(map["Idle_Main"].get(),0.0,0.0);
+        _mainLoop = new osgAnimation::ActionStripAnimation(map["Idle_Main"].get(),0.0,0.0);
         _mainLoop->setLoop(0); // means forever
 
-        _scratchHead = new osgAnimation::StripAnimation(map["Idle_Head_Scratch.02"].get(),0.2,0.3);
+        _scratchHead = new osgAnimation::ActionStripAnimation(map["Idle_Head_Scratch.02"].get(),0.2,0.3);
         _scratchHead->setLoop(1); // one time
 
         map["Idle_Nose_Scratch.01"]->setDuration(10.0); // set this animation duration to 10 seconds
-        _scratchNose = new osgAnimation::StripAnimation(map["Idle_Nose_Scratch.01"].get(),0.2,0.3);
+        _scratchNose = new osgAnimation::ActionStripAnimation(map["Idle_Nose_Scratch.01"].get(),0.2,0.3);
         _scratchNose->setLoop(1); // one time