sort of got reset in

rive-app · May 7, 2021 · 3822912 · 3822912
1 parent bcb7136
commit 3822912
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/Example-iOS/Source/UIkit/LoopMode.swift b/Example-iOS/Source/UIkit/LoopMode.swift
@@ -104,7 +104,13 @@ class LoopModeController: UIViewController {
         )
 
         loopModeView.triggeredResetButton = {
+            loopModeView.riveView.reset()
 
+            // TODO: just calling reset on an existing file is really not so hot.
+            loopModeView.riveView.configure(
+                withRiveFile: getRiveFile(resourceName: self.loopResourceName),
+                andAutoPlay: false
+            )
         }
         loopModeView.triggeredForwardsButton = {
             self.direction = Direction.DirectionForwards

diff --git a/Source/Views/RiveView.swift b/Source/Views/RiveView.swift
@@ -82,7 +82,7 @@ public class RiveView: UIView {
 
         // Advance the artboard, this will ensure the first
         // frame is displayed when the artboard is drawn
-        artboard.advance(by: 0)
+//        artboard.advance(by: 0)
 
         // Start the animation loop
         if autoPlay {
@@ -91,6 +91,8 @@ public class RiveView: UIView {
             }else {
                 play()
             }
+        }else {
+            advance(delta: 0)
         }
     }
 
@@ -125,6 +127,24 @@ public class RiveView: UIView {
         displayLink?.isPaused=true
     }
 
+    func clear() {
+        playingAnimations.removeAll()
+        playingStateMachines.removeAll()
+        animations.removeAll()
+        stateMachines.removeAll()
+        stopTimer()
+        lastTime=0
+    }
+
+    public func reset() {
+        clear()
+        stopTimer()
+        if let riveFile = self.riveFile {
+            // TODO: this is totally not enough to reset the file. i guess its because the file's artboard is already changed.
+            configure(withRiveFile: riveFile, andAutoPlay: autoPlay)
+        }
+    }
+
 
     // Animates a frame
     @objc func tick() {