Changeset 13041 for OpenSceneGraph/trunk/src/osg/Sequence.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/Sequence.cpp (modified) (20 diffs)

OpenSceneGraph/trunk/src/osg/Sequence.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.
  */
@@ -40 +40 @@
     _sync(false),
     _clearOnStop(false)
-    
+
 {
     setNumChildrenRequiringUpdateTraversal(1);
@@ -67 +67 @@
     _clearOnStop(seq._clearOnStop)
 {
-    setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);            
+    setNumChildrenRequiringUpdateTraversal(getNumChildrenRequiringUpdateTraversal()+1);
 }
 
@@ -116 +116 @@
 {
     if (pos<_frameTime.size())
-        _frameTime.erase(_frameTime.begin()+pos, 
-                         osg::minimum(_frameTime.begin()+(pos+numChildrenToRemove), 
+        _frameTime.erase(_frameTime.begin()+pos,
+                         osg::minimum(_frameTime.begin()+(pos+numChildrenToRemove),
                                       _frameTime.end()) );
     _resetTotalTime = true;
@@ -141 +141 @@
         }
     }
-  
+
 }
 
@@ -179 +179 @@
     int ubegin, uend;
 
-    switch (mode) 
+    switch (mode)
     {
     case START:
@@ -223 +223 @@
 
 
-    if (nv.getVisitorType()==NodeVisitor::UPDATE_VISITOR && 
+    if (nv.getVisitorType()==NodeVisitor::UPDATE_VISITOR &&
         _mode == START &&
         !_frameTime.empty() && getNumChildren()!=0)
     {
-      
+
         // if begin or end < 0, make it last frame
         int _ubegin = (_begin < 0 ?  (int)_frameTime.size()-1: _begin);
@@ -279 +279 @@
                 else
                 {
-                    if ( (_loopMode == LOOP) && 
-                         ( (_step>0 && _value!=_send) || 
+                    if ( (_loopMode == LOOP) &&
+                         ( (_step>0 && _value!=_send) ||
                            (_step<0 && _value!=_sbegin)))
                     {
@@ -294 +294 @@
                 }
             }
-          
+
             // update local variables
             _update();
@@ -307 +307 @@
                 // most of the time it's just the next frame in the sequence
                 int nextValue = _getNextValue();
-                if (!_sync || 
+                if (!_sync ||
                     ((_now - _start) <= (_frameTime[_value]+_frameTime[nextValue])*osg::absolute(_speed)) )
                 {
                     _start += _frameTime[_value]*osg::absolute(_speed);
                     // repeat or change directions?
-                    if ( (_step>0 && nextValue==_send) || 
+                    if ( (_step>0 && nextValue==_send) ||
                          (_step<0 && nextValue==_sbegin))
                     {
@@ -331 +331 @@
             // elapsed time from start of the frame
             double deltaT = _now - _start;
-            
+
             // factors _speed into account
             double adjTotalTime = _totalTime*osg::absolute(_speed);
-            
+
             // how many laps?
             int loops = (int)(deltaT/adjTotalTime);
-            
-            
+
+
             // adjust reps & quick check to see if done becuase reps used up
-            
+
             if (_nreps>0)
             {
@@ -347 +347 @@
             else
                 _nrepsRemain -= 2*loops;
-            
+
             if (_nrepsRemain<=0)
             {
@@ -355 +355 @@
             }
             }
-            
+
             // deduct off time for laps- _value shouldn't change as it's modulo the total time
             double jumpStart = ((double)loops * adjTotalTime);
-            
+
             // step through frames one at a time until caught up
             while (deltaT-jumpStart > _frameTime[_value]*osg::absolute(_speed))
@@ -365 +365 @@
             _value = _getNextValue();
             }
-            
+
             // set start time
             _start += jumpStart;
@@ -399 +399 @@
     int _ubegin = (_begin < 0 ?  (int)_frameTime.size()-1: _begin);
     int _uend = (_end < 0 ? (int)_frameTime.size()-1: _end);
-    
+
     int _sbegin = osg::minimum(_ubegin,_uend);
     int _send = osg::maximum(_ubegin,_uend);
@@ -423 +423 @@
                 v+=vs;
             }
-            
+
             return v;
         }
@@ -445 +445 @@
     int _ubegin = (_begin < 0 ?  (int)_frameTime.size()-1: _begin);
     int _uend = (_end < 0 ? (int)_frameTime.size()-1: _end);
-    
+
     int _sbegin = osg::minimum(_ubegin,_uend);
     int _send = osg::maximum(_ubegin,_uend);
@@ -455 +455 @@
         _resetTotalTime = true;
     }
-  
+
     // if _start<0, new or restarted
     if (_start<0)
@@ -462 +462 @@
         _resetTotalTime = true;
     }
-  
+
     // need to calculate time of a complete sequence?
     // time is different depending on loop mode
@@ -491 +491 @@
         _resetTotalTime = false;
     }
-  
-}
+
+}