[Animation] Fix issue with tick processing

Fixes an issue with realtime ticks not generating when all animations are paused and then resumed.
aardvark-platform · Feb 6, 2025 · 7ebefa5 · 7ebefa5
1 parent 6d781ec
commit 7ebefa5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,6 @@
 - Fixed multisampled raw download
 - [Animation] Improved adaptive sampling scheme for splines to avoid infinite recursion when control points are coinciding
+- [Animation] Fixed issue with ticks not being processed when all animations are paused
 
 ### 5.5.2
 - updated Adaptify.Core to 1.3.0 (using local, new style adaptify)

diff --git a/src/Aardvark.UI.Primitives/Animation/Animator/AnimatorApp.fs b/src/Aardvark.UI.Primitives/Animation/Animator/AnimatorApp.fs
@@ -391,7 +391,4 @@ module Animator =
                 yield! time()
             }
 
-        if model.Slots |> HashMap.exists (fun _ s -> s.Current.IsRunning) then
-            ThreadPool.add "animationTicks" (time()) ThreadPool.empty
-        else
-            ThreadPool.empty
+        ThreadPool.add "animationTicks" (time()) ThreadPool.empty
diff --git a/src/Examples (dotnetcore)/26 - Animation/App.fs b/src/Examples (dotnetcore)/26 - Animation/App.fs
@@ -6,6 +6,7 @@ open Aardvark.UI
 open Aardvark.UI.Primitives
 open Aardvark.UI.Animation
 open FSharp.Data.Adaptive
+open Aardvark.Application
 
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module Model =
@@ -32,6 +33,7 @@ module App =
                     style "width: 100%; height:100%"
                     onEvent "onRendered" [] (fun _ -> Animation AnimatorMessage.RealTimeTick)
                     onClick (fun _ -> GameMessage.Start |> Game)
+                    onKeyDown OnKeyDown
                     attribute "showFPS" "true"
                     attribute "data-samples" "8"
                 ]) RenderControlConfig.standard
@@ -44,7 +46,7 @@ module App =
             ThreadPool.union camera animation
 
 
-    let update (model : Model) (msg : Message) =
+    let rec update (model : Model) (msg : Message) =
         match msg with
         | Game m ->
             m |> Game.update model
@@ -55,6 +57,9 @@ module App =
         | Animation msg ->
             model |> Animator.update msg
 
+        | OnKeyDown Keys.Space ->
+            Game GameMessage.Pause |> update model
+
         | _ ->
             model
 

diff --git a/src/Examples (dotnetcore)/26 - Animation/Game.fs b/src/Examples (dotnetcore)/26 - Animation/Game.fs
@@ -495,6 +495,16 @@ module Game =
         | Start when model.state = Introduction ->
             model |> Transitions.flyover
 
+        | Pause ->
+            match model.state with
+            | Paused original ->
+                { model with state = original }
+                |> Animator.iterate (fun a -> a.Resume())
+
+            | _ ->
+                { model with state = Paused model.state }
+                |> Animator.iterate (fun a -> a.Pause())
+
         | _ when not <| GameState.isRunning model.state ->
             model
 

diff --git a/src/Examples (dotnetcore)/26 - Animation/Model.fs b/src/Examples (dotnetcore)/26 - Animation/Model.fs
@@ -3,6 +3,7 @@
 open Aardvark.Base
 open Aardvark.UI.Primitives
 open Aardvark.UI.Animation
+open Aardvark.Application
 open FSharp.Data.Adaptive
 open Adaptify
 
@@ -52,6 +53,7 @@ type GameState =
     | Preparing
     | Running of resolved: int
     | Finished
+    | Paused of original: GameState
 
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module GameState =
@@ -78,8 +80,10 @@ type GameMessage =
     | Select of V2i
     | Hover of V2i
     | Unhover of V2i
+    | Pause
 
 type Message =
+    | OnKeyDown of Keys
     | Game of GameMessage
     | Camera of OrbitMessage
     | Animation of AnimatorMessage<Model>