Hacked in play/pause to SwiftUI #28
Merged
+300
−98
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mjtalbot
reviewed
May 11, 2021
| @@ -58,7 +58,7 @@ class LayoutViewController: UIViewController { | |||
| default: | |||
| fit = Fit.Contain | |||
| } | |||
| layoutView.riveView.setFit(fit:fit) | |||
| layoutView.riveView.fit = fit | |||
mjtalbot
reviewed
May 11, 2021
| @@ -81,6 +81,7 @@ typedef NS_ENUM(NSInteger, Alignment) { | |||
| - (const RiveSMIBool *)getBool:(NSString*)name; | |||
| - (const RiveSMITrigger *)getTrigger:(NSString*)name; | |||
| - (const RiveSMINumber *)getNumber:(NSString*)name; | |||
| - (NSString* )name; | |||
There was a problem hiding this comment.
:o does the instance even have a name?
mjtalbot
reviewed
May 11, 2021
| @@ -32,7 +32,7 @@ - (instancetype)initWithStateMachine:(const rive::StateMachine *)stateMachine; | |||
| * RiveStateMachine interface | |||
| */ | |||
| @interface RiveStateMachine () | |||
| - (instancetype)initWithStateMachine:(const rive::StateMachine *)riveStateMachine; | |||
| - (instancetype)initWithStateMachine:(const rive::StateMachine *)stateMachine; | |||
There was a problem hiding this comment.
ohh :P yeah there's a question of names like this :P should we prefix everything with rive, or leave that as implied...
mjtalbot
reviewed
May 11, 2021
| instance = new rive::StateMachineInstance(stateMachine); | ||
| return self; | ||
| } else { | ||
| return nil; | ||
| } | ||
| } | ||
|
|
||
| -(void) applyTo:(RiveArtboard*) artboard { | ||
| - (void) applyTo:(RiveArtboard*)artboard { |
There was a problem hiding this comment.
what formatter do you use? my xcode doesnt do shit for formatting, is there something we can use here?
mjtalbot
reviewed
May 11, 2021
| @@ -541,6 +543,11 @@ - (RiveSMINumber *)getNumber:(NSString *) name { | |||
| } | |||
| } | |||
|
|
|||
| - (NSString *)name { | |||
| std::string str = stateMachine->name(); | |||
mjtalbot
reviewed
May 11, 2021
| private func _pause(_ animation: RiveLinearAnimationInstance) { | ||
| let removed = playingAnimations.remove(animation) | ||
| if removed != nil { | ||
| eventQueue.add( { self.pauseDelegate?.pause(animation.name()) } ) |
There was a problem hiding this comment.
ohhhh... maybe i should do it this way in android too.... i currently just call the callback
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.