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] Rename SkeletonAnimator to SkeletonMecanim.

Browse Source
This commit is contained in:
pharan 2018-05-29 13:08:09 +08:00
parent 065a10f4b3
commit 0d16ca0b12
6 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimatorInspector.cs → spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs
View File

@ -33,9 +33,9 @@
using UnityEditor; using UnityEditor;
namespace Spine.Unity.Editor { namespace Spine.Unity.Editor {
[CustomEditor(typeof(SkeletonAnimator))] [CustomEditor(typeof(SkeletonMecanim))]
[CanEditMultipleObjects] [CanEditMultipleObjects]
public class SkeletonAnimatorInspector : SkeletonRendererInspector { public class SkeletonMecanimInspector : SkeletonRendererInspector {
protected SerializedProperty mecanimTranslator; protected SerializedProperty mecanimTranslator;
protected override void OnEnable () { protected override void OnEnable () {

0
spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonAnimatorInspector.cs.meta → spine-unity/Assets/Spine/Editor/spine-unity/Editor/SkeletonMecanimInspector.cs.meta
View File

26
spine-unity/Assets/Spine/Editor/spine-unity/Editor/SpineEditorUtilities.cs
View File

@ -32,7 +32,7 @@
// Original contribution by: Mitch Thompson // Original contribution by: Mitch Thompson
#define SPINE_SKELETONANIMATOR #define SPINE_SKELETONMECANIM
using UnityEngine; using UnityEngine;
using UnityEditor; using UnityEditor;
using System.Collections.Generic; using System.Collections.Generic;
@ -406,13 +406,13 @@ namespace Spine.Unity.Editor {
}); });
} }
#if SPINE_SKELETONANIMATOR #if SPINE_SKELETONMECANIM
menu.AddSeparator(""); menu.AddSeparator("");
// SkeletonAnimator // SkeletonMecanim
menu.AddItem(new GUIContent("SkeletonAnimator"), false, HandleSkeletonComponentDrop, new SpawnMenuData { menu.AddItem(new GUIContent("SkeletonMecanim"), false, HandleSkeletonComponentDrop, new SpawnMenuData {
skeletonDataAsset = skeletonDataAsset, skeletonDataAsset = skeletonDataAsset,
spawnPoint = spawnPoint, spawnPoint = spawnPoint,
instantiateDelegate = (data) => InstantiateSkeletonAnimator(data) instantiateDelegate = (data) => InstantiateSkeletonMecanim(data)
}); });
#endif #endif
@ -773,7 +773,7 @@ namespace Spine.Unity.Editor {
SkeletonData skeletonData = skeletonDataAsset.GetSkeletonData(true); SkeletonData skeletonData = skeletonDataAsset.GetSkeletonData(true);
string currentHash = skeletonData != null ? skeletonData.Hash : null; string currentHash = skeletonData != null ? skeletonData.Hash : null;
#if SPINE_SKELETONANIMATOR #if SPINE_SKELETONMECANIM
if (currentHash == null || lastHash != currentHash) if (currentHash == null || lastHash != currentHash)
UpdateMecanimClips(skeletonDataAsset); UpdateMecanimClips(skeletonDataAsset);
#endif #endif
@ -1444,8 +1444,8 @@ namespace Spine.Unity.Editor {
} }
#endregion #endregion
#region SkeletonAnimator #region SkeletonMecanim
#if SPINE_SKELETONANIMATOR #if SPINE_SKELETONMECANIM
static void UpdateMecanimClips (SkeletonDataAsset skeletonDataAsset) { static void UpdateMecanimClips (SkeletonDataAsset skeletonDataAsset) {
if (skeletonDataAsset.controller == null) if (skeletonDataAsset.controller == null)
return; return;
@ -1453,13 +1453,13 @@ namespace Spine.Unity.Editor {
SkeletonBaker.GenerateMecanimAnimationClips(skeletonDataAsset); SkeletonBaker.GenerateMecanimAnimationClips(skeletonDataAsset);
} }
public static SkeletonAnimator InstantiateSkeletonAnimator (SkeletonDataAsset skeletonDataAsset, string skinName) { public static SkeletonMecanim InstantiateSkeletonMecanim (SkeletonDataAsset skeletonDataAsset, string skinName) {
return InstantiateSkeletonAnimator(skeletonDataAsset, skeletonDataAsset.GetSkeletonData(true).FindSkin(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", "")); 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) { if (skeletonDataAsset.controller == null) {
SkeletonBaker.GenerateMecanimAnimationClips(skeletonDataAsset); SkeletonBaker.GenerateMecanimAnimationClips(skeletonDataAsset);
@ -1468,7 +1468,7 @@ namespace Spine.Unity.Editor {
go.GetComponent<Animator>().runtimeAnimatorController = skeletonDataAsset.controller; go.GetComponent<Animator>().runtimeAnimatorController = skeletonDataAsset.controller;
SkeletonAnimator anim = go.GetComponent<SkeletonAnimator>(); SkeletonMecanim anim = go.GetComponent<SkeletonMecanim>();
anim.skeletonDataAsset = skeletonDataAsset; anim.skeletonDataAsset = skeletonDataAsset;
IngestAdvancedRenderSettings(anim); IngestAdvancedRenderSettings(anim);

2
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimator.cs → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs
View File

@ -33,7 +33,7 @@ using System.Collections.Generic;
namespace Spine.Unity { namespace Spine.Unity {
[RequireComponent(typeof(Animator))] [RequireComponent(typeof(Animator))]
public class SkeletonAnimator : SkeletonRenderer, ISkeletonAnimation { public class SkeletonMecanim : SkeletonRenderer, ISkeletonAnimation {
[SerializeField] protected MecanimTranslator translator; [SerializeField] protected MecanimTranslator translator;
public MecanimTranslator Translator { get { return translator; } } public MecanimTranslator Translator { get { return translator; } }

0
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonAnimator.cs.meta → spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonMecanim.cs.meta
View File

4
spine-unity/Assets/Spine/Runtime/spine-unity/SkeletonUtility/SkeletonUtility.cs
View File

@ -152,9 +152,7 @@ namespace Spine.Unity {
} }
if (skeletonAnimation == null) { if (skeletonAnimation == null) {
skeletonAnimation = GetComponent<SkeletonAnimation>(); skeletonAnimation = GetComponent(typeof(ISkeletonAnimation)) as ISkeletonAnimation;
if (skeletonAnimation == null)
skeletonAnimation = GetComponent<SkeletonAnimator>();
} }
skeletonRenderer.OnRebuild -= HandleRendererReset; skeletonRenderer.OnRebuild -= HandleRendererReset;