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

Merge branch '3.8' into 4.0-beta

Browse Source
This commit is contained in:
Harald Csaszar 2021-05-07 20:51:16 +02:00
commit 7ee6b78da6
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonGraphic.cs
View File

@ -218,6 +218,11 @@ namespace Spine.Unity {
} }
} }
protected override void OnDestroy () {
Clear();
base.OnDestroy();
}
public override void Rebuild (CanvasUpdate update) { public override void Rebuild (CanvasUpdate update) {
base.Rebuild(update); base.Rebuild(update);
if (canvasRenderer.cull) return; if (canvasRenderer.cull) return;
@ -458,9 +463,8 @@ namespace Spine.Unity {
for (int i = 0; i < canvasRenderers.Count; ++i) for (int i = 0; i < canvasRenderers.Count; ++i)
canvasRenderers[i].Clear(); canvasRenderers[i].Clear();
foreach (var mesh in meshes) DestroyMeshes();
Destroy(mesh); DisposeMeshBuffers();
meshes.Clear();
} }
public void TrimRenderers () { public void TrimRenderers () {
@ -562,6 +566,14 @@ namespace Spine.Unity {
} }
} }
protected void DisposeMeshBuffers () {
if (meshBuffers != null) {
meshBuffers.GetNext().Dispose();
meshBuffers.GetNext().Dispose();
meshBuffers = null;
}
}
protected void UpdateMeshSingleCanvasRenderer () { protected void UpdateMeshSingleCanvasRenderer () {
if (canvasRenderers.Count > 0) if (canvasRenderers.Count > 0)
DisableUnusedCanvasRenderers(usedCount : 0); DisableUnusedCanvasRenderers(usedCount : 0);
@ -724,9 +736,22 @@ namespace Spine.Unity {
protected void EnsureMeshesCount (int targetCount) { protected void EnsureMeshesCount (int targetCount) {
int oldCount = meshes.Count; int oldCount = meshes.Count;
meshes.EnsureCapacity(targetCount); meshes.EnsureCapacity(targetCount);
var meshesItems = meshes.Items;
for (int i = oldCount; i < targetCount; i++) for (int i = oldCount; i < targetCount; i++)
if (meshesItems[i] == null) meshesItems[i] = new Mesh(); meshes.Add(SpineMesh.NewSkeletonMesh());
}
protected void DestroyMeshes () {
foreach (var mesh in meshes) {
#if UNITY_EDITOR
if (Application.isEditor && !Application.isPlaying)
UnityEngine.Object.DestroyImmediate(mesh);
else
UnityEngine.Object.Destroy(mesh);
#else
UnityEngine.Object.Destroy(mesh);
#endif
}
meshes.Clear();
} }
protected void EnsureSeparatorPartCount () { protected void EnsureSeparatorPartCount () {