Changeset 10904

Show
Ignore:
Timestamp:
12/22/09 15:09:46 (4 years ago)
Author:
cedricpinson
Message:

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

Location:
OpenSceneGraph/trunk
Files:
1 removed
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgAnimation/Timeline.cpp

    r10878 r10904  
    2020 
    2121 
    22 osgAnimation::Timeline::Timeline() 
     22Timeline::Timeline() 
    2323{ 
    2424    _lastUpdate = 0; 
     
    3636} 
    3737 
    38 osgAnimation::Timeline::Timeline(const Timeline& nc,const osg::CopyOp& op) 
     38Timeline::Timeline(const Timeline& nc,const osg::CopyOp& op) 
    3939    : Action(nc, op), 
    4040      _actions(nc._actions) 
     
    5959} 
    6060 
    61 void osgAnimation::Timeline::traverse(ActionVisitor& visitor) 
     61void Timeline::traverse(ActionVisitor& visitor) 
    6262{ 
    6363    int layer = visitor.getCurrentLayer(); 
     
    8080 
    8181 
    82 void osgAnimation::Timeline::setStats(osg::Stats* stats) { _stats = stats;} 
    83 osg::Stats* osgAnimation::Timeline::getStats() { return _stats.get();} 
    84 void osgAnimation::Timeline::collectStats(bool state) { _collectStats = state;} 
    85 osgAnimation::StatsActionVisitor* osgAnimation::Timeline::getStatsVisitor() { return _statsVisitor.get(); } 
    86  
    87 void osgAnimation::Timeline::clearActions() 
     82void Timeline::setStats(osg::Stats* stats) { _stats = stats;} 
     83osg::Stats* Timeline::getStats() { return _stats.get();} 
     84void Timeline::collectStats(bool state) { _collectStats = state;} 
     85StatsActionVisitor* Timeline::getStatsVisitor() { return _statsVisitor.get(); } 
     86 
     87void Timeline::clearActions() 
    8888{ 
    8989    _actions.clear(); 
     
    9292} 
    9393 
    94 void osgAnimation::Timeline::update(double simulationTime) 
     94void Timeline::update(double simulationTime) 
    9595{ 
    9696    // first time we call update we generate one frame 
     
    109109        { 
    110110            if (!_statsVisitor) 
    111                 _statsVisitor = new osgAnimation::StatsActionVisitor(); 
     111                _statsVisitor = new StatsActionVisitor(); 
    112112            _statsVisitor->setStats(_stats.get()); 
    113113            _statsVisitor->setFrame(_currentFrame); 
     
    150150} 
    151151 
    152 void osgAnimation::Timeline::removeAction(Action* action) 
     152void Timeline::removeAction(Action* action) 
    153153{ 
    154154    if (getEvaluating()) 
     
    158158} 
    159159 
    160 void osgAnimation::Timeline::addActionAt(unsigned int frame, Action* action, int priority) 
     160void Timeline::addActionAt(unsigned int frame, Action* action, int priority) 
    161161{ 
    162162    // skip if this action has already been added this frame 
     
    181181        internalAddAction(priority, FrameAction(frame, action)); 
    182182} 
    183 void osgAnimation::Timeline::addActionAt(double t, Action* action, int priority) 
     183void Timeline::addActionAt(double t, Action* action, int priority) 
    184184{ 
    185185    unsigned int frame = static_cast<unsigned int>(floor(t * _fps)); 
     
    187187} 
    188188 
    189 void osgAnimation::Timeline::addActionNow(Action* action, int priority) 
     189void Timeline::addActionNow(Action* action, int priority) 
    190190{ 
    191191    addActionAt(getCurrentFrame()+1, action, priority); 
    192192} 
    193193 
    194 void osgAnimation::Timeline::processPendingOperation() 
     194void Timeline::processPendingOperation() 
    195195{ 
    196196    // process all pending add action operation 
     
    209209} 
    210210 
    211 void osgAnimation::Timeline::internalRemoveAction(Action* action) 
     211void Timeline::internalRemoveAction(Action* action) 
    212212{ 
    213213    for (ActionLayers::iterator it = _actions.begin(); it != _actions.end(); it++) 
     
    223223} 
    224224 
    225 void osgAnimation::Timeline::internalAddAction(int priority, const FrameAction& ftl) 
     225void Timeline::internalAddAction(int priority, const FrameAction& ftl) 
    226226{ 
    227227    _actions[priority].insert(_actions[priority].begin(), ftl); 
    228228} 
    229229 
    230 bool osgAnimation::Timeline::isActive(Action* activeAction) 
     230bool Timeline::isActive(Action* activeAction) 
    231231{ 
    232232    // update from high priority to low priority