UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-10 00:58:43 +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

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

@ -29,86 +29,84 @@ fun AnimationState(nav: NavHostController) {
val TAG = "AnimationState"
val controller = remember {
SpineController.Builder()
.setOnInitialized { controller ->
controller.skeleton.setScaleX(0.5f)
controller.skeleton.setScaleY(0.5f)
SpineController { controller ->
controller.skeleton.setScaleX(0.5f)
controller.skeleton.setScaleY(0.5f)
controller.skeleton.findSlot("gun")?.color = Color(1f, 0f, 0f, 1f)
controller.skeleton.findSlot("gun")?.color = Color(1f, 0f, 0f, 1f)
controller.animationStateData.setDefaultMix(0.2f)
controller.animationState.setAnimation(0, "walk", true).setListener(object : AnimationState.AnimationStateListener {
override fun start(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event start")
controller.animationStateData.setDefaultMix(0.2f)
controller.animationState.setAnimation(0, "walk", true).setListener(object : AnimationState.AnimationStateListener {
override fun start(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event start")
}
override fun interrupt(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event interrupt")
}
override fun end(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event end")
}
override fun dispose(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event dispose")
}
override fun complete(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event complete")
}
override fun event(entry: AnimationState.TrackEntry?, event: Event?) {
Log.d(TAG, "Walk animation event event")
}
})
controller.animationState.addAnimation(0, "jump", false, 2f)
controller.animationState.addAnimation(0, "run", true, 0f).setListener(object : AnimationState.AnimationStateListener {
override fun start(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event start")
}
override fun interrupt(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event interrupt")
}
override fun end(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event end")
}
override fun dispose(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event dispose")
}
override fun complete(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event complete")
}
override fun event(entry: AnimationState.TrackEntry?, event: Event?) {
Log.d(TAG, "Run animation event event")
}
})
controller.animationState.addListener(object : AnimationState.AnimationStateListener {
override fun start(entry: AnimationState.TrackEntry?) {}
override fun interrupt(entry: AnimationState.TrackEntry?) {}
override fun end(entry: AnimationState.TrackEntry?) {}
override fun dispose(entry: AnimationState.TrackEntry?) {}
override fun complete(entry: AnimationState.TrackEntry?) {}
override fun event(entry: AnimationState.TrackEntry?, event: Event?) {
if (event != null) {
Log.d(TAG, "User event: { name: ${event.data.name}, intValue: ${event.int}, floatValue: ${event.float}, stringValue: ${event.string} }")
}
override fun interrupt(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event interrupt")
}
override fun end(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event end")
}
override fun dispose(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event dispose")
}
override fun complete(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Walk animation event complete")
}
override fun event(entry: AnimationState.TrackEntry?, event: Event?) {
Log.d(TAG, "Walk animation event event")
}
})
controller.animationState.addAnimation(0, "jump", false, 2f)
controller.animationState.addAnimation(0, "run", true, 0f).setListener(object : AnimationState.AnimationStateListener {
override fun start(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event start")
}
override fun interrupt(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event interrupt")
}
override fun end(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event end")
}
override fun dispose(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event dispose")
}
override fun complete(entry: AnimationState.TrackEntry?) {
Log.d(TAG, "Run animation event complete")
}
override fun event(entry: AnimationState.TrackEntry?, event: Event?) {
Log.d(TAG, "Run animation event event")
}
})
controller.animationState.addListener(object : AnimationState.AnimationStateListener {
override fun start(entry: AnimationState.TrackEntry?) {}
override fun interrupt(entry: AnimationState.TrackEntry?) {}
override fun end(entry: AnimationState.TrackEntry?) {}
override fun dispose(entry: AnimationState.TrackEntry?) {}
override fun complete(entry: AnimationState.TrackEntry?) {}
override fun event(entry: AnimationState.TrackEntry?, event: Event?) {
if (event != null) {
Log.d(TAG, "User event: { name: ${event.data.name}, intValue: ${event.int}, floatValue: ${event.float}, stringValue: ${event.string} }")
}
}
})
Log.d(TAG, "Current: ${controller.animationState.getCurrent(0)?.getAnimation()?.getName()}");
}
.build()
}
})
Log.d(TAG, "Current: ${controller.animationState.getCurrent(0)?.getAnimation()?.getName()}");
}
}
Scaffold(

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

@ -47,14 +47,13 @@ fun DebugRendering(nav: NavHostController) {
"spineboy.atlas",
"spineboy-pro.json",
context,
SpineController.Builder()
.setOnInitialized {
it.animationState.setAnimation(0, "walk", true)
}
.setOnAfterPaint { controller, canvas, commands ->
debugRenderer.render(controller.drawable, canvas, commands)
}
.build()
SpineController.Builder { controller ->
controller.animationState.setAnimation(0, "walk", true)
}
.setOnAfterPaint { controller, canvas, commands ->
debugRenderer.render(controller.drawable, canvas, commands)
}
.build()
)
},
modifier = Modifier.padding(paddingValues)

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

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

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

@ -35,21 +35,20 @@ fun IKFollowing(nav: NavHostController) {
val crossHairPosition = remember { mutableStateOf<Point?>(null) }
val controller = remember {
SpineController.Builder()
.setOnInitialized {
it.animationState.setAnimation(0, "walk", true)
it.animationState.setAnimation(1, "aim", true)
}
.setOnAfterUpdateWorldTransforms {
val worldPosition = crossHairPosition.value ?: return@setOnAfterUpdateWorldTransforms
val skeleton = it.skeleton
val bone = skeleton.findBone("crosshair") ?: return@setOnAfterUpdateWorldTransforms
val parent = bone.parent ?: return@setOnAfterUpdateWorldTransforms
val position = parent.worldToLocal(Vector2(worldPosition.x.toFloat(), worldPosition.y.toFloat()))
bone.x = position.x
bone.y = position.y
}
.build()
SpineController.Builder { controller ->
controller.animationState.setAnimation(0, "walk", true)
controller.animationState.setAnimation(1, "aim", true)
}
.setOnAfterUpdateWorldTransforms {
val worldPosition = crossHairPosition.value ?: return@setOnAfterUpdateWorldTransforms
val skeleton = it.skeleton
val bone = skeleton.findBone("crosshair") ?: return@setOnAfterUpdateWorldTransforms
val parent = bone.parent ?: return@setOnAfterUpdateWorldTransforms
val position = parent.worldToLocal(Vector2(worldPosition.x.toFloat(), worldPosition.y.toFloat()))
bone.x = position.x
bone.y = position.y
}
.build()
}
Scaffold(

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

@ -36,31 +36,30 @@ fun Physics(nav: NavHostController) {
val lastMousePosition = remember { mutableStateOf<Point?>(null) }
val controller = remember {
SpineController.Builder()
.setOnInitialized { controller ->
controller.animationState.setAnimation(0, "eyeblink-long", true)
controller.animationState.setAnimation(1, "wings-and-feet", true)
SpineController.Builder { controller ->
controller.animationState.setAnimation(0, "eyeblink-long", true)
controller.animationState.setAnimation(1, "wings-and-feet", true)
}
.setOnAfterUpdateWorldTransforms { controller ->
val lastMousePositionValue = lastMousePosition.value
if (lastMousePositionValue == null) {
lastMousePosition.value = mousePosition.value
return@setOnAfterUpdateWorldTransforms
}
.setOnAfterUpdateWorldTransforms { controller ->
val lastMousePositionValue = lastMousePosition.value
if (lastMousePositionValue == null) {
lastMousePosition.value = mousePosition.value
return@setOnAfterUpdateWorldTransforms
}
val mousePositionValue = mousePosition.value ?: return@setOnAfterUpdateWorldTransforms
val mousePositionValue = mousePosition.value ?: return@setOnAfterUpdateWorldTransforms
val dx = mousePositionValue.x - lastMousePositionValue.x
val dy = mousePositionValue.y - lastMousePositionValue.y
val position = Point(
controller.skeleton.x.toInt(),
controller.skeleton.y.toInt()
)
position.x += dx
position.y += dy
controller.skeleton.setPosition(position.x.toFloat(), position.y.toFloat());
lastMousePosition.value = mousePositionValue
}
.build()
val dx = mousePositionValue.x - lastMousePositionValue.x
val dy = mousePositionValue.y - lastMousePositionValue.y
val position = Point(
controller.skeleton.x.toInt(),
controller.skeleton.y.toInt()
)
position.x += dx
position.y += dy
controller.skeleton.setPosition(position.x.toFloat(), position.y.toFloat());
lastMousePosition.value = mousePositionValue
}
.build()
}
Scaffold(

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

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

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

@ -40,11 +40,9 @@ fun SimpleAnimation(nav: NavHostController) {
"spineboy.atlas",
"spineboy-pro.json",
context,
SpineController.Builder()
.setOnInitialized {
it.animationState.setAnimation(0, "walk", true)
}
.build()
SpineController {
it.animationState.setAnimation(0, "walk", true)
}
)
},
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 static class Builder {
private SpineControllerCallback onInitialized;
private final SpineControllerCallback onInitialized;
private SpineControllerCallback onBeforeUpdateWorldTransforms;
private SpineControllerCallback onAfterUpdateWorldTransforms;
private SpineControllerBeforePaintCallback onBeforePaint;
private SpineControllerAfterPaintCallback onAfterPaint;
public Builder setOnInitialized(SpineControllerCallback onInitialized) {
public Builder(SpineControllerCallback onInitialized) {
this.onInitialized = onInitialized;
return this;
}
public Builder setOnBeforeUpdateWorldTransforms(SpineControllerCallback onBeforeUpdateWorldTransforms) {
@ -49,8 +48,7 @@ public class SpineController {
}
public SpineController build() {
SpineController spineController = new SpineController();
spineController.onInitialized = onInitialized;
SpineController spineController = new SpineController(onInitialized);
spineController.onBeforeUpdateWorldTransforms = onBeforeUpdateWorldTransforms;
spineController.onAfterUpdateWorldTransforms = onAfterUpdateWorldTransforms;
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 onAfterUpdateWorldTransforms;
private @Nullable SpineControllerBeforePaintCallback onBeforePaint;
@ -71,6 +69,10 @@ public class SpineController {
private double scaleX = 1;
private double scaleY = 1;
public SpineController(SpineControllerCallback onInitialized) {
this.onInitialized = onInitialized;
}
protected void init(AndroidSkeletonDrawable drawable) {
this.drawable = drawable;
if (onInitialized != null) {

6
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) {
super(context, attrs);
this.controller = new SpineController();
// TODO Load controller & assets fro attrs
}
public SpineView (Context context, AttributeSet attrs, int 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) {