# HG changeset patch # User Sam # Date 1701095494 -25200 # Node ID 8e320c8537c77b36499c99eabb9207d7910c8269 # Parent c7468c8350c3fee2349a54668573973d49d65473 fix: a few things wrong with animations diff -r c7468c8350c3 -r 8e320c8537c7 src/semicongine/animation.nim --- a/src/semicongine/animation.nim Sun Nov 26 23:09:19 2023 +0700 +++ b/src/semicongine/animation.nim Mon Nov 27 21:31:34 2023 +0700 @@ -34,7 +34,7 @@ iterations: int AnimationPlayer*[T] = object animation*: Animation[T] - currentTime: float32 + currentTime*: float32 playing*: bool currentDirection: int currentIteration: int @@ -125,17 +125,18 @@ iterations: iterations ) -func resetPlayer*(player: var AnimationPlayer) = +proc reset*(player: var AnimationPlayer) = + player.currentValue = player.animation.animationFunction(0) player.currentTime = 0 player.currentDirection = if player.animation.direction == Backward: -1 else : 1 player.currentIteration = player.animation.iterations -func newAnimationPlayer*[T](animation: Animation[T]): AnimationPlayer[T] = +proc newAnimationPlayer*[T](animation: Animation[T]): AnimationPlayer[T] = result = AnimationPlayer[T](animation: animation, playing: false) - result.resetPlayer() + result.reset() -func newAnimationPlayer*[T](value: T = default(T)): AnimationPlayer[T] = +proc newAnimationPlayer*[T](value: T = default(T)): AnimationPlayer[T] = newAnimationPlayer[T](newAnimation[T]((t: AnimationTime) => value, 0)) func start*(player: var AnimationPlayer) = @@ -148,11 +149,13 @@ # TODO: check this function, not 100% correct I think if player.playing: player.currentTime += float32(player.currentDirection) * dt - if abs(player.currentTime) > player.animation.duration: + if player.currentTime > player.animation.duration: dec player.currentIteration + # last iteration reached if player.currentIteration <= 0 and player.animation.iterations != 0: + player.currentTime = player.animation.duration player.stop() - player.resetPlayer() + # more iterations else: case player.animation.direction: of Forward: @@ -163,5 +166,5 @@ player.currentDirection = -player.currentDirection player.currentTime += float32(player.currentDirection) * dt * 2'f32 - player.currentValue = player.animation.animationFunction((abs(player.currentTime) / player.animation.duration) mod high(AnimationTime)) + player.currentValue = player.animation.animationFunction(player.currentTime / player.animation.duration) return player.currentValue