UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-06 23:34:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1-beta' into 4.2-beta

Browse Source 
# Conflicts:
#	spine-ts/package-lock.json
#	spine-ts/package.json
#	spine-ts/spine-canvas/package.json
#	spine-ts/spine-core/package.json
#	spine-ts/spine-player/package.json
#	spine-ts/spine-threejs/package.json
#	spine-ts/spine-webgl/package.json
This commit is contained in:
Mario Zechner 2022-04-07 08:31:21 +02:00
commit 5bc6082ee5
6 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-cpp/spine-cpp/src/spine/SkeletonJson.cpp
View File

@ -418,6 +418,8 @@ SkeletonData *SkeletonJson::readSkeletonData(const char *json) {
data->_spacingMode = SpacingMode_Fixed;
else if (strcmp(item, "percent") == 0)
data->_spacingMode = SpacingMode_Percent;
else
data->_spacingMode = SpacingMode_Proportional;
item = Json::getString(constraintMap, "rotateMode", "tangent");
if (strcmp(item, "tangent") == 0) data->_rotateMode = RotateMode_Tangent;

11
spine-csharp/src/TextureRegion.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 17b4075f6e1d4e5478f4730c2f4cc54d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
spine-ts/spine-core/src/SkeletonBinary.ts
View File

@ -1058,7 +1058,7 @@ export class BinaryInput {
let chars = "";
let charCount = 0;
for (let i = 0; i < byteCount;) {
let b = this.readByte();
let b = this.readUnsignedByte();
switch (b >> 4) {
case 12:
case 13:

20
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateGraphicTrackInspector.cs
View File

@ -34,7 +34,7 @@ using UnityEngine;
using UnityEngine.Timeline;
namespace Spine.Unity.Editor {
#if UNITY_2019_1_OR_NEWER
[CustomTimelineEditor(typeof(SpineAnimationStateGraphicTrack))]
[CanEditMultipleObjects]
public class SpineAnimationStateGraphicTrackInspector : TrackEditor {
@ -46,4 +46,22 @@ namespace Spine.Unity.Editor {
return options;
}
}
#else
[CustomEditor(typeof(SpineAnimationStateGraphicTrack))]
[CanEditMultipleObjects]
public class SpineAnimationStateGraphicTrackInspector : UnityEditor.Editor {
protected SerializedProperty trackIndexProperty = null;
public void OnEnable () {
trackIndexProperty = serializedObject.FindProperty("trackIndex");
}
public override void OnInspectorGUI () {
serializedObject.Update();
EditorGUILayout.PropertyField(trackIndexProperty);
serializedObject.ApplyModifiedProperties();
}
}
#endif
}

19
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineAnimationStateTrackInspector.cs
View File

@ -34,6 +34,7 @@ using UnityEngine;
using UnityEngine.Timeline;
namespace Spine.Unity.Editor {
#if UNITY_2019_1_OR_NEWER
[CustomTimelineEditor(typeof(SpineAnimationStateTrack))]
[CanEditMultipleObjects]
public class SpineAnimationStateTrackInspector : TrackEditor {
@ -45,4 +46,22 @@ namespace Spine.Unity.Editor {
return options;
}
}
#else
[CustomEditor(typeof(SpineAnimationStateTrack))]
[CanEditMultipleObjects]
public class SpineAnimationStateTrackInspector : UnityEditor.Editor {
protected SerializedProperty trackIndexProperty = null;
public void OnEnable () {
trackIndexProperty = serializedObject.FindProperty("trackIndex");
}
public override void OnInspectorGUI () {
serializedObject.Update();
EditorGUILayout.PropertyField(trackIndexProperty);
serializedObject.ApplyModifiedProperties();
}
}
#endif
}

2
spine-unity/Modules/com.esotericsoftware.spine.timeline/Editor/SpineSkeletonFlipTrackInspector.cs
View File

@ -34,6 +34,7 @@ using UnityEngine;
using UnityEngine.Timeline;
namespace Spine.Unity.Editor {
#if UNITY_2019_1_OR_NEWER
[CustomTimelineEditor(typeof(SpineSkeletonFlipTrack))]
[CanEditMultipleObjects]
public class SpineSkeletonFlipTrackInspector : TrackEditor {
@ -45,4 +46,5 @@ namespace Spine.Unity.Editor {
return options;
}
}
#endif
}