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

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

Browse Source 
Notes from Robert Osfield, Merged changes to OpenSceneGraph-osgWidget-dev r9367 (prior to my botched attempt at merged svn/trunk into the branch).
This commit is contained in:
Robert Osfield
2008-12-16 20:29:00 +00:00
parent 3313327ab4
commit 60fc821764
36 changed files with 1218 additions and 836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/osganimationviewer/AnimtkViewer
View File

@@ -22,7 +22,7 @@
#include <osg/Node>
#include <osgDB/ReadFile>
#include <osgAnimation/AnimationManager>
#include <osgAnimation/BasicAnimationManager>
class AnimtkViewerModelController
{
@@ -35,11 +35,12 @@ public:
return avmc;
}
static bool setModel(osgAnimation::AnimationManager* model)
static bool setModel(osgAnimation::BasicAnimationManager* model)
{
AnimtkViewerModelController& self = instance();
self._model = model;
self._map = self._model->getAnimationMap();
for (osgAnimation::AnimationList::const_iterator it = self._model->getAnimationList().begin(); it != self._model->getAnimationList().end(); it++)
self._map[(*it)->getName()] = *it;
for(osgAnimation::AnimationMap::iterator it = self._map.begin(); it != self._map.end(); it++)
self._amv.push_back(it->first);
@@ -76,7 +77,7 @@ public:
return true;
}
return false;
}
}
bool next()
{
@@ -110,7 +111,7 @@ public:
}
private:
osg::ref_ptr<osgAnimation::AnimationManager> _model;
osg::ref_ptr<osgAnimation::BasicAnimationManager> _model;
osgAnimation::AnimationMap _map;
AnimationMapVector _amv;
unsigned int _focus;