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

Fixed submesh bug, improved Clear().

Browse Source 
closes #151
This commit is contained in:
NathanSweet 2014-02-05 17:17:16 +01:00
parent 2e001c6440
commit d4ae313c6b
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spine-tk2d/Assets/Spine/SkeletonComponent.cs
View File

@ -66,10 +66,17 @@ public class SkeletonComponent : MonoBehaviour {
public virtual void Clear () { public virtual void Clear () {
if (meshFilter != null) meshFilter.sharedMesh = null; if (meshFilter != null) meshFilter.sharedMesh = null;
if (mesh != null) DestroyImmediate(mesh); if (mesh != null) DestroyImmediate(mesh);
if (renderer != null) renderer.sharedMaterial = null;
mesh = null; mesh = null;
mesh1 = null; mesh1 = null;
mesh2 = null; mesh2 = null;
if (renderer != null) renderer.sharedMaterial = null; lastVertexCount = 0;
vertices = null;
colors = null;
uvs = null;
sharedMaterials = new Material[0];
submeshMaterials.Clear();
submeshes.Clear();
skeleton = null; skeleton = null;
} }
@ -218,7 +225,7 @@ public class SkeletonComponent : MonoBehaviour {
mesh.colors32 = colors; mesh.colors32 = colors;
mesh.uv = uvs; mesh.uv = uvs;
int submeshCount = submeshes.Count; int submeshCount = submeshMaterials.Count;
mesh.subMeshCount = submeshCount; mesh.subMeshCount = submeshCount;
for (int i = 0; i < submeshCount; ++i) for (int i = 0; i < submeshCount; ++i)
mesh.SetTriangles(submeshes[i].indexes, i); mesh.SetTriangles(submeshes[i].indexes, i);

11
spine-unity/Assets/Spine/SkeletonComponent.cs
View File

@ -66,10 +66,17 @@ public class SkeletonComponent : MonoBehaviour {
public virtual void Clear () { public virtual void Clear () {
if (meshFilter != null) meshFilter.sharedMesh = null; if (meshFilter != null) meshFilter.sharedMesh = null;
if (mesh != null) DestroyImmediate(mesh); if (mesh != null) DestroyImmediate(mesh);
if (renderer != null) renderer.sharedMaterial = null;
mesh = null; mesh = null;
mesh1 = null; mesh1 = null;
mesh2 = null; mesh2 = null;
if (renderer != null) renderer.sharedMaterial = null; lastVertexCount = 0;
vertices = null;
colors = null;
uvs = null;
sharedMaterials = new Material[0];
submeshMaterials.Clear();
submeshes.Clear();
skeleton = null; skeleton = null;
} }
@ -218,7 +225,7 @@ public class SkeletonComponent : MonoBehaviour {
mesh.colors32 = colors; mesh.colors32 = colors;
mesh.uv = uvs; mesh.uv = uvs;
int submeshCount = submeshes.Count; int submeshCount = submeshMaterials.Count;
mesh.subMeshCount = submeshCount; mesh.subMeshCount = submeshCount;
for (int i = 0; i < submeshCount; ++i) for (int i = 0; i < submeshCount; ++i)
mesh.SetTriangles(submeshes[i].indexes, i); mesh.SetTriangles(submeshes[i].indexes, i);