Show
Ignore:
Timestamp:
12/16/08 21:29:00 (6 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/osganimationsolid/osganimationsolid.cpp

    r9104 r9370  
    2121#include <osg/MatrixTransform> 
    2222 
    23 #include <osgAnimation/AnimationManager> 
     23#include <osgAnimation/BasicAnimationManager> 
    2424#include <osgAnimation/Channel> 
    2525#include <osgAnimation/UpdateCallback> 
     
    8181 
    8282    // Define a scheduler for our animations 
    83     osgAnimation::AnimationManager* mng = new osgAnimation::AnimationManager(); 
     83    osg::Group* grp = new osg::Group; 
     84    osgAnimation::BasicAnimationManager* mng = new osgAnimation::BasicAnimationManager(); 
     85    grp->setUpdateCallback(mng); 
    8486 
    85  
    86     mng->addChild(root); 
     87    grp->addChild(root); 
    8788 
    8889    // And we finaly define our channel 
     
    114115    mng->playAnimation(anim2); 
    115116 
    116     viewer.setSceneData( mng ); 
     117    viewer.setSceneData( grp ); 
    117118    return viewer.run(); 
    118119}