Changeset 9370 for OpenSceneGraph/trunk/examples/osganimationskinning/osganimationskinning.cpp

Timestamp:

12/16/08 21:29:00 (4 years ago)

Author:

robert

Message:

From Cedric Pinson and Jeremey Moles, Changes to OpenSceneGraph-osgWidget-dev branch.

Notes from Robert Osfield, Merged changes to OpenSceneGraph-osgWidget-dev r9367 (prior to my botched attempt at merged svn/trunk into the branch).

Files:

• OpenSceneGraph/trunk/examples/osganimationskinning/osganimationskinning.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osganimationskinning/osganimationskinning.cpp

@@ -26 +26 @@
 #include <osgAnimation/RigGeometry>
 #include <osgAnimation/Skinning>
+#include <osgAnimation/BasicAnimationManager>
 
 osg::Geode* createAxis()
@@ -179 +180 @@
     skelroot->addChild(root.get());
 
-    osg::ref_ptr<osgAnimation::AnimationManager> manager = new osgAnimation::AnimationManager;
+    osg::Group* scene = new osg::Group;
+    osg::ref_ptr<osgAnimation::BasicAnimationManager> manager = new osgAnimation::BasicAnimationManager;
+    scene->setUpdateCallback(manager.get());
 
     osgAnimation::Animation* anim = new osgAnimation::Animation;
@@ -224 +227 @@
 
     // we will use local data from the skeleton
-    osg::Group* scene = new osg::Group;
     osg::MatrixTransform* rootTransform = new osg::MatrixTransform;
     rootTransform->setMatrix(osg::Matrix::rotate(osg::PI_2,osg::Vec3(1,0,0)));
@@ -235 +237 @@
     trueroot->addChild(createAxis());
     trueroot->setDataVariance(osg::Object::DYNAMIC);
-    rootTransform->addChild(manager.get());
+//    rootTransform->addChild(scene.get());
     scene->addChild(rootTransform);
-    manager->addChild(skelroot.get());
+//    manager->addChild(skelroot.get());
   
     osgAnimation::RigGeometry* geom = createTesselatedBox(4, 4.0);