mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2025-12-21 01:36:02 +08:00
[unity] Timeline flip track now displays Flip X/Y in track editor instead of class name. Closes #1863.
This commit is contained in:
parent
0fb0b065d7
commit
26b6d0816c
@ -0,0 +1,69 @@
|
|||||||
|
/******************************************************************************
|
||||||
|
* Spine Runtimes License Agreement
|
||||||
|
* Last updated January 1, 2020. Replaces all prior versions.
|
||||||
|
*
|
||||||
|
* Copyright (c) 2013-2020, Esoteric Software LLC
|
||||||
|
*
|
||||||
|
* Integration of the Spine Runtimes into software or otherwise creating
|
||||||
|
* derivative works of the Spine Runtimes is permitted under the terms and
|
||||||
|
* conditions of Section 2 of the Spine Editor License Agreement:
|
||||||
|
* http://esotericsoftware.com/spine-editor-license
|
||||||
|
*
|
||||||
|
* Otherwise, it is permitted to integrate the Spine Runtimes into software
|
||||||
|
* or otherwise create derivative works of the Spine Runtimes (collectively,
|
||||||
|
* "Products"), provided that each user of the Products must obtain their own
|
||||||
|
* Spine Editor license and redistribution of the Products in any form must
|
||||||
|
* include this license and copyright notice.
|
||||||
|
*
|
||||||
|
* THE SPINE RUNTIMES ARE PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES,
|
||||||
|
* BUSINESS INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
||||||
|
* THE SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#if UNITY_2019_1_OR_NEWER
|
||||||
|
#define TIMELINE_HAS_CLIPEDITOR_CLASS
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if TIMELINE_HAS_CLIPEDITOR_CLASS
|
||||||
|
|
||||||
|
using UnityEditor;
|
||||||
|
using Spine.Unity.Playables;
|
||||||
|
using UnityEditor.Timeline;
|
||||||
|
using UnityEngine.Timeline;
|
||||||
|
|
||||||
|
namespace Spine.Unity.Editor {
|
||||||
|
|
||||||
|
[CustomTimelineEditor(typeof(SpineSkeletonFlipClip))]
|
||||||
|
public class SpineSkeletonFlipClipEditor : ClipEditor {
|
||||||
|
|
||||||
|
public override void OnCreate (TimelineClip clip, TrackAsset track, TimelineClip clonedFrom) {
|
||||||
|
SetDisplayName(clip);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnClipChanged (TimelineClip clip) {
|
||||||
|
SetDisplayName(clip);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void SetDisplayName(TimelineClip clip) {
|
||||||
|
var flipClip = (SpineSkeletonFlipClip)clip.asset;
|
||||||
|
if (flipClip != null) {
|
||||||
|
bool flipX = false, flipY = false;
|
||||||
|
var settings = flipClip.template;
|
||||||
|
if (settings != null) {
|
||||||
|
flipX = settings.flipX;
|
||||||
|
flipY = settings.flipY;
|
||||||
|
}
|
||||||
|
clip.displayName = "Flip" + (flipX ? " X" : "") + (flipY ? " Y" : "");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // TIMELINE_HAS_CLIPEDITOR_CLASS
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9c2fd7cd6094bcc4291fb8ae1dbae1ab
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -4,7 +4,8 @@
|
|||||||
"spine-unity",
|
"spine-unity",
|
||||||
"spine-unity-editor",
|
"spine-unity-editor",
|
||||||
"spine-timeline",
|
"spine-timeline",
|
||||||
"Unity.Timeline"
|
"Unity.Timeline",
|
||||||
|
"Unity.Timeline.Editor"
|
||||||
],
|
],
|
||||||
"optionalUnityReferences": [],
|
"optionalUnityReferences": [],
|
||||||
"includePlatforms": [
|
"includePlatforms": [
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
"name": "com.esotericsoftware.spine.timeline",
|
"name": "com.esotericsoftware.spine.timeline",
|
||||||
"displayName": "Spine Timeline Extensions",
|
"displayName": "Spine Timeline Extensions",
|
||||||
"description": "This plugin provides integration of spine-unity for the Unity Timeline.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 3.8 from 2019-10-03 or newer.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)",
|
"description": "This plugin provides integration of spine-unity for the Unity Timeline.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 3.8 from 2019-10-03 or newer.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)",
|
||||||
"version": "3.8.3",
|
"version": "3.8.4",
|
||||||
"unity": "2018.3",
|
"unity": "2018.3",
|
||||||
"author": {
|
"author": {
|
||||||
"name": "Esoteric Software",
|
"name": "Esoteric Software",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user