From 0d16ca0b12abed062834f6884896561cf49c2055 Mon Sep 17 00:00:00 2001 From: pharan Date: Tue, 29 May 2018 13:08:09 +0800 Subject: [PATCH] [unity] Rename SkeletonAnimator to SkeletonMecanim. --- ...spector.cs => SkeletonMecanimInspector.cs} | 4 +-- ....meta => SkeletonMecanimInspector.cs.meta} | 0 .../Editor/SpineEditorUtilities.cs | 26 +++++++++---------- ...SkeletonAnimator.cs => SkeletonMecanim.cs} | 2 +- ...imator.cs.meta => SkeletonMecanim.cs.meta} | 0 .../SkeletonUtility/SkeletonUtility.cs | 4 +-- 6 files changed, 17 insertions(+), 19 deletions(-) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{SkeletonAnimatorInspector.cs => SkeletonMecanimInspector.cs} (95%) rename spine-unity/Assets/Spine/Editor/spine-unity/Editor/{SkeletonAnimatorInspector.cs.meta => SkeletonMecanimInspector.cs.meta} (100%) rename spine-unity/Assets/Spine/Runtime/spine-unity/Components/{SkeletonAnimator.cs => SkeletonMecanim.cs} (99%) rename spine-unity/Assets/Spine/Runtime/spine-unity/Components/{SkeletonAnimator.cs.meta => SkeletonMecanim.cs.meta} (100%) diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimatorInspector.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs similarity index 95% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimatorInspector.cs rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs index d33a3b321..34f8d6001 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimatorInspector.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs @@ -33,9 +33,9 @@ using UnityEditor; namespace Spine.Unity.Editor { - [CustomEditor(typeof(SkeletonAnimator))] + [CustomEditor(typeof(SkeletonMecanim))] [CanEditMultipleObjects] - public class SkeletonAnimatorInspector : SkeletonRendererInspector { + public class SkeletonMecanimInspector : SkeletonRendererInspector { protected SerializedProperty mecanimTranslator; protected override void OnEnable () { diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta rename to spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs.meta diff --git a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs index a24e0c8f2..1fa281c20 100644 --- a/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs +++ b/spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs @@ -32,7 +32,7 @@ // Original contribution by: Mitch Thompson -#define SPINE_SKELETONANIMATOR +#define SPINE_SKELETONMECANIM using UnityEngine; using UnityEditor; using System.Collections.Generic; @@ -406,13 +406,13 @@ namespace Spine.Unity.Editor { }); } - #if SPINE_SKELETONANIMATOR + #if SPINE_SKELETONMECANIM menu.AddSeparator(""); - // SkeletonAnimator - menu.AddItem(new GUIContent("SkeletonAnimator"), false, HandleSkeletonComponentDrop, new SpawnMenuData { + // SkeletonMecanim + menu.AddItem(new GUIContent("SkeletonMecanim"), false, HandleSkeletonComponentDrop, new SpawnMenuData { skeletonDataAsset = skeletonDataAsset, spawnPoint = spawnPoint, - instantiateDelegate = (data) => InstantiateSkeletonAnimator(data) + instantiateDelegate = (data) => InstantiateSkeletonMecanim(data) }); #endif @@ -773,7 +773,7 @@ namespace Spine.Unity.Editor { SkeletonData skeletonData = skeletonDataAsset.GetSkeletonData(true); string currentHash = skeletonData != null ? skeletonData.Hash : null; - #if SPINE_SKELETONANIMATOR + #if SPINE_SKELETONMECANIM if (currentHash == null || lastHash != currentHash) UpdateMecanimClips(skeletonDataAsset); #endif @@ -1444,8 +1444,8 @@ namespace Spine.Unity.Editor { } #endregion - #region SkeletonAnimator - #if SPINE_SKELETONANIMATOR + #region SkeletonMecanim + #if SPINE_SKELETONMECANIM static void UpdateMecanimClips (SkeletonDataAsset skeletonDataAsset) { if (skeletonDataAsset.controller == null) return; @@ -1453,13 +1453,13 @@ namespace Spine.Unity.Editor { SkeletonBaker.GenerateMecanimAnimationClips(skeletonDataAsset); } - public static SkeletonAnimator InstantiateSkeletonAnimator (SkeletonDataAsset skeletonDataAsset, string skinName) { - return InstantiateSkeletonAnimator(skeletonDataAsset, skeletonDataAsset.GetSkeletonData(true).FindSkin(skinName)); + public static SkeletonMecanim InstantiateSkeletonMecanim (SkeletonDataAsset skeletonDataAsset, string skinName) { + return InstantiateSkeletonMecanim(skeletonDataAsset, skeletonDataAsset.GetSkeletonData(true).FindSkin(skinName)); } - public static SkeletonAnimator InstantiateSkeletonAnimator (SkeletonDataAsset skeletonDataAsset, Skin skin = null) { + public static SkeletonMecanim InstantiateSkeletonMecanim (SkeletonDataAsset skeletonDataAsset, Skin skin = null) { string spineGameObjectName = string.Format("Spine Mecanim GameObject ({0})", skeletonDataAsset.name.Replace("_SkeletonData", "")); - GameObject go = new GameObject(spineGameObjectName, typeof(MeshFilter), typeof(MeshRenderer), typeof(Animator), typeof(SkeletonAnimator)); + GameObject go = new GameObject(spineGameObjectName, typeof(MeshFilter), typeof(MeshRenderer), typeof(Animator), typeof(SkeletonMecanim)); if (skeletonDataAsset.controller == null) { SkeletonBaker.GenerateMecanimAnimationClips(skeletonDataAsset); @@ -1468,7 +1468,7 @@ namespace Spine.Unity.Editor { go.GetComponent().runtimeAnimatorController = skeletonDataAsset.controller; - SkeletonAnimator anim = go.GetComponent(); + SkeletonMecanim anim = go.GetComponent(); anim.skeletonDataAsset = skeletonDataAsset; IngestAdvancedRenderSettings(anim); diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimator.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs similarity index 99% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimator.cs rename to spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs index 30cf34dee..f35b213df 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimator.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs @@ -33,7 +33,7 @@ using System.Collections.Generic; namespace Spine.Unity { [RequireComponent(typeof(Animator))] - public class SkeletonAnimator : SkeletonRenderer, ISkeletonAnimation { + public class SkeletonMecanim : SkeletonRenderer, ISkeletonAnimation { [SerializeField] protected MecanimTranslator translator; public MecanimTranslator Translator { get { return translator; } } diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimator.cs.meta b/spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs.meta similarity index 100% rename from spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimator.cs.meta rename to spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs.meta diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtility.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtility.cs index 8280a05d3..a46959fbc 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtility.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtility.cs @@ -152,9 +152,7 @@ namespace Spine.Unity { } if (skeletonAnimation == null) { - skeletonAnimation = GetComponent(); - if (skeletonAnimation == null) - skeletonAnimation = GetComponent(); + skeletonAnimation = GetComponent(typeof(ISkeletonAnimation)) as ISkeletonAnimation; } skeletonRenderer.OnRebuild -= HandleRendererReset;