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] Added missing Create 2D Hinge Chain button at SkeletonUtilityBone inspector, only 3D version was available. Closes #1310.

Browse Source
This commit is contained in:
Harald Csaszar 2019-03-20 18:16:29 +01:00
parent 22a0cdc3ac
commit 0d44a041e9
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
spine-unity/Assets/Spine/Editor/spine-unity/SkeletonUtility/Editor/SkeletonUtilityBoneInspector.cs
View File

@ -28,10 +28,8 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*****************************************************************************/ *****************************************************************************/
//#define HINGECHAIN2D
// Contributed by: Mitch Thompson // Contributed by: Mitch Thompson
using UnityEngine; using UnityEngine;
using UnityEditor; using UnityEditor;
using System.Collections.Generic; using System.Collections.Generic;
@ -177,8 +175,10 @@ namespace Spine.Unity.Editor {
using (new GUILayout.HorizontalScope()) { using (new GUILayout.HorizontalScope()) {
EditorGUILayout.Space(); EditorGUILayout.Space();
using (new EditorGUI.DisabledGroupScope(multiObject || !utilityBone.valid || !canCreateHingeChain)) { using (new EditorGUI.DisabledGroupScope(multiObject || !utilityBone.valid || !canCreateHingeChain)) {
if (GUILayout.Button(SpineInspectorUtility.TempContent("Create Hinge Chain", Icons.hingeChain), GUILayout.Width(150), GUILayout.Height(24))) if (GUILayout.Button(SpineInspectorUtility.TempContent("Create 3D Hinge Chain", Icons.hingeChain), GUILayout.MinWidth(120), GUILayout.Height(24)))
CreateHingeChain(); CreateHingeChain();
if (GUILayout.Button(SpineInspectorUtility.TempContent("Create 2D Hinge Chain", Icons.hingeChain), GUILayout.MinWidth(120), GUILayout.Height(24)))
CreateHingeChain2D();
} }
EditorGUILayout.Space(); EditorGUILayout.Space();
} }
@ -277,17 +277,20 @@ namespace Spine.Unity.Editor {
EditorGUIUtility.PingObject(go); EditorGUIUtility.PingObject(go);
} }
#if HINGECHAIN2D
bool CanCreateHingeChain () { bool CanCreateHingeChain () {
if (utilityBone == null) return false; if (utilityBone == null)
if (utilityBone.GetComponent<Rigidbody2D>() != null) return false; return false;
if (utilityBone.bone != null && utilityBone.bone.Children.Count == 0) return false; if (utilityBone.GetComponent<Rigidbody>() != null || utilityBone.GetComponent<Rigidbody2D>() != null)
var rigidbodies = utilityBone.GetComponentsInChildren<Rigidbody2D>(); return false;
return rigidbodies.Length <= 0; if (utilityBone.bone != null && utilityBone.bone.Children.Count == 0)
return false;
var rigidbodies = utilityBone.GetComponentsInChildren<Rigidbody>();
var rigidbodies2D = utilityBone.GetComponentsInChildren<Rigidbody2D>();
return rigidbodies.Length <= 0 && rigidbodies2D.Length <= 0;
} }
void CreateHingeChain () { void CreateHingeChain2D () {
var utilBoneArr = utilityBone.GetComponentsInChildren<SkeletonUtilityBone>(); var utilBoneArr = utilityBone.GetComponentsInChildren<SkeletonUtilityBone>();
foreach (var utilBone in utilBoneArr) { foreach (var utilBone in utilBoneArr) {
@ -324,19 +327,6 @@ namespace Spine.Unity.Editor {
utilBone.GetComponent<Rigidbody2D>().mass = utilBone.transform.parent.GetComponent<Rigidbody2D>().mass * 0.75f; utilBone.GetComponent<Rigidbody2D>().mass = utilBone.transform.parent.GetComponent<Rigidbody2D>().mass * 0.75f;
} }
} }
#else
bool CanCreateHingeChain () {
if (utilityBone == null)
return false;
if (utilityBone.GetComponent<Rigidbody>() != null)
return false;
if (utilityBone.bone != null && utilityBone.bone.Children.Count == 0)
return false;
var rigidbodies = utilityBone.GetComponentsInChildren<Rigidbody>();
return rigidbodies.Length <= 0;
}
void CreateHingeChain () { void CreateHingeChain () {
var utilBoneArr = utilityBone.GetComponentsInChildren<SkeletonUtilityBone>(); var utilBoneArr = utilityBone.GetComponentsInChildren<SkeletonUtilityBone>();
@ -380,7 +370,6 @@ namespace Spine.Unity.Editor {
utilBone.gameObject.AddComponent<Rigidbody>(); utilBone.gameObject.AddComponent<Rigidbody>();
} }
#endif
} }
} }