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

Merge branch '4.1' of https://github.com/esotericsoftware/spine-runtimes into 4.1

Browse Source
This commit is contained in:
Mario Zechner 2023-04-17 16:12:29 +02:00
commit 889148cd97
2 changed files with 26 additions and 15 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;
private bool wasUpdatedAfterInit = true;
private bool requiresInstructionUpate = true;
private Texture baseTexture = null;
#if UNITY_EDITOR
@ -308,7 +309,10 @@ namespace Spine.Unity {
public override void Rebuild (CanvasUpdate update) {
base.Rebuild(update);
if (canvasRenderer.cull) return;
if (update == CanvasUpdate.PreRender) UpdateMeshToInstructions();
if (update == CanvasUpdate.PreRender) {
if (requiresInstructionUpate) PrepareInstructionsAndRenderers(isInRebuild: true);
UpdateMeshToInstructions();
}
if (allowMultipleCanvasRenderers) canvasRenderer.Clear();
}
@ -404,8 +408,7 @@ namespace Spine.Unity {
if (updateMode != UpdateMode.FullUpdate) return;
PrepareInstructionsAndRenderers();
if (OnInstructionsPrepared != null)
OnInstructionsPrepared(this.currentInstructions);
SetVerticesDirty(); // triggers Rebuild and avoids potential double-update in a single frame
}
@ -452,9 +455,11 @@ namespace Spine.Unity {
public Skeleton Skeleton {
get {
Initialize(false);
requiresInstructionUpate = true;
return skeleton;
}
set {
requiresInstructionUpate = true;
skeleton = value;
}
}
@ -690,11 +695,12 @@ namespace Spine.Unity {
OnAnimationRebuild(this);
}
public void PrepareInstructionsAndRenderers () {
public void PrepareInstructionsAndRenderers (bool isInRebuild = false) {
requiresInstructionUpate = false;
if (!this.allowMultipleCanvasRenderers) {
MeshGenerator.GenerateSingleSubmeshInstruction(currentInstructions, skeleton, null);
if (canvasRenderers.Count > 0)
DisableUnusedCanvasRenderers(usedCount: 0);
DisableUnusedCanvasRenderers(usedCount: 0, isInRebuild: isInRebuild);
usedRenderersCount = 0;
} else {
MeshGenerator.GenerateSkeletonRendererInstruction(currentInstructions, skeleton, null,
@ -707,8 +713,10 @@ namespace Spine.Unity {
EnsureMeshesCount(submeshCount);
EnsureUsedTexturesAndMaterialsCount(submeshCount);
EnsureSeparatorPartCount();
PrepareRendererGameObjects(currentInstructions);
PrepareRendererGameObjects(currentInstructions, isInRebuild);
}
if (OnInstructionsPrepared != null)
OnInstructionsPrepared(this.currentInstructions);
}
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;
DisableUnusedCanvasRenderers(usedCount: submeshCount);
DisableUnusedCanvasRenderers(usedCount: submeshCount, isInRebuild: isInRebuild);
int separatorSlotGroupIndex = 0;
int targetSiblingIndex = 0;
@ -961,13 +971,14 @@ namespace Spine.Unity {
usedRenderersCount = submeshCount;
}
protected void DisableUnusedCanvasRenderers (int usedCount) {
protected void DisableUnusedCanvasRenderers (int usedCount, bool isInRebuild = false) {
#if UNITY_EDITOR
RemoveNullCanvasRenderers();
#endif
for (int i = usedCount; i < canvasRenderers.Count; i++) {
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);
}
}

10
spine-unity/Assets/Spine/Runtime/spine-unity/Mesh Generation/MeshGenerator.cs
View File

@ -813,8 +813,8 @@ namespace Spine.Unity {
b2.x *= alpha;
b2.y = slot.Data.BlendMode == BlendMode.Additive ? 0 : alpha;
}
int meshVertexCount = meshAttachment.WorldVerticesLength;
for (int iii = 0; iii < meshVertexCount; iii += 2) {
int verticesArrayLength = meshAttachment.WorldVerticesLength;
for (int iii = 0; iii < verticesArrayLength; iii += 2) {
uv2i[vi] = rg;
uv3i[vi] = b2;
vi++;
@ -886,8 +886,8 @@ namespace Spine.Unity {
} else { //if (settings.renderMeshes) {
MeshAttachment meshAttachment = attachment as MeshAttachment;
if (meshAttachment != null) {
int meshVertexCount = meshAttachment.WorldVerticesLength;
if (tempVerts.Length < meshVertexCount) this.tempVerts = tempVerts = new float[meshVertexCount];
int verticesArrayLength = meshAttachment.WorldVerticesLength;
if (tempVerts.Length < verticesArrayLength) this.tempVerts = tempVerts = new float[verticesArrayLength];
meshAttachment.ComputeWorldVertices(slot, tempVerts);
if (settings.pmaVertexColors) {
@ -917,7 +917,7 @@ namespace Spine.Unity {
if (fy > bmax.y) bmax.y = fy;
}
for (int iii = 0; iii < meshVertexCount; iii += 2) {
for (int iii = 0; iii < verticesArrayLength; iii += 2) {
float x = tempVerts[iii], y = tempVerts[iii + 1];
vbi[vertexIndex].x = x; vbi[vertexIndex].y = y; vbi[vertexIndex].z = z;
cbi[vertexIndex] = color; ubi[vertexIndex].x = attachmentUVs[iii]; ubi[vertexIndex].y = attachmentUVs[iii + 1];