Prepare/0.3.2 preview (#65)

* next version is 0.3.2-preview. * updated package.json * Disabled image-coparison-test for mirror-test scene in latest 2021.2 beta
Unity-Technologies · Sep 27, 2021 · 4811c45 · 4811c45
1 parent ad6ddf5
commit 4811c45
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 34 deletions.
diff --git a/TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/manifest.json b/TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/manifest.json
@@ -2,11 +2,11 @@
   "dependencies": {
     "com.unity.ide.rider": "3.0.7",
     "com.unity.ide.visualstudio": "2.0.11",
-    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.ide.vscode": "1.2.4",
     "com.unity.package-validation-suite": "0.10.0-preview",
     "com.unity.raytracedhardshadow": "https://github.com/unity3d-jp/RaytracedHardShadow.git#bbba12aaf3e7c6fb1c198746ef9a0fcf408b79b9",
     "com.unity.render-pipelines.high-definition": "12.0.0",
-    "com.unity.test-framework": "1.1.27",
+    "com.unity.test-framework": "1.1.29",
     "com.unity.test-framework.build": "0.0.1-preview.14",
     "com.unity.test-framework.utp-reporter": "1.0.2-preview",
     "com.unity.testframework.graphics": "7.8.14-preview",

diff --git a/TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/packages-lock.json b/TestProjects/HdrpDX12GraphicsTest-2021.2/Packages/packages-lock.json
@@ -15,7 +15,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.6.0-pre.2",
+      "version": "1.6.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -58,7 +58,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.3",
+      "version": "1.2.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -168,7 +168,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.27",
+      "version": "1.1.29",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/TestProjects/HdrpDX12GraphicsTest-2021.2/ProjectSettings/EditorBuildSettings.asset b/TestProjects/HdrpDX12GraphicsTest-2021.2/ProjectSettings/EditorBuildSettings.asset
@@ -26,7 +26,7 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/MatCapMask.unity
     guid: d453b3ea73cc402790f75c33c8004129
-  - enabled: 1
+  - enabled: 0
     path: Assets/Scenes/MirrorTest.unity
     guid: 29586b022ed34d3aa198a53130a5e9f0
   - enabled: 1

diff --git a/TestProjects/HdrpDX12GraphicsTest-2021.2/ProjectSettings/ProjectVersion.txt b/TestProjects/HdrpDX12GraphicsTest-2021.2/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.2.0b9
-m_EditorVersionWithRevision: 2021.2.0b9 (162b5e238388)
+m_EditorVersion: 2021.2.0b13
+m_EditorVersionWithRevision: 2021.2.0b13 (94c1109a0557)
diff --git a/TestProjects/HdrpGraphicsTest-2021.2/Packages/manifest.json b/TestProjects/HdrpGraphicsTest-2021.2/Packages/manifest.json
@@ -2,11 +2,11 @@
   "dependencies": {
     "com.unity.ide.rider": "3.0.7",
     "com.unity.ide.visualstudio": "2.0.11",
-    "com.unity.ide.vscode": "1.2.3",
+    "com.unity.ide.vscode": "1.2.4",
     "com.unity.package-validation-suite": "0.10.0-preview",
     "com.unity.raytracedhardshadow": "https://github.com/unity3d-jp/RaytracedHardShadow.git",
     "com.unity.render-pipelines.high-definition": "12.0.0",
-    "com.unity.test-framework": "1.1.27",
+    "com.unity.test-framework": "1.1.29",
     "com.unity.test-framework.build": "0.0.1-preview.14",
     "com.unity.test-framework.utp-reporter": "1.0.2-preview",
     "com.unity.testframework.graphics": "7.8.14-preview",

diff --git a/TestProjects/HdrpGraphicsTest-2021.2/Packages/packages-lock.json b/TestProjects/HdrpGraphicsTest-2021.2/Packages/packages-lock.json
@@ -15,7 +15,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.burst": {
-      "version": "1.6.0-pre.2",
+      "version": "1.6.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -58,7 +58,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.3",
+      "version": "1.2.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
@@ -168,7 +168,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.27",
+      "version": "1.1.29",
       "depth": 0,
       "source": "registry",
       "dependencies": {

diff --git a/TestProjects/HdrpGraphicsTest-2021.2/ProjectSettings/EditorBuildSettings.asset b/TestProjects/HdrpGraphicsTest-2021.2/ProjectSettings/EditorBuildSettings.asset
@@ -26,7 +26,7 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/MatCapMask.unity
     guid: d453b3ea73cc402790f75c33c8004129
-  - enabled: 1
+  - enabled: 0
     path: Assets/Scenes/MirrorTest.unity
     guid: 29586b022ed34d3aa198a53130a5e9f0
   - enabled: 1

diff --git a/TestProjects/HdrpGraphicsTest-2021.2/ProjectSettings/ProjectVersion.txt b/TestProjects/HdrpGraphicsTest-2021.2/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.2.0b9
-m_EditorVersionWithRevision: 2021.2.0b9 (162b5e238388)
+m_EditorVersion: 2021.2.0b13
+m_EditorVersionWithRevision: 2021.2.0b13 (94c1109a0557)
diff --git a/com.unity.toonshader/CHANGELOG.md b/com.unity.toonshader/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Changelog
+## [0.3.2-preview] - 2021-09-28
+### Added
+* doc: HDRP: description for ray-trace shadow.
+### Fixed
+* HDRP: fix Gaps between self-shadow and ray-trace shadow.
+
 ## [0.3.1-preview] - 2021-09-27
-* Nothing yet
+* description is above.
+
 ## [0.3.0-preview] - 2021-09-16
 * HDRP: Fixed wiered steps when more than 3 point lights are in a scene.
 * HDRP: Added Toon EV Adjustement per Model.

diff --git a/com.unity.toonshader/Documentation~/index.md b/com.unity.toonshader/Documentation~/index.md
@@ -1,4 +1,4 @@
-# Unity Toon Shader 0.3.1-preview Manual
+# Unity Toon Shader 0.3.2-preview Manual
 ***Read this document in [日本語版](ja/index_ja.md)***  
 
 <span style="font-size: 150%; color: red; ">【NEW】</span> [<span style="font-size: 150% ">HDRP Scene/Model Toon EV Adjustment</span>](#ToonEvAdjustmentCurve)
@@ -56,7 +56,7 @@ Several techniques have been implemented to beautifully display characters in a
 See for yourself by coloring your best character model with Unity Toon Shader.  
 You may be surprised to see your character looking better than ever before.  
 
-This manual focuses on the latest version of Unity Toon Shader: **Unity Toon Shader v.0.3.1-preview**.  
+This manual focuses on the latest version of Unity Toon Shader: **Unity Toon Shader v.0.3.2-preview**.  
 In this manual, the screen of Unity Toon Shader for Universal Render Pipeline is used as an example, but the ones for the Legacy (Built-in) and HDRP versions are alomost the same with URP, so please read it accordingly.  
 
 ## 【Start using Unity Toon Shader】
@@ -233,7 +233,7 @@ The Color Space must be set to `Linear`.
 
 <img width = "400" src="images/SelectLinearColorSpace.png">
 
-The following sample scenes can be found by opening the sample project and opening the `Assets\Samples\Unity Toon Shader\0.3.1-preview\Universal render pipeline` folder.  
+The following sample scenes can be found by opening the sample project and opening the `Assets\Samples\Unity Toon Shader\0.3.2-preview\Universal render pipeline` folder.  
 
 * ToonShader.unity            ：Settings for an illustration-style shader.  
 * ToonShader_CelLook.unity    ：Settings for a cel-style shader.  
@@ -256,8 +256,8 @@ They should come in handy as an example when creating your own scenes.
 
 【**NOTE**】 
 Sample scenes for other render pipeline can be found in the following folder.  
-* for Legacy (Built-in)：`Assets\Samples\Unity Toon Shader\0.3.1-preview\Legacy render pipeline` folder  
-* for HDRP：`Assets\Samples\Unity Toon Shader\0.3.1-preview\High definition render pipeline` folder 
+* for Legacy (Built-in)：`Assets\Samples\Unity Toon Shader\0.3.2-preview\Legacy render pipeline` folder  
+* for HDRP：`Assets\Samples\Unity Toon Shader\0.3.2-preview\High definition render pipeline` folder 
 
 
 # Unity Toon Shader Setting Menu：Unity Toon Shader Custom Inspector

diff --git a/com.unity.toonshader/Documentation~/ja/index_ja.md b/com.unity.toonshader/Documentation~/ja/index_ja.md
@@ -1,4 +1,4 @@
-# Unity Toon Shader 0.3.1-preview マニュアル
+# Unity Toon Shader 0.3.2-preview マニュアル
 ***Read this document in [English](../index.md)***  
 
 <span style="font-size: 150%; color: red; ">【NEW】</span> [<span style="font-size: 150% ">HDRP Scene/Model Toon EV Adjustment</span>](#ToonEvAdjustmentCurve)
@@ -55,7 +55,7 @@ Unity Toon Shader は、セルルック3DCGアニメーションの制作現場
 是非、貴方のご自慢のキャラクターモデルをUnity Toon Shaderで彩ってみてください。  
 今まで以上に、キャラクターが美しく表現されるものと思います。  
 
-本マニュアルは、Unity Toon Shader の最新版 **Unity Toon Shader v.0.3.1-preview** 向けに書かれています。  
+本マニュアルは、Unity Toon Shader の最新版 **Unity Toon Shader v.0.3.2-preview** 向けに書かれています。  
 またマニュアル中では、Universal Render Pipeline版のUnity Toon Shaderの画面を例として使用しますが、Legacy(Built-in)およびHDRP版に関しましても、ほぼ同様の画面となっていますので、適宜読み替えてください。  
 
 ## 【Unity Toon Shaderを使い始める】
@@ -229,7 +229,7 @@ Universal RP 用サンプルは`Project Setting`ダイアログで `UTS2URPPipel
 
 <img width = "400" src="../images/SelectLinearColorSpace.png">
 
-サンプルプロジェクトを開くと、`Assets\Samples\Unity Toon Shader\0.3.1-preview\Universal render pipeline`フォルダ以下に、次のようなサンプルシーンがあります。  
+サンプルプロジェクトを開くと、`Assets\Samples\Unity Toon Shader\0.3.2-preview\Universal render pipeline`フォルダ以下に、次のようなサンプルシーンがあります。  
 
 * ToonShader.unity			：イラストルックのシェーダー設定  
 * ToonShader_CelLook.unity	：セルルックのシェーダー設定  
@@ -252,8 +252,8 @@ Universal RP 用サンプルは`Project Setting`ダイアログで `UTS2URPPipel
 
 【**NOTE**】 
 その他のレンダーパイプライン向けのサンプルシーンは以下のフォルダに入っています。  
-* Legacy(Built-in)の場合：`Assets\Samples\Unity Toon Shader\0.3.1-preview\Legacy render pipeline`フォルダ  
-* HDRPの場合：`Assets\Samples\Unity Toon Shader\0.3.1-preview\High definition render pipeline`フォルダ　
+* Legacy(Built-in)の場合：`Assets\Samples\Unity Toon Shader\0.3.2-preview\Legacy render pipeline`フォルダ  
+* HDRPの場合：`Assets\Samples\Unity Toon Shader\0.3.2-preview\High definition render pipeline`フォルダ　
 
 # Unity Toon Shader 設定メニュー：Unity Toon Shaderカスタムインスペクター
 

diff --git a/com.unity.toonshader/Editor/UTS_GUIBase.cs b/com.unity.toonshader/Editor/UTS_GUIBase.cs
@@ -29,7 +29,7 @@ public class UTS_GUIBase : UnityEditor.ShaderGUI
     {
         protected const float kVersionX = 0.0f;
         protected const float kVersionY = 3.0f;
-        protected const float kVersionZ = 1.0f;
+        protected const float kVersionZ = 2.0f;
 
         internal virtual string srpDefaultLightModeName { get; }
         internal virtual void TessellationSetting(Material materal) { }

diff --git a/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader b/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToon.shader
@@ -14,7 +14,7 @@ Shader "HDRP/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) = 3
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 2
 
 
         // Reminder. Color here are in linear but the UI (color picker) do the conversion sRGB to linear

diff --git a/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToonTessellation.shader b/com.unity.toonshader/Runtime/HDRP/Shaders/HDRPToonTessellation.shader
@@ -14,7 +14,7 @@ Shader "HDRP/ToonTessellation"
         [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) = 3
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 2
 
 
         // Reminder. Color here are in linear but the UI (color picker) do the conversion sRGB to linear

diff --git a/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToon.shader b/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToon.shader
@@ -8,7 +8,7 @@ Shader "Toon (Built-in)" {
         [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) = 3
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 2
         [HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF
         [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1
 

diff --git a/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToonTessellation.shader b/com.unity.toonshader/Runtime/Legacy/Shaders/LegacyToonTessellation.shader
@@ -8,7 +8,7 @@ Shader "ToonTessellation (Built-in)" {
         [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) = 3
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 2
         [HideInInspector] _utsTechnique ("Technique", int ) = 0 //DWF
         [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1
 

diff --git a/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToon.shader b/com.unity.toonshader/Runtime/UniversalRP/Shaders/UniversalToon.shader
@@ -9,7 +9,7 @@ Shader "Universal Render Pipeline/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) = 3
-        [HideInInspector] _utsVersionZ("VersionZ", Float) = 1
+        [HideInInspector] _utsVersionZ("VersionZ", Float) = 2
 
         [HideInInspector] _utsTechnique("Technique", int) = 0 //DWF
         [HideInInspector] _AutoRenderQueue("Automatic Render Queue ", int) = 1

diff --git a/com.unity.toonshader/package.json b/com.unity.toonshader/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "com.unity.toonshader",
 	"displayName":"Unity Toon Shader",
-	"version": "0.3.1-preview",
+	"version": "0.3.2-preview",
 	"unity": "2019.4",
 	"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.",
     "samples": [