State Machines and Animations will call advanceAndApply() instead of …

…advance() and apply() separately
rive-app · Jun 8, 2022 · 6d33cb6 · 6d33cb6
1 parent 658a76c
commit 6d33cb6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/Source/Components/RiveView.swift b/Source/Components/RiveView.swift
@@ -169,12 +169,10 @@ open class RiveView: RiveRendererView {
 
         if let stateMachine = riveModel.stateMachine {
             isPlaying = stateMachine.advance(by: delta) && wasPlaying
-
             stateMachine.stateChanges().forEach { stateMachineDelegate?.stateMachine?(stateMachine, didChangeState: $0) }
         }
         else if let animation = riveModel.animation {
             isPlaying = animation.advance(by: delta) && wasPlaying
-            animation.apply()
 
             if isPlaying {
                 if animation.didLoop() {
@@ -192,8 +190,6 @@ open class RiveView: RiveRendererView {
             }
         }
 
-        // advance the artboard
-        riveModel.artboard.advance(by: delta)
         playerDelegate?.player(didAdvanceby: delta, riveModel: riveModel)
 
         // Trigger a redraw

diff --git a/Source/Renderer/RiveLinearAnimationInstance.mm b/Source/Renderer/RiveLinearAnimationInstance.mm
@@ -33,12 +33,8 @@ - (void)setTime:(float) time {
     instance->time(time);
 }
 
-- (void)apply {
-    instance->apply();
-}
-
 - (bool)advanceBy:(double)elapsedSeconds {
-    return instance->advance(elapsedSeconds);
+    return instance->advanceAndApply(elapsedSeconds);
 }
 
 - (void)direction:(int)direction {

diff --git a/Source/Renderer/RiveStateMachineInstance.mm b/Source/Renderer/RiveStateMachineInstance.mm
@@ -36,7 +36,7 @@ - (instancetype)initWithStateMachine:(rive::StateMachineInstance *)stateMachine
 
 
 - (bool) advanceBy:(double)elapsedSeconds  {
-    return instance->advance(elapsedSeconds);
+    return instance->advanceAndApply(elapsedSeconds);
 }
 
 - (RiveSMIBool *)getBool:(NSString *)name {

diff --git a/Source/Renderer/include/RiveLinearAnimationInstance.h b/Source/Renderer/include/RiveLinearAnimationInstance.h
@@ -22,7 +22,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (float)time;
 - (void)setTime:(float) time;
 - (float)endTime;
-- (void)apply;
 - (bool)advanceBy:(double)elapsedSeconds;
 - (int)direction;
 - (void)direction:(int)direction;