Show
Ignore:
Timestamp:
12/16/08 21:29:00 (5 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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osganimationskinning/osganimationskinning.cpp

    r9104 r9370  
    2626#include <osgAnimation/RigGeometry> 
    2727#include <osgAnimation/Skinning> 
     28#include <osgAnimation/BasicAnimationManager> 
    2829 
    2930osg::Geode* createAxis() 
     
    179180    skelroot->addChild(root.get()); 
    180181 
    181     osg::ref_ptr<osgAnimation::AnimationManager> manager = new osgAnimation::AnimationManager; 
     182    osg::Group* scene = new osg::Group; 
     183    osg::ref_ptr<osgAnimation::BasicAnimationManager> manager = new osgAnimation::BasicAnimationManager; 
     184    scene->setUpdateCallback(manager.get()); 
    182185 
    183186    osgAnimation::Animation* anim = new osgAnimation::Animation; 
     
    224227 
    225228    // we will use local data from the skeleton 
    226     osg::Group* scene = new osg::Group; 
    227229    osg::MatrixTransform* rootTransform = new osg::MatrixTransform; 
    228230    rootTransform->setMatrix(osg::Matrix::rotate(osg::PI_2,osg::Vec3(1,0,0))); 
     
    235237    trueroot->addChild(createAxis()); 
    236238    trueroot->setDataVariance(osg::Object::DYNAMIC); 
    237     rootTransform->addChild(manager.get()); 
     239//    rootTransform->addChild(scene.get()); 
    238240    scene->addChild(rootTransform); 
    239     manager->addChild(skelroot.get()); 
     241//    manager->addChild(skelroot.get()); 
    240242   
    241243    osgAnimation::RigGeometry* geom = createTesselatedBox(4, 4.0);