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] Inside/Outside Mask Materials recreated unnecessarily upon material changes. Closes #2848.

Browse Source
This commit is contained in:
Harald Csaszar 2025-05-14 21:43:56 +02:00
parent 67a965b633
commit 23adb6b9b8
2 changed files with 43 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
spine-unity/Assets/Spine/Runtime/spine-unity/Components/SkeletonRenderer.cs
View File

@ -680,10 +680,12 @@ namespace Spine.Unity {
} else if (materialsChanged) { } else if (materialsChanged) {
meshRenderer.sharedMaterials = rendererBuffers.GetUpdatedSharedMaterialsArray(); meshRenderer.sharedMaterials = rendererBuffers.GetUpdatedSharedMaterialsArray();
} }
if (materialsChanged && (this.maskMaterials.AnyMaterialCreated)) {
this.maskMaterials = new SpriteMaskInteractionMaterials();
}
#if BUILT_IN_SPRITE_MASK_COMPONENT
if (materialsChanged && this.maskMaterials.AnyMaterialCreated && meshRenderer != null) {
UpdateSpriteMaskMaterials();
}
#endif
meshGenerator.FillLateVertexData(currentMesh); meshGenerator.FillLateVertexData(currentMesh);
// STEP 4. The UnityEngine.Mesh is ready. Set it as the MeshFilter's mesh. Store the instructions used for that mesh. =========== // STEP 4. The UnityEngine.Mesh is ready. Set it as the MeshFilter's mesh. Store the instructions used for that mesh. ===========
@ -784,13 +786,49 @@ namespace Spine.Unity {
} }
#if BUILT_IN_SPRITE_MASK_COMPONENT #if BUILT_IN_SPRITE_MASK_COMPONENT
private void UpdateSpriteMaskMaterials () {
if (maskInteraction == SpriteMaskInteraction.None) return;
if (maskMaterials.materialsMaskDisabled == null || maskMaterials.materialsMaskDisabled.Length == 0) {
maskMaterials = new SpriteMaskInteractionMaterials();
return;
}
Material[] maskedMaterials;
int maskFunction;
if (maskInteraction == SpriteMaskInteraction.VisibleInsideMask) {
if (maskMaterials.materialsInsideMask == null || maskMaterials.materialsInsideMask.Length == 0)
maskMaterials.materialsInsideMask = new Material[maskMaterials.materialsMaskDisabled.Length];
maskedMaterials = maskMaterials.materialsInsideMask;
maskFunction = (int)STENCIL_COMP_MASKINTERACTION_VISIBLE_INSIDE;
} else {
if (maskMaterials.materialsOutsideMask == null || maskMaterials.materialsOutsideMask.Length == 0)
maskMaterials.materialsOutsideMask = new Material[maskMaterials.materialsMaskDisabled.Length];
maskedMaterials = maskMaterials.materialsOutsideMask;
maskFunction = (int)STENCIL_COMP_MASKINTERACTION_VISIBLE_OUTSIDE;
}
Material[] currentMaterials = meshRenderer.sharedMaterials;
for (int c = 0; c < currentMaterials.Length; ++c) {
Material currentMaterial = currentMaterials[c];
int disabledIndex = System.Array.IndexOf(maskMaterials.materialsMaskDisabled, currentMaterial);
if (disabledIndex != -1) {
meshRenderer.sharedMaterials[c] = maskedMaterials[disabledIndex];
} else {
Material newMaterial = new Material(currentMaterial);
newMaterial.SetFloat(STENCIL_COMP_PARAM_ID, maskFunction);
meshRenderer.sharedMaterials[c] = newMaterial;
}
}
}
private void AssignSpriteMaskMaterials () { private void AssignSpriteMaskMaterials () {
#if UNITY_EDITOR #if UNITY_EDITOR
if (!Application.isPlaying && !UnityEditor.EditorApplication.isUpdating) { if (!Application.isPlaying && !UnityEditor.EditorApplication.isUpdating) {
EditorFixStencilCompParameters(); EditorFixStencilCompParameters();
} }
#endif #endif
if (Application.isPlaying) { if (Application.isPlaying) {
if (maskInteraction != SpriteMaskInteraction.None && maskMaterials.materialsMaskDisabled.Length == 0) if (maskInteraction != SpriteMaskInteraction.None && maskMaterials.materialsMaskDisabled.Length == 0)
maskMaterials.materialsMaskDisabled = meshRenderer.sharedMaterials; maskMaterials.materialsMaskDisabled = meshRenderer.sharedMaterials;

2
spine-unity/Assets/Spine/package.json
View File

@ -2,7 +2,7 @@
"name": "com.esotericsoftware.spine.spine-unity", "name": "com.esotericsoftware.spine.spine-unity",
"displayName": "spine-unity Runtime", "displayName": "spine-unity Runtime",
"description": "This plugin provides the spine-unity runtime core.", "description": "This plugin provides the spine-unity runtime core.",
"version": "4.2.103", "version": "4.2.104",
"unity": "2018.3", "unity": "2018.3",
"author": { "author": {
"name": "Esoteric Software", "name": "Esoteric Software",