diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Include/Spine-Sprite-NormalsPass-URP-2D.hlsl b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Include/Spine-Sprite-NormalsPass-URP-2D.hlsl index 150a75d76..6a0587cfa 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Include/Spine-Sprite-NormalsPass-URP-2D.hlsl +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Include/Spine-Sprite-NormalsPass-URP-2D.hlsl @@ -1,8 +1,6 @@ #ifndef SPRITE_NORMALS_PASS_URP_INCLUDED #define SPRITE_NORMALS_PASS_URP_INCLUDED -#include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/LightingUtility.hlsl" - #include "../Include/SpineCoreShaders/ShaderShared.cginc" #include "../Include/SpineCoreShaders/SpriteLighting.cginc" diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Include/Spine-Sprite-StandardPass-URP-2D.hlsl b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Include/Spine-Sprite-StandardPass-URP-2D.hlsl index 2f95b1bb2..51ded8a72 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Include/Spine-Sprite-StandardPass-URP-2D.hlsl +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/Include/Spine-Sprite-StandardPass-URP-2D.hlsl @@ -1,8 +1,6 @@ #ifndef SPRITE_STANDARD_PASS_URP_INCLUDED #define SPRITE_STANDARD_PASS_URP_INCLUDED -#include "Packages/com.unity.render-pipelines.universal/Shaders/2D/Include/LightingUtility.hlsl" - #include "../Include/SpineCoreShaders/ShaderShared.cginc" #include "../Include/SpineCoreShaders/SpriteLighting.cginc" #if defined(_ALPHAPREMULTIPLY_ON) diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Common-URP.hlsl b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Common-URP.hlsl index a56e218ea..21c062e23 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Common-URP.hlsl +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Common-URP.hlsl @@ -2,16 +2,21 @@ #define SPINE_COMMON_URP_INCLUDED #ifdef USE_FORWARD_PLUS -#define IS_URP_14_OR_NEWER 1 -#define IS_URP_12_OR_NEWER 1 -#else -#define IS_URP_14_OR_NEWER 0 - #ifdef UNIVERSAL_REALTIME_LIGHTS_INCLUDED + #define IS_URP_14_OR_NEWER 1 #define IS_URP_12_OR_NEWER 1 +#else + #define IS_URP_14_OR_NEWER 0 + #ifdef UNIVERSAL_REALTIME_LIGHTS_INCLUDED + #define IS_URP_12_OR_NEWER 1 #else - #define IS_URP_12_OR_NEWER 0 + #define IS_URP_12_OR_NEWER 0 #endif #endif +#if IS_URP_14_OR_NEWER && !defined(_USE_WEBGL1_LIGHTS) + #define IS_URP_15_OR_NEWER 1 +#else + #define IS_URP_15_OR_NEWER 0 +#endif #if defined(_WRITE_RENDERING_LAYERS) && IS_URP_14_OR_NEWER #define USE_WRITE_RENDERING_LAYERS 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 560259251..49421f68e 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 @@ -150,7 +150,11 @@ VertexOutput vert(appdata v) { // Note: ambient light is also handled via SH. half3 vertexSH; +#if IS_URP_15_OR_NEWER + OUTPUT_SH(positionWS, normalWS.xyz, GetWorldSpaceNormalizeViewDir(positionWS), vertexSH); +#else OUTPUT_SH(normalWS.xyz, vertexSH); +#endif color.rgb += SAMPLE_GI(v.lightmapUV, vertexSH, normalWS); o.color = color; diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Sprite-ForwardPass-URP.hlsl b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Sprite-ForwardPass-URP.hlsl index df7b69dd6..42aac9a17 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Sprite-ForwardPass-URP.hlsl +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/Include/Spine-Sprite-ForwardPass-URP.hlsl @@ -311,7 +311,11 @@ VertexOutputLWRP ForwardPassVertexSprite(VertexInput input) output.fogFactorAndVertexLight.x = fogFactor; #endif +#if IS_URP_15_OR_NEWER + OUTPUT_SH(positionWS, normalWS.xyz, GetWorldSpaceNormalizeViewDir(positionWS), output.vertexSH); +#else OUTPUT_SH(normalWS.xyz, output.vertexSH); +#endif return output; } diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json index eced01aad..25e15624d 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.urp-shaders", "displayName": "Spine Universal RP Shaders", "description": "This plugin provides universal render pipeline (URP) shaders for the spine-unity runtime.\n\nPrerequisites:\nIt requires a working installation of the spine-unity runtime, version 4.1.\n(See http://esotericsoftware.com/git/spine-runtimes/spine-unity)", - "version": "4.1.16", + "version": "4.1.17", "unity": "2019.3", "author": { "name": "Esoteric Software",