Changeset 13041 for OpenSceneGraph/trunk/src/osgPresentation/AnimationMaterial.cpp

Timestamp:

03/21/12 18:36:20 (15 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPresentation/AnimationMaterial.cpp (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgPresentation/AnimationMaterial.cpp

@@ -1 @@
-/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield 
+/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield
  *
- * This software is open source and may be redistributed and/or modified under  
+ * This software is open source and may be redistributed and/or modified under
  * the terms of the GNU General Public License (GPL) version 2.0.
  * The full license is in LICENSE.txt file included with this distribution,.
- * 
+ *
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * include LICENSE.txt for more details.
 */
@@ -28 +28 @@
 {
     if (_timeControlPointMap.empty()) return false;
-    
+
     switch(_loopMode)
     {
@@ -36 +36 @@
             double fraction_part = modulated_time - floor(modulated_time);
             if (fraction_part>0.5) fraction_part = 1.0-fraction_part;
-            
+
             time = getFirstTime()+(fraction_part*2.0) * getPeriod();
             break;
@@ -51 +51 @@
             break;
     }
-    
-    
+
+
 
     TimeControlPointMap::const_iterator second = _timeControlPointMap.lower_bound(time);
@@ -62 +62 @@
     {
         TimeControlPointMap::const_iterator first = second;
-        --first;        
-        
+        --first;
+
         // we have both a lower bound and the next item.
 
@@ -74 +74 @@
         {
             interpolate(material,(time - first->first)/delta_time, *first->second, *second->second);
-        }        
+        }
     }
     else // (second==_timeControlPointMap.end())
@@ -158 +158 @@
 void AnimationMaterialCallback::operator()(osg::Node* node, osg::NodeVisitor* nv)
 {
-    if (_animationMaterial.valid() && 
-        nv->getVisitorType()==osg::NodeVisitor::UPDATE_VISITOR && 
+    if (_animationMaterial.valid() &&
+        nv->getVisitorType()==osg::NodeVisitor::UPDATE_VISITOR &&
         nv->getFrameStamp())
     {
@@ -174 +174 @@
             }
             update(*node);
-            
-        }
-    }
-    
+
+        }
+    }
+
     // must call any nested node callbacks and continue subgraph traversal.
     NodeCallback::traverse(node,nv);
@@ -221 +221 @@
         return;
     }
-    
+
     _pause = pause;
-    
+
     if (_firstTime==DBL_MAX) return;
-    
+
     if (_pause)
     {