Task/1690 0.8.4 (#253)

* Next version is 0.8.4-preview

* updated the changelog

* Updated package.json.

* Fixed: URP shader compile error for Unity 2022.2.2f1.

* Removed 2021.3 from DX12 test.

* Updated CHANGELOG.md.

* Fixed: typo materal in README.md.

Author: H3idi-X

.yamato/win_dx12-hdrp-2021.3.yml

@@ -4,7 +4,7 @@
 test_projects:
   - name: HdrpDX12GraphicsTest-2021.3
 unity_versions:
-  - name: 2021.3
+#  - name: 2021.3
   - name: 2022.1
 ---
 {% for test_project in test_projects %}

README.md

@@ -12,7 +12,7 @@
   * [0.4.x-preview](com.unity.toonshader/Documentation~/whats-new-0.4.x.md)
   * [0.3.x-preview](com.unity.toonshader/Documentation~/whats-new-0.3.x.md)
 * [Getting Started](com.unity.toonshader/Documentation~/GettingStarted.md)
-* [Materal Converter](com.unity.toonshader/Documentation~/MaterialConverter.md)
+* [Material Converter](com.unity.toonshader/Documentation~/MaterialConverter.md)
 * [Shader Parameter Settings](com.unity.toonshader/Documentation~/Parameter-Settings.md)
   * [Modes](com.unity.toonshader/Documentation~/Modes.md)
   * [Shader Settings](com.unity.toonshader/Documentation~/Shader.md)

com.unity.toonshader/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Changelog
+## [0.8.4-preview] - 2023-01-05
+### Fixed:
+* URP Shader doesn't work with Unity 2022.2.2f1.
+
+
 ## [0.8.3-preview] - 2022-09-12
 ### Updated:
 * Next version is 0.8.3-preview

com.unity.toonshader/Editor/UTS3GUI.cs

@@ -13,9 +13,9 @@ internal partial class UTS3GUI : UnityEditor.ShaderGUI
 
         internal const float kVersionX = 0.0f;
         internal const float kVersionY = 8.0f;
-        internal const float kVersionZ = 3.0f;
+        internal const float kVersionZ = 4.0f;
 
-        internal static string versionString => "0.8.3-preview";
+        internal static string versionString => "0.8.4-preview";
 
         // Render Pipelines UTS supports are the followings 
         internal enum RenderPipeline

com.unity.toonshader/Runtime/Integrated/Shaders/UnityToon.shader

@@ -8,7 +8,7 @@ Shader "Toon" {
         [HideInInspector][Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1
         [HideInInspector] _utsVersionX("VersionX", Float) = 0
         [HideInInspector] _utsVersionY("VersionY", Float) = 8
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 3
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 4
         [HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF
         [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1
 

com.unity.toonshader/Runtime/Integrated/Shaders/UnityToonTessellation.shader

@@ -8,7 +8,7 @@ Shader "Toon(Tessellation)" {
         [HideInInspector][Enum(OFF, 0, ON, 1)] _isUnityToonshader("Material is touched by Unity Toon Shader", Int) = 1
         [HideInInspector] _utsVersionX("VersionX", Float) = 0
         [HideInInspector] _utsVersionY("VersionY", Float) = 8
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 3
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 4
         [HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF
         [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1
 

com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToonBody.hlsl

@@ -206,9 +206,9 @@
                 return SAMPLE_TEXTURE2D(_RaytracedHardShadow, sampler_RaytracedHardShadow, screenPos);
 #endif // UTS_USE_RAYTRACING_SHADOW
 
-#if !defined(ADDITIONAL_LIGHT_CALCULATE_SHADOWS)
-                return 1.0h;
-#endif
+#if defined(ADDITIONAL_LIGHT_CALCULATE_SHADOWS)
+
+
 # if (SHADER_LIBRARY_VERSION_MAJOR >= 13 && UNITY_VERSION >= 202220 )
                 ShadowSamplingData shadowSamplingData = GetAdditionalLightShadowSamplingData(lightIndex);
 # else
@@ -231,6 +231,9 @@
 
                 half4 shadowParams = GetAdditionalLightShadowParams(lightIndex);
                 return SampleShadowmap(TEXTURE2D_ARGS(_AdditionalLightsShadowmapTexture, sampler_AdditionalLightsShadowmapTexture), shadowCoord, shadowSamplingData, shadowParams, true);
+#else
+                return 1.0h;
+#endif
             }
 
 

com.unity.toonshader/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.toonshader",
 	"displayName":"Unity Toon Shader",
-	"version": "0.8.3-preview",
+	"version": "0.8.4-preview",
 	"unity": "2020.3",
 	"description": "Unity Toon Shader (Unity-Chan Toon Shader 3) is a toon shader for images and video that is designed to meet the needs of creators working on cel-shaded 3DCG animations.\nUnlike other pre-render toon shaders, all features can be adjusted in real time on Unity, which is the greatest feature of UTS.\n\nUTS has great power and makes a wide variety of character designs possible, from cel-shaded to light novel illustration styles.\n\nUTS has the 3 basic layers of Base Color, 1st Shade Color, and 2nd Shade Color, colors and textures can also accept a wide variety of customization options, such as High Color, Rim Light, MatCap (sphere mapping), and Emissive (light emission).The level of gradation (feather) between colors can also be adjusted in Unity in real-time.\n\nMore precisely, View documentation above.",
 	"dependencies":