Merge pull request #54 from rive-app/overloadPlay_50

fixed up examples for isStateMachine delegate flag & added play suppo…
rive-app · May 25, 2021 · 11b9e2f · 11b9e2f
2 parents dabfbf1 + d99c07d
commit 11b9e2f
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 15 deletions.
diff --git a/Example-iOS/Source/SwiftUI/Button/RiveButtonBridge.swift b/Example-iOS/Source/SwiftUI/Button/RiveButtonBridge.swift
@@ -41,15 +41,15 @@ struct RiveButtonBridge: UIViewRepresentable {
             self.rive = rive
         }
 
-        func play(_ animationName: String) {
+        func play(_ animationName: String, isStateMachine: Bool) {
             rive.play = true
         }
 
-        func pause(_ animationName: String) {
+        func pause(_ animationName: String, isStateMachine: Bool) {
             rive.play = false
         }
 
-        func stop(_ animationName: String) {
+        func stop(_ animationName: String, isStateMachine: Bool) {
             rive.play = false
         }
     }

diff --git a/Example-iOS/Source/SwiftUI/Explorer/RiveExplorerBridge.swift b/Example-iOS/Source/SwiftUI/Explorer/RiveExplorerBridge.swift
@@ -181,12 +181,12 @@ extension RiveExplorerBridge {
                 loopAction?(animationName, type)
             }
 
-        func play(_ animationName: String) {
+        func play(_ animationName: String, isStateMachine: Bool) {
             controller.playback = .play
             playAction?(animationName)
         }
 
-        func pause(_ animationName: String) {
+        func pause(_ animationName: String, isStateMachine: Bool) {
             controller.playback = .pause
             pauseAction?(animationName)
         }

diff --git a/Source/Views/RiveView.swift b/Source/Views/RiveView.swift
@@ -361,6 +361,29 @@ public class RiveView: UIView {
         runTimer()
     }
 
+    /// Plays the list of animations or state machines with optional loop and directions
+    /// - Parameter animationNames: list of names of the animations to play
+    /// - Parameter loop: overrides the animation's loop setting
+    /// - Parameter direction: overrides the animation's default direction (forwards)
+    /// - Parameter isStateMachine: true of the name refers to a state machine and not an animation
+    public func play(
+        animationNames:[String],
+        loop: Loop = .loopAuto,
+        direction: Direction = .directionAuto,
+        isStateMachine: Bool = false
+    ) {
+        animationNames.forEach{ animationName in
+            _playAnimation(
+                animationName:animationName,
+                loop:loop,
+                direction:direction,
+                isStateMachine:isStateMachine
+            )
+        }
+
+        runTimer()
+    }
+
 
     /// Pauses all playing animations and state machines
     public func pause() {
@@ -425,6 +448,21 @@ public class RiveView: UIView {
         return stateMachineInstances
     }
 
+    private func _getOrCreateLinearAnimationInstances(
+        animationName: String
+    ) -> [RiveLinearAnimationInstance]{
+        let animationInstances = _animations(animationName: animationName)
+
+        if (animationInstances.isEmpty){
+            guard let guardedArtboard=_artboard else {
+                return []
+            }
+            let animationInstance = guardedArtboard.animation(fromName:animationName).instance()
+            return [animationInstance]
+        }
+        return animationInstances
+    }
+
     private func _playAnimation(
         animationName: String,
         loop: Loop = .loopAuto,
@@ -437,23 +475,14 @@ public class RiveView: UIView {
                 _play(stateMachineInstance)
             }
         } else {
-            let animationInstances = _animations(animationName: animationName)
+            let animationInstances = _getOrCreateLinearAnimationInstances(animationName: animationName)
 
             animationInstances.forEach { animationInstance in
                 _play(
                     animation:animationInstance,
                     loop:loop, direction:direction
                 )
             }
-            if (animationInstances.isEmpty) {
-                guard let guardedArtboard=_artboard else {
-                    return
-                }
-                let animationInstance = guardedArtboard.animation(fromName:animationName).instance()
-
-                _play(animation:animationInstance, loop:loop, direction:direction)
-
-            }
         }
     }