UnityMirror/spine-runtimes
1
0
Fork 0
mirror of https://github.com/EsotericSoftware/spine-runtimes.git synced 2026-02-28 20:51:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.1' into 4.2-beta

Browse Source
This commit is contained in:
Harald Csaszar 2022-09-06 17:27:23 +02:00
commit 302af378c0
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Components/SkeletonGraphicInspector.cs
View File

@ -261,7 +261,7 @@ namespace Spine.Unity.Editor {
EditorGUILayout.LabelField(SpineInspectorUtility.TempContent("This mesh uses multiple atlas pages or blend modes.\n" + EditorGUILayout.LabelField(SpineInspectorUtility.TempContent("This mesh uses multiple atlas pages or blend modes.\n" +
"You need to enable 'Multiple Canvas Renderers'\n" + "You need to enable 'Multiple Canvas Renderers'\n" +
"for correct rendering. Consider packing\n" + "for correct rendering. Consider packing\n" +
"attachments to a single atlas page if possible.", Icons.warning), GUILayout.Height(60), GUILayout.Width(340)); "attachments to a single atlas page if possible.", Icons.warning), GUILayout.Height(60), GUILayout.Width(380));
} }
} }
} }

7
spine-unity/Assets/Spine/Editor/spine-unity/Editor/Utility/Instantiation.cs
View File

@ -160,10 +160,15 @@ namespace Spine.Unity.Editor {
newTransform.position = isUI ? data.spawnPoint : RoundVector(data.spawnPoint, 2); newTransform.position = isUI ? data.spawnPoint : RoundVector(data.spawnPoint, 2);
if (isUI) { if (isUI) {
SkeletonGraphic skeletonGraphic = ((SkeletonGraphic)newSkeletonComponent);
if (usedParent != null && usedParent.GetComponent<RectTransform>() != null) { if (usedParent != null && usedParent.GetComponent<RectTransform>() != null) {
((SkeletonGraphic)newSkeletonComponent).MatchRectTransformWithBounds(); skeletonGraphic.MatchRectTransformWithBounds();
} else } else
Debug.Log("Created a UI Skeleton GameObject not under a RectTransform. It may not be visible until you parent it to a canvas."); Debug.Log("Created a UI Skeleton GameObject not under a RectTransform. It may not be visible until you parent it to a canvas.");
if (skeletonGraphic.HasMultipleSubmeshInstructions() && !skeletonGraphic.allowMultipleCanvasRenderers)
Debug.Log("This mesh uses multiple atlas pages or blend modes. " +
"You need to enable 'Multiple Canvas Renderers for correct rendering. " +
"Consider packing attachments to a single atlas page if possible.", skeletonGraphic);
} }
if (!isUI && usedParent != null && usedParent.transform.localScale != Vector3.one) if (!isUI && usedParent != null && usedParent.transform.localScale != Vector3.one)

7
spine-unity/Assets/Spine/Runtime/spine-unity/Shaders/Sprite/CGIncludes/SpritePixelLighting.cginc
View File

@ -222,6 +222,13 @@ fixed4 fragAdd(VertexOutput input) : SV_Target
ALPHA_CLIP(texureColor, input.color) ALPHA_CLIP(texureColor, input.color)
// previous fragBase pass was zwrite pass, so overlapping regions require
// full alpha applied since they are applied only once.
#if defined(_ALPHAPREMULTIPLY_ON)
texureColor.rgb /= texureColor.a == 0 ? 1 : texureColor.a;
#endif
texureColor.a = 1.0;
//Get normal direction //Get normal direction
fixed3 normalWorld = calculateNormalWorld(input); fixed3 normalWorld = calculateNormalWorld(input);