Changeset 13041 for OpenSceneGraph/trunk/include/osgAnimation/Interpolator

Timestamp:

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

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/include/osgAnimation/Interpolator (modified) (9 diffs)

OpenSceneGraph/trunk/include/osgAnimation/Interpolator

@@ -1 @@
-/*  -*-c++-*- 
+/*  -*-c++-*-
  *  Copyright (C) 2008 Cedric Pinson <cedric.pinson@plopbyte.net>
  *
- * 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.
- * 
+ *
  * Authors:
  *         Cedric Pinson <cedric.pinson@plopbyte.net>
@@ -39 +39 @@
 
         void reset() { _lastKeyAccess = -1; }
-        int getKeyIndexFromTime(const TemplateKeyframeContainer<KEY>& keys, double time) const 
+        int getKeyIndexFromTime(const TemplateKeyframeContainer<KEY>& keys, double time) const
         {
             // todo use a cache
@@ -53 +53 @@
                 double time1 = keysVector[i+1].getTime();
 
-                if ( time >= time0 && time < time1 ) 
+                if ( time >= time0 && time < time1 )
                 {
                     _lastKeyAccess = i;
@@ -71 +71 @@
 
         TemplateStepInterpolator() {}
-        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const 
-        {
-      
-            if (time >= keyframes.back().getTime()) 
+        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const
+        {
+
+            if (time >= keyframes.back().getTime())
             {
                 result = keyframes.back().getValue();
                 return;
-            } 
-            else if (time <= keyframes.front().getTime()) 
+            }
+            else if (time <= keyframes.front().getTime())
             {
                 result = keyframes.front().getValue();
@@ -97 +97 @@
 
         TemplateLinearInterpolator() {}
-        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const 
-        {
-      
-            if (time >= keyframes.back().getTime()) 
+        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const
+        {
+
+            if (time >= keyframes.back().getTime())
             {
                 result = keyframes.back().getValue();
                 return;
-            } 
-            else if (time <= keyframes.front().getTime()) 
+            }
+            else if (time <= keyframes.front().getTime())
             {
                 result = keyframes.front().getValue();
                 return;
             }
-        
+
             int i = this->getKeyIndexFromTime(keyframes,time);
             float blend = (time - keyframes[i].getTime()) / ( keyframes[i+1].getTime() -  keyframes[i].getTime());
@@ -125 +125 @@
     public:
         TemplateSphericalLinearInterpolator() {}
-        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const 
-        {
-            if (time >= keyframes.back().getTime()) 
+        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const
+        {
+            if (time >= keyframes.back().getTime())
             {
                 result = keyframes.back().getValue();
                 return;
             }
-            else if (time <= keyframes.front().getTime()) 
+            else if (time <= keyframes.front().getTime())
             {
                 result = keyframes.front().getValue();
@@ -153 +153 @@
 
         TemplateLinearPackedInterpolator() {}
-        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const 
-        {
-            if (time >= keyframes.back().getTime()) 
+        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const
+        {
+            if (time >= keyframes.back().getTime())
             {
                 keyframes.back().getValue().uncompress(keyframes.mScale, keyframes.mMin, result);
                 return;
             }
-            else if (time <= keyframes.front().getTime()) 
+            else if (time <= keyframes.front().getTime())
             {
                 keyframes.front().getValue().uncompress(keyframes.mScale, keyframes.mMin, result);
@@ -183 +183 @@
 
         TemplateCubicBezierInterpolator() {}
-        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const 
-        {
-      
-            if (time >= keyframes.back().getTime()) 
+        void getValue(const TemplateKeyframeContainer<KEY>& keyframes, double time, TYPE& result) const
+        {
+
+            if (time >= keyframes.back().getTime())
             {
                 result = keyframes.back().getValue().getPosition();
                 return;
             }
-            else if (time <= keyframes.front().getTime()) 
+            else if (time <= keyframes.front().getTime())
             {
                 result = keyframes.front().getValue().getPosition();
@@ -198 +198 @@
 
             int i = this->getKeyIndexFromTime(keyframes,time);
-      
+
             float t = (time - keyframes[i].getTime()) / ( keyframes[i+1].getTime() -  keyframes[i].getTime());
             float one_minus_t = 1.0-t;