Merge branch 'lilxyzw:master' into master

ishiiyuki · Sep 4, 2023 · 207477d · 207477d
2 parents 659ec80 + 31c6e39
commit 207477d
Show file tree

Hide file tree

Showing 93 changed files with 667 additions and 319 deletions.
diff --git a/Assets/lilToon/CHANGELOG.md b/Assets/lilToon/CHANGELOG.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.1] - 2023-09-04
+### Fixed
+- `Fix Lighting` does not work properly when bones are missing
+- Some properties cannot be saved in presets
+- Duplicate TEXCOORD in custom shaders
+- Tessellation does not work properly when changing scale
+- Enable stencil in `DepthOnly`, `DepthNormals` and `MotionVectors` for URP
+
 ## [1.4.0] - 2023-05-12
 ### Added
 - Mask by vertex id

diff --git a/Assets/lilToon/CHANGELOG_JP.md b/Assets/lilToon/CHANGELOG_JP.md
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.1] - 2023-09-04
+### 修正
+- ボーンが不足している場合に`Fix Lighting`が正しく動作しないのを修正
+- 一部プロパティがプリセットに保存できないのを修正
+- カスタムシェーダーでTEXCOORDが重複するのを修正
+- スケールの変更でテッセレーションが正常に動作しない問題を修正
+- URPの`DepthOnly``DepthNormals``MotionVectors`パスでステンシルを使うように修正
+
 ## [1.4.0] - 2023-05-12
 ### 追加
 - 頂点IDによるマスクを追加

diff --git a/Assets/lilToon/CustomShaderResources/URP/Default.lilblock b/Assets/lilToon/CustomShaderResources/URP/Default.lilblock
@@ -145,6 +145,17 @@
         {
             Name "DEPTHONLY"
             Tags {"LightMode" = "DepthOnly"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -176,6 +187,17 @@
         {
             Name "DEPTHNORMALS"
             Tags {"LightMode" = "DepthNormals"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -207,6 +229,17 @@
         {
             Name "MOTIONVECTORS"
             Tags {"LightMode" = "MotionVectors"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]

diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultFur.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultFur.lilblock
@@ -146,6 +146,17 @@
         {
             Name "DEPTHONLY"
             Tags {"LightMode" = "DepthOnly"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -177,6 +188,17 @@
         {
             Name "DEPTHNORMALS"
             Tags {"LightMode" = "DepthNormals"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -208,6 +230,17 @@
         {
             Name "MOTIONVECTORS"
             Tags {"LightMode" = "MotionVectors"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]

diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultFurTwoPass.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultFurTwoPass.lilblock
@@ -195,6 +195,17 @@
         {
             Name "DEPTHONLY"
             Tags {"LightMode" = "DepthOnly"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -226,6 +237,17 @@
         {
             Name "DEPTHNORMALS"
             Tags {"LightMode" = "DepthNormals"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -257,6 +279,17 @@
         {
             Name "MOTIONVECTORS"
             Tags {"LightMode" = "MotionVectors"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]

diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultGem.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultGem.lilblock
@@ -141,6 +141,17 @@
         {
             Name "DEPTHONLY"
             Tags {"LightMode" = "DepthOnly"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -172,6 +183,17 @@
         {
             Name "DEPTHNORMALS"
             Tags {"LightMode" = "DepthNormals"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -203,6 +225,17 @@
         {
             Name "MOTIONVECTORS"
             Tags {"LightMode" = "MotionVectors"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]

diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultLite.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultLite.lilblock
@@ -146,6 +146,17 @@
         {
             Name "DEPTHONLY"
             Tags {"LightMode" = "DepthOnly"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -177,6 +188,17 @@
         {
             Name "DEPTHNORMALS"
             Tags {"LightMode" = "DepthNormals"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -208,6 +230,17 @@
         {
             Name "MOTIONVECTORS"
             Tags {"LightMode" = "MotionVectors"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]

diff --git a/Assets/lilToon/CustomShaderResources/URP/DefaultLiteTwoSide.lilblock b/Assets/lilToon/CustomShaderResources/URP/DefaultLiteTwoSide.lilblock
@@ -194,6 +194,17 @@
         {
             Name "DEPTHONLY"
             Tags {"LightMode" = "DepthOnly"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -225,6 +236,17 @@
         {
             Name "DEPTHNORMALS"
             Tags {"LightMode" = "DepthNormals"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]
@@ -256,6 +278,17 @@
         {
             Name "MOTIONVECTORS"
             Tags {"LightMode" = "MotionVectors"}
+
+            Stencil
+            {
+                Ref [_StencilRef]
+                ReadMask [_StencilReadMask]
+                WriteMask [_StencilWriteMask]
+                Comp [_StencilComp]
+                Pass [_StencilPass]
+                Fail [_StencilFail]
+                ZFail [_StencilZFail]
+            }
             Cull [_Cull]
             ZClip [_ZClip]
             ZWrite [_ZWrite]