Merge pull request #2149 from Madadog/clamp-anim-ticks-1

Clamp input to animEffect()
nesbox · Mar 2, 2023 · 40c5f2d · 40c5f2d
2 parents ecbcae5 + e9f68eb
commit 40c5f2d
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/studio/studio.c b/src/studio/studio.c
@@ -914,7 +914,10 @@ static inline float animEffect(AnimEffect effect, float x)
 static void animTick(Movie* movie)
 {
     for(Anim* it = movie->items, *end = it + movie->count; it != end; ++it)
-        *it->value = lerp(it->start, it->end, animEffect(it->effect, (float)movie->tick / it->time));
+    {
+	float tick = (float)(movie->tick < it->time ? movie->tick : it->time);
+        *it->value = lerp(it->start, it->end, animEffect(it->effect, tick / it->time));
+    }
 }
 
 void processAnim(Movie* movie, void* data)