UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-03-03 06:09:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better error handling.

Browse Source
This commit is contained in:
NathanSweet 2014-04-26 23:24:37 +02:00
parent 197614ecb2
commit b4698dd7ff
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spine-tk2d/Assets/Spine/SkeletonRenderer.cs
View File

@ -76,12 +76,14 @@ public class SkeletonRenderer : MonoBehaviour {
submeshMaterials.Clear(); submeshMaterials.Clear();
submeshes.Clear(); submeshes.Clear();
skeleton = null; skeleton = null;
valid = false;
if (!skeletonDataAsset) { if (!skeletonDataAsset) {
Debug.LogError("Missing SkeletonData asset.", this); Debug.LogError("Missing SkeletonData asset.", this);
valid = false;
return; return;
} }
SkeletonData skeletonData = skeletonDataAsset.GetSkeletonData(false);
if (skeletonData == null) return;
valid = true; valid = true;
meshFilter = GetComponent<MeshFilter>(); meshFilter = GetComponent<MeshFilter>();
@ -89,7 +91,7 @@ public class SkeletonRenderer : MonoBehaviour {
mesh2 = newMesh(); mesh2 = newMesh();
vertices = new Vector3[0]; vertices = new Vector3[0];
skeleton = new Skeleton(skeletonDataAsset.GetSkeletonData(false)); skeleton = new Skeleton(skeletonData);
if (initialSkinName != null && initialSkinName.Length > 0 && initialSkinName != "default") if (initialSkinName != null && initialSkinName.Length > 0 && initialSkinName != "default")
skeleton.SetSkin(initialSkinName); skeleton.SetSkin(initialSkinName);
} }

9
spine-unity/Assets/Spine/SkeletonRenderer.cs
View File

@ -77,19 +77,20 @@ public class SkeletonRenderer : MonoBehaviour {
submeshes.Clear(); submeshes.Clear();
skeleton = null; skeleton = null;
valid = false;
if (!skeletonDataAsset) { if (!skeletonDataAsset) {
Debug.LogError("Missing SkeletonData asset.", this); Debug.LogError("Missing SkeletonData asset.", this);
valid = false;
return; return;
} }
valid = true; SkeletonData skeletonData = skeletonDataAsset.GetSkeletonData(false);
if (skeletonData == null) return;
meshFilter = GetComponent<MeshFilter>(); meshFilter = GetComponent<MeshFilter>();
mesh1 = newMesh(); mesh1 = newMesh();
mesh2 = newMesh(); mesh2 = newMesh();
vertices = new Vector3[0]; vertices = new Vector3[0];
skeleton = new Skeleton(skeletonDataAsset.GetSkeletonData(false)); skeleton = new Skeleton(skeletonData);
if (initialSkinName != null && initialSkinName.Length > 0 && initialSkinName != "default") if (initialSkinName != null && initialSkinName.Length > 0 && initialSkinName != "default")
skeleton.SetSkin(initialSkinName); skeleton.SetSkin(initialSkinName);
} }