Changeset 13041 for OpenSceneGraph/trunk/src/osg/AnimationPath.cpp

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osg/AnimationPath.cpp (modified) (14 diffs)

OpenSceneGraph/trunk/src/osg/AnimationPath.cpp

@@ -1 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
  *
- * This library is open source and may be redistributed and/or modified under  
- * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
  * (at your option) any later version.  The full license is in LICENSE file
  * included with this distribution, and on the openscenegraph.org website.
- * 
+ *
  * This library 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
  * OpenSceneGraph Public License 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.
 
@@ -76 +76 @@
                             first->second,
                             second->second);
-        }        
+        }
     }
     else // (second==_timeControlPointMap.end())
@@ -139 +139 @@
     double time3 = osg::PI*1.5/angularVelocity;
     double time4 = osg::PI*2.0/angularVelocity;
-    
+
     osg::Quat rotation0(0.0, axis);
     osg::Quat rotation1(osg::PI*0.5, axis);
     osg::Quat rotation2(osg::PI*1.0, axis);
     osg::Quat rotation3(osg::PI*1.5, axis);
-    
-    
+
+
     _animationPath->insert(time0,osg::AnimationPath::ControlPoint(pivot,rotation0));
     _animationPath->insert(time1,osg::AnimationPath::ControlPoint(pivot,rotation1));
@@ -169 +169 @@
             else
                 _cp.getMatrix(matrix);
-                
+
             camera.setViewMatrix(osg::Matrix::translate(-_pivotPoint)*matrix);
         }
-        
+
 
         virtual void apply(CameraView& cv)
@@ -183 +183 @@
                 cv.setAttitude(_cp.getRotation().inverse());
                 cv.setFocalLength(1.0f/_cp.getScale().x());
-                
+
             }
             else
@@ -200 +200 @@
             else
                 _cp.getMatrix(matrix);
-                
+
             mt.setMatrix(osg::Matrix::translate(-_pivotPoint)*matrix);
         }
-        
+
         virtual void apply(PositionAttitudeTransform& pat)
         {
@@ -214 +214 @@
                 pat.setScale(osg::Vec3(1.0f/_cp.getScale().x(),1.0f/_cp.getScale().y(),1.0f/_cp.getScale().z()));
                 pat.setPivotPoint(_pivotPoint);
-                
+
             }
             else
@@ -224 +224 @@
             }
         }
-        
+
         AnimationPath::ControlPoint _cp;
         osg::Vec3d _pivotPoint;
-        bool _useInverseMatrix;      
+        bool _useInverseMatrix;
 };
 
 void AnimationPathCallback::operator()(Node* node, NodeVisitor* nv)
 {
-    if (_animationPath.valid() && 
-        nv->getVisitorType()==NodeVisitor::UPDATE_VISITOR && 
+    if (_animationPath.valid() &&
+        nv->getVisitorType()==NodeVisitor::UPDATE_VISITOR &&
         nv->getFrameStamp())
     {
@@ -246 +246 @@
         }
     }
-    
+
     // must call any nested node callbacks and continue subgraph traversal.
     NodeCallback::traverse(node,nv);
@@ -284 +284 @@
         return;
     }
-    
+
     _pause = pause;