Merge pull request #1263 from rolandhill/samplerTime

Ensure animation ends on final key frame

src/vsg/animation/Animation.cpp

@@ -132,6 +132,8 @@ bool Animation::update(double simulationTime)
 {
     if (!_active) return false;
 
+    bool finished = false;
+
     auto time_within_period = [](double x, double y) -> double {
         return x < 0.0 ? y + std::fmod(x, y) : std::fmod(x, y);
     };
@@ -153,8 +155,8 @@ bool Animation::update(double simulationTime)
     {
         if (time > _maxTime)
         {
-            stop(simulationTime);
-            return false;
+            finished = true;
+            samplerTime = time = _maxTime;
         }
     }
 
@@ -163,6 +165,12 @@ bool Animation::update(double simulationTime)
         sampler->update(samplerTime);
     }
 
+    if(finished)
+    {
+        stop(simulationTime);
+        return false;
+    }
+
     return true;
 }