From 01e457a8afe1b9efe291c873d1999eff066e7cf0 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 17 Apr 2023 17:38:02 +0200 Subject: [PATCH 1/3] [unity] Fixed remaining shader compile error occurring during build on Unity URP versions 12.x and 13.x. See related commit 2f1b0b8. --- .../Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl index e40d392b2..1f93ac4a7 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-SkeletonLit-ForwardPass-URP.hlsl @@ -180,7 +180,7 @@ half4 frag(VertexOutput i i.color.rgb = lerp(i.shadowedColor, i.color.rgb, shadowAttenuation); #endif -#ifdef _WRITE_RENDERING_LAYERS +#ifdef USE_WRITE_RENDERING_LAYERS uint renderingLayers = GetMeshRenderingLayerBackwardsCompatible(); outRenderingLayers = float4(EncodeMeshRenderingLayer(renderingLayers), 0, 0, 0); #endif From 0815c4433ba54e5058fd4c3ab7ac254d5a3be0f7 Mon Sep 17 00:00:00 2001 From: Mario Zechner Date: Tue, 18 Apr 2023 11:18:55 +0200 Subject: [PATCH 2/3] [phaser] Mix-and-match example, rework example index. --- spine-ts/index.html | 15 ++++- spine-ts/spine-phaser/example/index.html | 31 ---------- .../spine-phaser/example/mix-and-match.html | 60 +++++++++++++++++++ 3 files changed, 74 insertions(+), 32 deletions(-) delete mode 100644 spine-ts/spine-phaser/example/index.html create mode 100644 spine-ts/spine-phaser/example/mix-and-match.html diff --git a/spine-ts/index.html b/spine-ts/index.html index 181095cc3..205d3e1f4 100644 --- a/spine-ts/index.html +++ b/spine-ts/index.html @@ -18,7 +18,20 @@
  • Phaser
  • Player