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

[unity] Fixed SkeletonutilityBone zPosition property having no effect. Closes #2255.

Browse Source
This commit is contained in:
Harald Csaszar 2023-02-21 14:02:00 +01:00
parent a5fc30cbf2
commit 85a972922a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonUtilityBoneInspector.cs
View File

@ -158,8 +158,10 @@ namespace Spine.Unity.Editor {
} }
} }
EditorGUILayout.PropertyField(zPosition); bool isOverrideMode = mode.enumValueIndex == 1;
EditorGUILayout.PropertyField(position); using (new EditorGUI.DisabledGroupScope(isOverrideMode))
EditorGUILayout.PropertyField(zPosition);
EditorGUILayout.PropertyField(position, new GUIContent("XY Position"));
EditorGUILayout.PropertyField(rotation); EditorGUILayout.PropertyField(rotation);
EditorGUILayout.PropertyField(scale); EditorGUILayout.PropertyField(scale);

6
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonUtility/SkeletonUtilityBone.cs
View File

@ -130,7 +130,8 @@ namespace Spine.Unity {
switch (phase) { switch (phase) {
case UpdatePhase.Local: case UpdatePhase.Local:
if (position) if (position)
thisTransform.localPosition = new Vector3(bone.X * positionScale, bone.Y * positionScale, 0); thisTransform.localPosition = new Vector3(bone.X * positionScale, bone.Y * positionScale,
zPosition ? 0 : thisTransform.localPosition.z);
if (rotation) { if (rotation) {
if (bone.Data.TransformMode.InheritsRotation()) { if (bone.Data.TransformMode.InheritsRotation()) {
@ -149,7 +150,8 @@ namespace Spine.Unity {
case UpdatePhase.World: case UpdatePhase.World:
case UpdatePhase.Complete: case UpdatePhase.Complete:
if (position) if (position)
thisTransform.localPosition = new Vector3(bone.AX * positionScale, bone.AY * positionScale, 0); thisTransform.localPosition = new Vector3(bone.AX * positionScale, bone.AY * positionScale,
zPosition ? 0 : thisTransform.localPosition.z);
if (rotation) { if (rotation) {
if (bone.Data.TransformMode.InheritsRotation()) { if (bone.Data.TransformMode.InheritsRotation()) {