Show
Ignore:
Timestamp:
03/21/12 18:36:20 (2 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPresentation/AnimationMaterial.cpp

    r12292 r13041  
    1 /* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield  
     1/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield 
    22 * 
    3  * This software is open source and may be redistributed and/or modified under   
     3 * This software is open source and may be redistributed and/or modified under 
    44 * the terms of the GNU General Public License (GPL) version 2.0. 
    55 * The full license is in LICENSE.txt file included with this distribution,. 
    6  *  
     6 * 
    77 * This software is distributed in the hope that it will be useful, 
    88 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
    9  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the  
     9 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1010 * include LICENSE.txt for more details. 
    1111*/ 
     
    2828{ 
    2929    if (_timeControlPointMap.empty()) return false; 
    30      
     30 
    3131    switch(_loopMode) 
    3232    { 
     
    3636            double fraction_part = modulated_time - floor(modulated_time); 
    3737            if (fraction_part>0.5) fraction_part = 1.0-fraction_part; 
    38              
     38 
    3939            time = getFirstTime()+(fraction_part*2.0) * getPeriod(); 
    4040            break; 
     
    5151            break; 
    5252    } 
    53      
    54      
     53 
     54 
    5555 
    5656    TimeControlPointMap::const_iterator second = _timeControlPointMap.lower_bound(time); 
     
    6262    { 
    6363        TimeControlPointMap::const_iterator first = second; 
    64         --first;         
    65          
     64        --first; 
     65 
    6666        // we have both a lower bound and the next item. 
    6767 
     
    7474        { 
    7575            interpolate(material,(time - first->first)/delta_time, *first->second, *second->second); 
    76         }         
     76        } 
    7777    } 
    7878    else // (second==_timeControlPointMap.end()) 
     
    158158void AnimationMaterialCallback::operator()(osg::Node* node, osg::NodeVisitor* nv) 
    159159{ 
    160     if (_animationMaterial.valid() &&  
    161         nv->getVisitorType()==osg::NodeVisitor::UPDATE_VISITOR &&  
     160    if (_animationMaterial.valid() && 
     161        nv->getVisitorType()==osg::NodeVisitor::UPDATE_VISITOR && 
    162162        nv->getFrameStamp()) 
    163163    { 
     
    174174            } 
    175175            update(*node); 
    176              
    177         } 
    178     } 
    179      
     176 
     177        } 
     178    } 
     179 
    180180    // must call any nested node callbacks and continue subgraph traversal. 
    181181    NodeCallback::traverse(node,nv); 
     
    221221        return; 
    222222    } 
    223      
     223 
    224224    _pause = pause; 
    225      
     225 
    226226    if (_firstTime==DBL_MAX) return; 
    227      
     227 
    228228    if (_pause) 
    229229    {