From cf7447628b60b931902493b92f747c6c02a2be59 Mon Sep 17 00:00:00 2001 From: pharan Date: Thu, 1 Feb 2018 13:04:27 +0800 Subject: [PATCH] [unity] Use IHasSkeletonDataAsset interface. --- .../spine-unity/Editor/SpineAttributeDrawers.cs | 14 +++++++------- .../spine-unity/Editor/SpineInspectorUtility.cs | 4 ++-- .../Assets/spine-unity/ISkeletonAnimation.cs | 2 +- .../Modules/SkeletonGraphic/SkeletonGraphic.cs | 2 +- spine-unity/Assets/spine-unity/SkeletonRenderer.cs | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs index 55d1f3ae8..ca11f4269 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineAttributeDrawers.cs @@ -79,10 +79,10 @@ namespace Spine.Unity.Editor { var objectReferenceValue = dataField.objectReferenceValue; if (objectReferenceValue is SkeletonDataAsset) { skeletonDataAsset = (SkeletonDataAsset)objectReferenceValue; - } else if (objectReferenceValue is ISkeletonComponent) { - var skeletonComponent = (ISkeletonComponent)objectReferenceValue; - if (skeletonComponent != null) - skeletonDataAsset = skeletonComponent.SkeletonDataAsset; + } else if (objectReferenceValue is IHasSkeletonDataAsset) { + var hasSkeletonDataAsset = (IHasSkeletonDataAsset)objectReferenceValue; + if (hasSkeletonDataAsset != null) + skeletonDataAsset = hasSkeletonDataAsset.SkeletonDataAsset; } else if (objectReferenceValue != null) { EditorGUI.LabelField(position, "ERROR:", "Invalid reference type"); return; @@ -90,9 +90,9 @@ namespace Spine.Unity.Editor { } else if (property.serializedObject.targetObject is Component) { var component = (Component)property.serializedObject.targetObject; - var skeletonComponent = component.GetComponentInChildren(typeof(ISkeletonComponent)) as ISkeletonComponent; - if (skeletonComponent != null) - skeletonDataAsset = skeletonComponent.SkeletonDataAsset; + var hasSkeletonDataAsset = component.GetComponentInChildren(typeof(IHasSkeletonDataAsset)) as IHasSkeletonDataAsset; + if (hasSkeletonDataAsset != null) + skeletonDataAsset = hasSkeletonDataAsset.SkeletonDataAsset; } if (skeletonDataAsset == null) { diff --git a/spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs b/spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs index 49889d3ea..d6b46271e 100644 --- a/spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs +++ b/spine-unity/Assets/spine-unity/Editor/SpineInspectorUtility.cs @@ -220,9 +220,9 @@ namespace Spine.Unity.Editor { public static bool TargetsUseSameData (SerializedObject so) { if (so.isEditingMultipleObjects) { int n = so.targetObjects.Length; - var first = so.targetObjects[0] as ISkeletonComponent; + var first = so.targetObjects[0] as IHasSkeletonDataAsset; for (int i = 1; i < n; i++) { - var sr = so.targetObjects[i] as ISkeletonComponent; + var sr = so.targetObjects[i] as IHasSkeletonDataAsset; if (sr != null && sr.SkeletonDataAsset != first.SkeletonDataAsset) return false; } diff --git a/spine-unity/Assets/spine-unity/ISkeletonAnimation.cs b/spine-unity/Assets/spine-unity/ISkeletonAnimation.cs index f5e423adf..ebacb56fc 100644 --- a/spine-unity/Assets/spine-unity/ISkeletonAnimation.cs +++ b/spine-unity/Assets/spine-unity/ISkeletonAnimation.cs @@ -42,7 +42,7 @@ namespace Spine.Unity { } /// Holds a reference to a SkeletonDataAsset. - public interface ISkeletonDataAssetComponent { + public interface IHasSkeletonDataAsset { /// Gets the SkeletonDataAsset of the Spine Component. SkeletonDataAsset SkeletonDataAsset { get; } } diff --git a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs index 25e4d688c..3e04344b0 100644 --- a/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs +++ b/spine-unity/Assets/spine-unity/Modules/SkeletonGraphic/SkeletonGraphic.cs @@ -35,7 +35,7 @@ using Spine; namespace Spine.Unity { [ExecuteInEditMode, RequireComponent(typeof(CanvasRenderer), typeof(RectTransform)), DisallowMultipleComponent] [AddComponentMenu("Spine/SkeletonGraphic (Unity UI Canvas)")] - public class SkeletonGraphic : MaskableGraphic, ISkeletonComponent, IAnimationStateComponent, ISkeletonAnimation, ISkeletonDataAssetComponent { + public class SkeletonGraphic : MaskableGraphic, ISkeletonComponent, IAnimationStateComponent, ISkeletonAnimation, IHasSkeletonDataAsset { #region Inspector public SkeletonDataAsset skeletonDataAsset; diff --git a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs index 356cbd21f..17d851384 100644 --- a/spine-unity/Assets/spine-unity/SkeletonRenderer.cs +++ b/spine-unity/Assets/spine-unity/SkeletonRenderer.cs @@ -38,7 +38,7 @@ namespace Spine.Unity { /// Renders a skeleton. [ExecuteInEditMode, RequireComponent(typeof(MeshFilter), typeof(MeshRenderer)), DisallowMultipleComponent] [HelpURL("http://esotericsoftware.com/spine-unity-documentation#Rendering")] - public class SkeletonRenderer : MonoBehaviour, ISkeletonComponent, ISkeletonDataAssetComponent { + public class SkeletonRenderer : MonoBehaviour, ISkeletonComponent, IHasSkeletonDataAsset { public delegate void SkeletonRendererDelegate (SkeletonRenderer skeletonRenderer); public event SkeletonRendererDelegate OnRebuild;