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

OpenSceneGraph/trunk/src/osg/ImageSequence.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.
 */
@@ -31 +31 @@
     _length = 1.0;
     _timePerImage = 1.0;
-    
+
     _seekTime = 0.0;
     _seekTimeSet = false;
-    
+
     _previousAppliedImageIndex = -1;
 }
@@ -90 +90 @@
         return;
     }
-    
+
     _length = length;
     computeTimePerImage();
@@ -115 +115 @@
     return pos<_fileNames.size() ? _fileNames[pos] : std::string();
 }
-        
+
 void ImageSequence::addImageFile(const std::string& fileName)
 {
@@ -130 +130 @@
 
     if (pos>=_images.size()) _images.resize(pos+1);
-    
+
     _images[pos] = image;
 
@@ -160 +160 @@
 
     computeTimePerImage();
-    
+
     if (data()==0)
     {
@@ -190 +190 @@
 int ImageSequence::imageIndex(double time)
 {
-    if (getLoopingMode()==LOOPING) 
+    if (getLoopingMode()==LOOPING)
     {
         double positionRatio = time/_length;
@@ -205 +205 @@
 {
     OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex);
-    
+
     osg::NodeVisitor::ImageRequestHandler* irh = nv->getImageRequestHandler();
     const osg::FrameStamp* fs = nv->getFrameStamp();
@@ -215 +215 @@
         _referenceTime = fs->getSimulationTime();
     }
-    
+
     bool looping = getLoopingMode()==LOOPING;
     double time = (fs->getSimulationTime() - _referenceTime)*_timeMultiplier;
-    
+
     if (_seekTimeSet || _status==PAUSED || _status==INVALID)
     {
-        time = _seekTime;        
+        time = _seekTime;
         _referenceTime =  fs->getSimulationTime() - time/_timeMultiplier;
     }
@@ -243 +243 @@
         }
     }
-    
+
     _seekTime = time;
     _seekTimeSet = false;
 
     bool pruneOldImages = false;
-    
-    
+
+
     switch(_mode)
     {
@@ -265 +265 @@
                 }
             }
-        
+
             irh = 0;
             break;
@@ -295 +295 @@
             }
         }
-                
+
         if (index>=0)
         {
@@ -302 +302 @@
             if (_previousAppliedImageIndex!=index)
             {
-                if (_previousAppliedImageIndex >= 0 && 
-                    _previousAppliedImageIndex<int(_images.size()) && 
+                if (_previousAppliedImageIndex >= 0 &&
+                    _previousAppliedImageIndex<int(_images.size()) &&
                     pruneOldImages)
                 {
                     _images[_previousAppliedImageIndex] = 0;
                 }
-            
+
                 setImageToChild(_images[index].get());
-                
+
                 _previousAppliedImageIndex = index;
             }
@@ -321 +321 @@
     {
         double preLoadTime = time + osg::minimum(irh->getPreLoadTime()*_timeMultiplier, _length);
-        
+
         int startLoadIndex = int(time/_timePerImage);
         if (startLoadIndex>=int(_images.size())) startLoadIndex = int(_images.size())-1;
@@ -327 +327 @@
 
         int endLoadIndex = int(preLoadTime/_timePerImage);
-        if (endLoadIndex>=int(_fileNames.size())) 
+        if (endLoadIndex>=int(_fileNames.size()))
         {
             if (looping)
@@ -339 +339 @@
         }
         if (endLoadIndex<0) endLoadIndex = 0;
-        
+
         double requestTime = time;
-        
+
         if (endLoadIndex<startLoadIndex)
         {