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/osganimationmakepath/osganimationmakepath.cpp

    r9104 r9370  
    235235{ 
    236236    osg::StateSet* st = new osg::StateSet(); 
    237          
     237     
    238238    st->setAttributeAndModes(new osg::Material(), true); 
    239239    st->setMode(GL_BLEND, true); 
    240          
     240     
    241241    AnimtkStateSetUpdateCallback* callback = new AnimtkStateSetUpdateCallback(); 
    242242    osgAnimation::Vec4KeyframeContainer* keys = callback->_sampler->getOrCreateKeyframeContainer(); 
     
    249249    callback->start(); 
    250250    st->setUpdateCallback(callback); 
    251          
     251     
    252252    return st; 
    253253} 
     
    301301 
    302302    osg::Geode* geode = new osg::Geode(); 
    303          
     303     
    304304    geode->setStateSet(setupStateSet()); 
    305305    geode->addDrawable(new osg::ShapeDrawable(new osg::Sphere(osg::Vec3(0.0f, 0.0f, 0.0f), 2))); 
    306          
     306     
    307307    node->addChild(geode); 
    308308 
     
    313313{ 
    314314    osgViewer::Viewer viewer; 
    315          
     315     
    316316    osgGA::TrackballManipulator* tbm = new osgGA::TrackballManipulator(); 
    317317