Changeset 11291 for OpenSceneGraph/trunk/include/osgAnimation/Sampler

Timestamp:

03/25/10 18:50:29 (3 years ago)

Author:

cedricpinson

Message:

Change time type from float to double in osgAnimation

Files:

• OpenSceneGraph/trunk/include/osgAnimation/Sampler (modified) (4 diffs)

OpenSceneGraph/trunk/include/osgAnimation/Sampler

@@ -17 +17 @@
  */
 
-#ifndef OSGANIMATION_SAMPLER_H
-#define OSGANIMATION_SAMPLER_H
+#ifndef OSGANIMATION_SAMPLER
+#define OSGANIMATION_SAMPLER 1
 
 #include <vector>
@@ -51 +51 @@
         ~TemplateSampler() {}
 
-        void getValueAt(float time, UsingType& result) const { _functor.getValue(*_keyframes, time, result);}
+        void getValueAt(double time, UsingType& result) const { _functor.getValue(*_keyframes, time, result);}
         void setKeyframeContainer(KeyframeContainerType* kf) { _keyframes = kf;}
 
@@ -67 +67 @@
         }
 
-        float getStartTime() const 
+        double getStartTime() const 
         {
             if (!_keyframes)
-                return 0.0f;
+                return 0.0;
             return _keyframes->front().getTime();
         }
 
-        float getEndTime() const 
+        double getEndTime() const 
         {
             if (!_keyframes)
-                return 0.0f;
+                return 0.0;
             return _keyframes->back().getTime();
         }
@@ -102 +102 @@
         }
 
-        void getValueAt(float time, typename VALUESAMPLERTYPE::FunctorType::UsingType& result)
+        void getValueAt(double time, typename VALUESAMPLERTYPE::FunctorType::UsingType& result)
         {
-            float newtime;
+            double newtime;
             _time.getValueAt(time, newtime);
             _value.getValueAt(newtime, result);