From a08c7dd41981a0bd63597d3455ab0fcf36cd3470 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Tue, 17 Oct 2023 18:41:38 +0200 Subject: [PATCH] [unity] URP Shaders: Removed unsupported Outline parameters from URP "Blend Mode" shaders (added in commit 408c0bc). --- .../BlendModes/Spine-Skeleton-Additive-URP-2D.shader | 10 ---------- .../BlendModes/Spine-Skeleton-Multiply-URP-2D.shader | 10 ---------- .../2D/BlendModes/Spine-Skeleton-Screen-URP-2D.shader | 10 ---------- .../BlendModes/Spine-Skeleton-Additive-URP.shader | 10 ---------- .../BlendModes/Spine-Skeleton-Multiply-URP.shader | 10 ---------- .../BlendModes/Spine-Skeleton-Screen-URP.shader | 10 ---------- .../package.json | 2 +- 7 files changed, 1 insertion(+), 61 deletions(-) diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Additive-URP-2D.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Additive-URP-2D.shader index 2ad68fa20..765a4eabb 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Additive-URP-2D.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Additive-URP-2D.shader @@ -6,16 +6,6 @@ _Cutoff ("Shadow alpha cutoff", Range(0,1)) = 0.1 [HideInInspector] _StencilRef("Stencil Reference", Float) = 1.0 [HideInInspector][Enum(UnityEngine.Rendering.CompareFunction)] _StencilComp("Stencil Comparison", Float) = 8 // Set to Always as default - - // Outline properties are drawn via custom editor. - [HideInInspector] _OutlineWidth("Outline Width", Range(0,8)) = 3.0 - [HideInInspector] _OutlineColor("Outline Color", Color) = (1,1,0,1) - [HideInInspector] _OutlineReferenceTexWidth("Reference Texture Width", Int) = 1024 - [HideInInspector] _ThresholdEnd("Outline Threshold", Range(0,1)) = 0.25 - [HideInInspector] _OutlineSmoothness("Outline Smoothness", Range(0,1)) = 1.0 - [HideInInspector][MaterialToggle(_USE8NEIGHBOURHOOD_ON)] _Use8Neighbourhood("Sample 8 Neighbours", Float) = 1 - [HideInInspector] _OutlineOpaqueAlpha("Opaque Alpha", Range(0,1)) = 1.0 - [HideInInspector] _OutlineMipLevel("Outline Mip Level", Range(0,3)) = 0 } SubShader { diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Multiply-URP-2D.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Multiply-URP-2D.shader index fb9dcb59d..3ee7c1708 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Multiply-URP-2D.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Multiply-URP-2D.shader @@ -6,16 +6,6 @@ _Cutoff ("Shadow alpha cutoff", Range(0,1)) = 0.1 [HideInInspector] _StencilRef("Stencil Reference", Float) = 1.0 [HideInInspector][Enum(UnityEngine.Rendering.CompareFunction)] _StencilComp("Stencil Comparison", Float) = 8 // Set to Always as default - - // Outline properties are drawn via custom editor. - [HideInInspector] _OutlineWidth("Outline Width", Range(0,8)) = 3.0 - [HideInInspector] _OutlineColor("Outline Color", Color) = (1,1,0,1) - [HideInInspector] _OutlineReferenceTexWidth("Reference Texture Width", Int) = 1024 - [HideInInspector] _ThresholdEnd("Outline Threshold", Range(0,1)) = 0.25 - [HideInInspector] _OutlineSmoothness("Outline Smoothness", Range(0,1)) = 1.0 - [HideInInspector][MaterialToggle(_USE8NEIGHBOURHOOD_ON)] _Use8Neighbourhood("Sample 8 Neighbours", Float) = 1 - [HideInInspector] _OutlineOpaqueAlpha("Opaque Alpha", Range(0,1)) = 1.0 - [HideInInspector] _OutlineMipLevel("Outline Mip Level", Range(0,3)) = 0 } SubShader { diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Screen-URP-2D.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Screen-URP-2D.shader index b649c540e..28ffba1df 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Screen-URP-2D.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/2D/BlendModes/Spine-Skeleton-Screen-URP-2D.shader @@ -6,16 +6,6 @@ _Cutoff ("Shadow alpha cutoff", Range(0,1)) = 0.1 [HideInInspector] _StencilRef("Stencil Reference", Float) = 1.0 [HideInInspector][Enum(UnityEngine.Rendering.CompareFunction)] _StencilComp("Stencil Comparison", Float) = 8 // Set to Always as default - - // Outline properties are drawn via custom editor. - [HideInInspector] _OutlineWidth("Outline Width", Range(0,8)) = 3.0 - [HideInInspector] _OutlineColor("Outline Color", Color) = (1,1,0,1) - [HideInInspector] _OutlineReferenceTexWidth("Reference Texture Width", Int) = 1024 - [HideInInspector] _ThresholdEnd("Outline Threshold", Range(0,1)) = 0.25 - [HideInInspector] _OutlineSmoothness("Outline Smoothness", Range(0,1)) = 1.0 - [HideInInspector][MaterialToggle(_USE8NEIGHBOURHOOD_ON)] _Use8Neighbourhood("Sample 8 Neighbours", Float) = 1 - [HideInInspector] _OutlineOpaqueAlpha("Opaque Alpha", Range(0,1)) = 1.0 - [HideInInspector] _OutlineMipLevel("Outline Mip Level", Range(0,3)) = 0 } SubShader { diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Additive-URP.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Additive-URP.shader index e3522a414..929396eb6 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Additive-URP.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Additive-URP.shader @@ -6,16 +6,6 @@ _Cutoff ("Shadow alpha cutoff", Range(0,1)) = 0.1 [HideInInspector] _StencilRef("Stencil Reference", Float) = 1.0 [HideInInspector][Enum(UnityEngine.Rendering.CompareFunction)] _StencilComp("Stencil Comparison", Float) = 8 // Set to Always as default - - // Outline properties are drawn via custom editor. - [HideInInspector] _OutlineWidth("Outline Width", Range(0,8)) = 3.0 - [HideInInspector] _OutlineColor("Outline Color", Color) = (1,1,0,1) - [HideInInspector] _OutlineReferenceTexWidth("Reference Texture Width", Int) = 1024 - [HideInInspector] _ThresholdEnd("Outline Threshold", Range(0,1)) = 0.25 - [HideInInspector] _OutlineSmoothness("Outline Smoothness", Range(0,1)) = 1.0 - [HideInInspector][MaterialToggle(_USE8NEIGHBOURHOOD_ON)] _Use8Neighbourhood("Sample 8 Neighbours", Float) = 1 - [HideInInspector] _OutlineOpaqueAlpha("Opaque Alpha", Range(0,1)) = 1.0 - [HideInInspector] _OutlineMipLevel("Outline Mip Level", Range(0,3)) = 0 } SubShader { diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Multiply-URP.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Multiply-URP.shader index 782a76791..0d003ebb5 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Multiply-URP.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Multiply-URP.shader @@ -6,16 +6,6 @@ _Cutoff ("Shadow alpha cutoff", Range(0,1)) = 0.1 [HideInInspector] _StencilRef("Stencil Reference", Float) = 1.0 [HideInInspector][Enum(UnityEngine.Rendering.CompareFunction)] _StencilComp("Stencil Comparison", Float) = 8 // Set to Always as default - - // Outline properties are drawn via custom editor. - [HideInInspector] _OutlineWidth("Outline Width", Range(0,8)) = 3.0 - [HideInInspector] _OutlineColor("Outline Color", Color) = (1,1,0,1) - [HideInInspector] _OutlineReferenceTexWidth("Reference Texture Width", Int) = 1024 - [HideInInspector] _ThresholdEnd("Outline Threshold", Range(0,1)) = 0.25 - [HideInInspector] _OutlineSmoothness("Outline Smoothness", Range(0,1)) = 1.0 - [HideInInspector][MaterialToggle(_USE8NEIGHBOURHOOD_ON)] _Use8Neighbourhood("Sample 8 Neighbours", Float) = 1 - [HideInInspector] _OutlineOpaqueAlpha("Opaque Alpha", Range(0,1)) = 1.0 - [HideInInspector] _OutlineMipLevel("Outline Mip Level", Range(0,3)) = 0 } SubShader { diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Screen-URP.shader b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Screen-URP.shader index 86166f4b9..667bd6064 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Screen-URP.shader +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/Shaders/BlendModes/Spine-Skeleton-Screen-URP.shader @@ -6,16 +6,6 @@ _Cutoff ("Shadow alpha cutoff", Range(0,1)) = 0.1 [HideInInspector] _StencilRef("Stencil Reference", Float) = 1.0 [HideInInspector][Enum(UnityEngine.Rendering.CompareFunction)] _StencilComp("Stencil Comparison", Float) = 8 // Set to Always as default - - // Outline properties are drawn via custom editor. - [HideInInspector] _OutlineWidth("Outline Width", Range(0,8)) = 3.0 - [HideInInspector] _OutlineColor("Outline Color", Color) = (1,1,0,1) - [HideInInspector] _OutlineReferenceTexWidth("Reference Texture Width", Int) = 1024 - [HideInInspector] _ThresholdEnd("Outline Threshold", Range(0,1)) = 0.25 - [HideInInspector] _OutlineSmoothness("Outline Smoothness", Range(0,1)) = 1.0 - [HideInInspector][MaterialToggle(_USE8NEIGHBOURHOOD_ON)] _Use8Neighbourhood("Sample 8 Neighbours", Float) = 1 - [HideInInspector] _OutlineOpaqueAlpha("Opaque Alpha", Range(0,1)) = 1.0 - [HideInInspector] _OutlineMipLevel("Outline Mip Level", Range(0,3)) = 0 } SubShader { 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 d42db0f0a..0ea608d4b 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.24", + "version": "4.1.25", "unity": "2019.3", "author": { "name": "Esoteric Software",