UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-26 22:49:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update SpineController and SpineController.Builder API

Browse Source
This commit is contained in:
Denis Andrasec 2024-07-10 11:53:08 +02:00
parent fc4716f749
commit 77778a0e3a
9 changed files with 138 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-android/app/src/main/java/com/esotericsoftware/spine/AnimationStateEvents.kt
View File

@ -29,8 +29,7 @@ fun AnimationState(nav: NavHostController) {
val TAG = "AnimationState" val TAG = "AnimationState"
val controller = remember { val controller = remember {
SpineController.Builder() SpineController { controller ->
.setOnInitialized { controller ->
controller.skeleton.setScaleX(0.5f) controller.skeleton.setScaleX(0.5f)
controller.skeleton.setScaleY(0.5f) controller.skeleton.setScaleY(0.5f)
@ -108,7 +107,6 @@ fun AnimationState(nav: NavHostController) {
}) })
Log.d(TAG, "Current: ${controller.animationState.getCurrent(0)?.getAnimation()?.getName()}"); Log.d(TAG, "Current: ${controller.animationState.getCurrent(0)?.getAnimation()?.getName()}");
} }
.build()
} }
Scaffold( Scaffold(

5
spine-android/app/src/main/java/com/esotericsoftware/spine/DebugRendering.kt
View File

@ -47,9 +47,8 @@ fun DebugRendering(nav: NavHostController) {
"spineboy.atlas", "spineboy.atlas",
"spineboy-pro.json", "spineboy-pro.json",
context, context,
SpineController.Builder() SpineController.Builder { controller ->
.setOnInitialized { controller.animationState.setAnimation(0, "walk", true)
it.animationState.setAnimation(0, "walk", true)
} }
.setOnAfterPaint { controller, canvas, commands -> .setOnAfterPaint { controller, canvas, commands ->
debugRenderer.render(controller.drawable, canvas, commands) debugRenderer.render(controller.drawable, canvas, commands)

6
spine-android/app/src/main/java/com/esotericsoftware/spine/DressUp.kt
View File

@ -75,11 +75,9 @@ fun DressUp(nav: NavHostController) {
} }
val controller = remember { val controller = remember {
SpineController.Builder() SpineController { controller ->
.setOnInitialized { controller.animationState.setAnimation(0, "dance", true)
it.animationState.setAnimation(0, "dance", true)
} }
.build()
} }
fun toggleSkin(skinName: String) { fun toggleSkin(skinName: String) {

7
spine-android/app/src/main/java/com/esotericsoftware/spine/IKFollowing.kt
View File

@ -35,10 +35,9 @@ fun IKFollowing(nav: NavHostController) {
val crossHairPosition = remember { mutableStateOf<Point?>(null) } val crossHairPosition = remember { mutableStateOf<Point?>(null) }
val controller = remember { val controller = remember {
SpineController.Builder() SpineController.Builder { controller ->
.setOnInitialized { controller.animationState.setAnimation(0, "walk", true)
it.animationState.setAnimation(0, "walk", true) controller.animationState.setAnimation(1, "aim", true)
it.animationState.setAnimation(1, "aim", true)
} }
.setOnAfterUpdateWorldTransforms { .setOnAfterUpdateWorldTransforms {
val worldPosition = crossHairPosition.value ?: return@setOnAfterUpdateWorldTransforms val worldPosition = crossHairPosition.value ?: return@setOnAfterUpdateWorldTransforms

3
spine-android/app/src/main/java/com/esotericsoftware/spine/Physics.kt
View File

@ -36,8 +36,7 @@ fun Physics(nav: NavHostController) {
val lastMousePosition = remember { mutableStateOf<Point?>(null) } val lastMousePosition = remember { mutableStateOf<Point?>(null) }
val controller = remember { val controller = remember {
SpineController.Builder() SpineController.Builder { controller ->
.setOnInitialized { controller ->
controller.animationState.setAnimation(0, "eyeblink-long", true) controller.animationState.setAnimation(0, "eyeblink-long", true)
controller.animationState.setAnimation(1, "wings-and-feet", true) controller.animationState.setAnimation(1, "wings-and-feet", true)
} }

7
spine-android/app/src/main/java/com/esotericsoftware/spine/PlayPause.kt
View File

@ -26,12 +26,9 @@ fun PlayPause(
nav: NavHostController nav: NavHostController
) { ) {
val controller = remember { val controller = remember {
SpineController.Builder() SpineController { controller ->
.setOnInitialized { controller.animationState.setAnimation(0, "flying", true)
it.animationState.setAnimation(0, "flying", true)
} }
.build()
} }
val isPlaying = remember { mutableStateOf(controller.isPlaying) } val isPlaying = remember { mutableStateOf(controller.isPlaying) }

4
spine-android/app/src/main/java/com/esotericsoftware/spine/SimpleAnimation.kt
View File

@ -40,11 +40,9 @@ fun SimpleAnimation(nav: NavHostController) {
"spineboy.atlas", "spineboy.atlas",
"spineboy-pro.json", "spineboy-pro.json",
context, context,
SpineController.Builder() SpineController {
.setOnInitialized {
it.animationState.setAnimation(0, "walk", true) it.animationState.setAnimation(0, "walk", true)
} }
.build()
) )
}, },
modifier = Modifier.padding(paddingValues) modifier = Modifier.padding(paddingValues)

14
spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/SpineController.java
View File

@ -17,15 +17,14 @@ import com.esotericsoftware.spine.android.utils.SpineControllerCallback;
public class SpineController { public class SpineController {
public static class Builder { public static class Builder {
private SpineControllerCallback onInitialized; private final SpineControllerCallback onInitialized;
private SpineControllerCallback onBeforeUpdateWorldTransforms; private SpineControllerCallback onBeforeUpdateWorldTransforms;
private SpineControllerCallback onAfterUpdateWorldTransforms; private SpineControllerCallback onAfterUpdateWorldTransforms;
private SpineControllerBeforePaintCallback onBeforePaint; private SpineControllerBeforePaintCallback onBeforePaint;
private SpineControllerAfterPaintCallback onAfterPaint; private SpineControllerAfterPaintCallback onAfterPaint;
public Builder setOnInitialized(SpineControllerCallback onInitialized) { public Builder(SpineControllerCallback onInitialized) {
this.onInitialized = onInitialized; this.onInitialized = onInitialized;
return this;
} }
public Builder setOnBeforeUpdateWorldTransforms(SpineControllerCallback onBeforeUpdateWorldTransforms) { public Builder setOnBeforeUpdateWorldTransforms(SpineControllerCallback onBeforeUpdateWorldTransforms) {
@ -49,8 +48,7 @@ public class SpineController {
} }
public SpineController build() { public SpineController build() {
SpineController spineController = new SpineController(); SpineController spineController = new SpineController(onInitialized);
spineController.onInitialized = onInitialized;
spineController.onBeforeUpdateWorldTransforms = onBeforeUpdateWorldTransforms; spineController.onBeforeUpdateWorldTransforms = onBeforeUpdateWorldTransforms;
spineController.onAfterUpdateWorldTransforms = onAfterUpdateWorldTransforms; spineController.onAfterUpdateWorldTransforms = onAfterUpdateWorldTransforms;
spineController.onBeforePaint = onBeforePaint; spineController.onBeforePaint = onBeforePaint;
@ -59,7 +57,7 @@ public class SpineController {
} }
} }
private @Nullable SpineControllerCallback onInitialized; private final SpineControllerCallback onInitialized;
private @Nullable SpineControllerCallback onBeforeUpdateWorldTransforms; private @Nullable SpineControllerCallback onBeforeUpdateWorldTransforms;
private @Nullable SpineControllerCallback onAfterUpdateWorldTransforms; private @Nullable SpineControllerCallback onAfterUpdateWorldTransforms;
private @Nullable SpineControllerBeforePaintCallback onBeforePaint; private @Nullable SpineControllerBeforePaintCallback onBeforePaint;
@ -71,6 +69,10 @@ public class SpineController {
private double scaleX = 1; private double scaleX = 1;
private double scaleY = 1; private double scaleY = 1;
public SpineController(SpineControllerCallback onInitialized) {
this.onInitialized = onInitialized;
}
protected void init(AndroidSkeletonDrawable drawable) { protected void init(AndroidSkeletonDrawable drawable) {
this.drawable = drawable; this.drawable = drawable;
if (onInitialized != null) { if (onInitialized != null) {

4
spine-android/spine-android/src/main/java/com/esotericsoftware/spine/android/SpineView.java
View File

@ -120,12 +120,12 @@ public class SpineView extends View implements Choreographer.FrameCallback {
public SpineView (Context context, AttributeSet attrs) { public SpineView (Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
this.controller = new SpineController(); // TODO Load controller & assets fro attrs
} }
public SpineView (Context context, AttributeSet attrs, int defStyle) { public SpineView (Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle); super(context, attrs, defStyle);
this.controller = new SpineController(); // TODO Load controller & assets fro attrs
} }
public static SpineView loadFromAssets(String atlasFileName, String skeletonFileName, Context context, SpineController controller) { public static SpineView loadFromAssets(String atlasFileName, String skeletonFileName, Context context, SpineController controller) {