UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2025-12-21 01:36:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

[unity] Fixed SkeletonGraphic exception when Attachment changed after SkeletonGraphic.LateUpdate. Closes #2275.

Browse Source
This commit is contained in:
Harald Csaszar 2023-04-13 17:57:12 +02:00
parent 6ec6c4c21c
commit 7d0833f881
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,6 +116,7 @@ namespace Spine.Unity {
public bool updateSeparatorPartLocation = true; public bool updateSeparatorPartLocation = true;
private bool wasUpdatedAfterInit = true; private bool wasUpdatedAfterInit = true;
private bool requiresInstructionUpate = true;
private Texture baseTexture = null; private Texture baseTexture = null;
#if UNITY_EDITOR #if UNITY_EDITOR
@ -308,7 +309,10 @@ namespace Spine.Unity {
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;
if (update == CanvasUpdate.PreRender) UpdateMeshToInstructions(); if (update == CanvasUpdate.PreRender) {
if (requiresInstructionUpate) PrepareInstructionsAndRenderers(isInRebuild : true);
UpdateMeshToInstructions();
}
if (allowMultipleCanvasRenderers) canvasRenderer.Clear(); if (allowMultipleCanvasRenderers) canvasRenderer.Clear();
} }
@ -404,8 +408,7 @@ namespace Spine.Unity {
if (updateMode != UpdateMode.FullUpdate) return; if (updateMode != UpdateMode.FullUpdate) return;
PrepareInstructionsAndRenderers(); PrepareInstructionsAndRenderers();
if (OnInstructionsPrepared != null)
OnInstructionsPrepared(this.currentInstructions);
SetVerticesDirty(); // triggers Rebuild and avoids potential double-update in a single frame SetVerticesDirty(); // triggers Rebuild and avoids potential double-update in a single frame
} }
@ -452,9 +455,11 @@ namespace Spine.Unity {
public Skeleton Skeleton { public Skeleton Skeleton {
get { get {
Initialize(false); Initialize(false);
requiresInstructionUpate = true;
return skeleton; return skeleton;
} }
set { set {
requiresInstructionUpate = true;
skeleton = value; skeleton = value;
} }
} }
@ -690,11 +695,12 @@ namespace Spine.Unity {
OnAnimationRebuild(this); OnAnimationRebuild(this);
} }
public void PrepareInstructionsAndRenderers () { public void PrepareInstructionsAndRenderers (bool isInRebuild = false) {
requiresInstructionUpate = false;
if (!this.allowMultipleCanvasRenderers) { if (!this.allowMultipleCanvasRenderers) {
MeshGenerator.GenerateSingleSubmeshInstruction(currentInstructions, skeleton, null); MeshGenerator.GenerateSingleSubmeshInstruction(currentInstructions, skeleton, null);
if (canvasRenderers.Count > 0) if (canvasRenderers.Count > 0)
DisableUnusedCanvasRenderers(usedCount: 0); DisableUnusedCanvasRenderers(usedCount: 0, isInRebuild);
usedRenderersCount = 0; usedRenderersCount = 0;
} else { } else {
MeshGenerator.GenerateSkeletonRendererInstruction(currentInstructions, skeleton, null, MeshGenerator.GenerateSkeletonRendererInstruction(currentInstructions, skeleton, null,
@ -707,8 +713,10 @@ namespace Spine.Unity {
EnsureMeshesCount(submeshCount); EnsureMeshesCount(submeshCount);
EnsureUsedTexturesAndMaterialsCount(submeshCount); EnsureUsedTexturesAndMaterialsCount(submeshCount);
EnsureSeparatorPartCount(); EnsureSeparatorPartCount();
PrepareRendererGameObjects(currentInstructions); PrepareRendererGameObjects(currentInstructions, isInRebuild);
} }
if (OnInstructionsPrepared != null)
OnInstructionsPrepared(this.currentInstructions);
} }
public void UpdateMesh () { public void UpdateMesh () {
@ -922,9 +930,11 @@ namespace Spine.Unity {
} }
} }
protected void PrepareRendererGameObjects (SkeletonRendererInstruction currentInstructions) { protected void PrepareRendererGameObjects (SkeletonRendererInstruction currentInstructions,
bool isInRebuild = false) {
int submeshCount = currentInstructions.submeshInstructions.Count; int submeshCount = currentInstructions.submeshInstructions.Count;
DisableUnusedCanvasRenderers(usedCount: submeshCount); DisableUnusedCanvasRenderers(usedCount: submeshCount, isInRebuild);
int separatorSlotGroupIndex = 0; int separatorSlotGroupIndex = 0;
int targetSiblingIndex = 0; int targetSiblingIndex = 0;
@ -961,13 +971,14 @@ namespace Spine.Unity {
usedRenderersCount = submeshCount; usedRenderersCount = submeshCount;
} }
protected void DisableUnusedCanvasRenderers (int usedCount) { protected void DisableUnusedCanvasRenderers (int usedCount, bool isInRebuild = false) {
#if UNITY_EDITOR #if UNITY_EDITOR
RemoveNullCanvasRenderers(); RemoveNullCanvasRenderers();
#endif #endif
for (int i = usedCount; i < canvasRenderers.Count; i++) { for (int i = usedCount; i < canvasRenderers.Count; i++) {
canvasRenderers[i].Clear(); canvasRenderers[i].Clear();
canvasRenderers[i].gameObject.SetActive(false); if (!isInRebuild) // rebuild does not allow disabling Graphic and thus removing it from rebuild list.
canvasRenderers[i].gameObject.SetActive(false);
} }
} }