FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fixes for when the implict ref_ptr<> cast is not enabled

Browse Source
This commit is contained in:
Robert Osfield 2008-12-16 20:49:12 +00:00
parent 60fc821764
commit ffe77a785a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/osganimationtimeline/osganimationtimeline.cpp
View File

@ -177,7 +177,8 @@ int main (int argc, char* argv[])
} }
osg::ref_ptr<osgAnimation::TimelineAnimationManager> tl = new osgAnimation::TimelineAnimationManager(*animationManager); osg::ref_ptr<osgAnimation::TimelineAnimationManager> tl = new osgAnimation::TimelineAnimationManager(*animationManager);
root->setUpdateCallback(tl); root->setUpdateCallback(tl.get());
ExampleTimelineUsage* callback = new ExampleTimelineUsage(tl.get()); ExampleTimelineUsage* callback = new ExampleTimelineUsage(tl.get());
root->setEventCallback(callback); root->setEventCallback(callback);
root->getUpdateCallback()->addNestedCallback(callback); root->getUpdateCallback()->addNestedCallback(callback);

4
src/osgPlugins/bvh/ReaderWriterBVH.cpp
View File

@ -79,7 +79,7 @@ public:
osg::ref_ptr<osgAnimation::Bone> bone = new osgAnimation::Bone( parent->getName()+"End" ); osg::ref_ptr<osgAnimation::Bone> bone = new osgAnimation::Bone( parent->getName()+"End" );
bone->setBindMatrixInBoneSpace( osg::Matrix::translate(offsetEndSite) ); bone->setBindMatrixInBoneSpace( osg::Matrix::translate(offsetEndSite) );
bone->setDataVariance( osg::Object::DYNAMIC ); bone->setDataVariance( osg::Object::DYNAMIC );
parent->addChild( bone ); parent->addChild( bone.get() );
if ( _drawingFlag ) if ( _drawingFlag )
parent->addChild( createRefGeometry(offsetEndSite, 0.5).get() ); parent->addChild( createRefGeometry(offsetEndSite, 0.5).get() );
@ -96,7 +96,7 @@ public:
osg::ref_ptr<osgAnimation::Bone> bone = new osgAnimation::Bone( fr[1].getStr() ); osg::ref_ptr<osgAnimation::Bone> bone = new osgAnimation::Bone( fr[1].getStr() );
bone->setDefaultUpdateCallback(); bone->setDefaultUpdateCallback();
bone->setDataVariance( osg::Object::DYNAMIC ); bone->setDataVariance( osg::Object::DYNAMIC );
parent->addChild( bone ); parent->addChild( bone.get() );
_joints.push_back( JointNode(bone, 0) ); _joints.push_back( JointNode(bone, 0) );
int entry = fr[1].getNoNestedBrackets(); int entry = fr[1].getNoNestedBrackets();