Changeset 10904

Timestamp:

12/22/09 15:09:46 (3 years ago)

Author:

cedricpinson

Message:

From Cedric Pinson, remove unused file Skinning, cleanup file Timeline.cpp

Location:

OpenSceneGraph/trunk

Files:

• include/osgAnimation/Skinning (deleted)
• src/osgAnimation/Timeline.cpp (modified) (12 diffs)

OpenSceneGraph/trunk/src/osgAnimation/Timeline.cpp

@@ -20 +20 @@
 
 
-osgAnimation::Timeline::Timeline()
+Timeline::Timeline()
 {
     _lastUpdate = 0;
@@ -36 +36 @@
 }
 
-osgAnimation::Timeline::Timeline(const Timeline& nc,const osg::CopyOp& op)
+Timeline::Timeline(const Timeline& nc,const osg::CopyOp& op)
     : Action(nc, op),
       _actions(nc._actions)
@@ -59 +59 @@
 }
 
-void osgAnimation::Timeline::traverse(ActionVisitor& visitor)
+void Timeline::traverse(ActionVisitor& visitor)
 {
     int layer = visitor.getCurrentLayer();
@@ -80 +80 @@
 
 
-void osgAnimation::Timeline::setStats(osg::Stats* stats) { _stats = stats;}
-osg::Stats* osgAnimation::Timeline::getStats() { return _stats.get();}
-void osgAnimation::Timeline::collectStats(bool state) { _collectStats = state;}
-osgAnimation::StatsActionVisitor* osgAnimation::Timeline::getStatsVisitor() { return _statsVisitor.get(); }
-
-void osgAnimation::Timeline::clearActions()
+void Timeline::setStats(osg::Stats* stats) { _stats = stats;}
+osg::Stats* Timeline::getStats() { return _stats.get();}
+void Timeline::collectStats(bool state) { _collectStats = state;}
+StatsActionVisitor* Timeline::getStatsVisitor() { return _statsVisitor.get(); }
+
+void Timeline::clearActions()
 {
     _actions.clear();
@@ -92 +92 @@
 }
 
-void osgAnimation::Timeline::update(double simulationTime)
+void Timeline::update(double simulationTime)
 {
     // first time we call update we generate one frame
@@ -109 +109 @@
         {
             if (!_statsVisitor)
-                _statsVisitor = new osgAnimation::StatsActionVisitor();
+                _statsVisitor = new StatsActionVisitor();
             _statsVisitor->setStats(_stats.get());
             _statsVisitor->setFrame(_currentFrame);
@@ -150 +150 @@
 }
 
-void osgAnimation::Timeline::removeAction(Action* action)
+void Timeline::removeAction(Action* action)
 {
     if (getEvaluating())
@@ -158 +158 @@
 }
 
-void osgAnimation::Timeline::addActionAt(unsigned int frame, Action* action, int priority)
+void Timeline::addActionAt(unsigned int frame, Action* action, int priority)
 {
     // skip if this action has already been added this frame
@@ -181 +181 @@
         internalAddAction(priority, FrameAction(frame, action));
 }
-void osgAnimation::Timeline::addActionAt(double t, Action* action, int priority)
+void Timeline::addActionAt(double t, Action* action, int priority)
 {
     unsigned int frame = static_cast<unsigned int>(floor(t * _fps));
@@ -187 +187 @@
 }
 
-void osgAnimation::Timeline::addActionNow(Action* action, int priority)
+void Timeline::addActionNow(Action* action, int priority)
 {
     addActionAt(getCurrentFrame()+1, action, priority);
 }
 
-void osgAnimation::Timeline::processPendingOperation()
+void Timeline::processPendingOperation()
 {
     // process all pending add action operation
@@ -209 +209 @@
 }
 
-void osgAnimation::Timeline::internalRemoveAction(Action* action)
+void Timeline::internalRemoveAction(Action* action)
 {
     for (ActionLayers::iterator it = _actions.begin(); it != _actions.end(); it++)
@@ -223 +223 @@
 }
 
-void osgAnimation::Timeline::internalAddAction(int priority, const FrameAction& ftl)
+void Timeline::internalAddAction(int priority, const FrameAction& ftl)
 {
     _actions[priority].insert(_actions[priority].begin(), ftl);
 }
 
-bool osgAnimation::Timeline::isActive(Action* activeAction)
+bool Timeline::isActive(Action* activeAction)
 {
     // update from high priority to low priority