Merge pull request #3 from ishiiyuki/noMirrorAndnoCamera

fix bug
ishiiyuki · Aug 2, 2023 · 42ffab5 · 42ffab5
2 parents a712c7c + 01df3c7
commit 42ffab5
Show file tree

Hide file tree

Showing 11 changed files with 1,179 additions and 2 deletions.
diff --git a/Assets/csc.rsp b/Assets/csc.rsp
@@ -0,0 +1 @@
+-r:System.IO.Compression.FileSystem.dll
diff --git a/Assets/csc.rsp.meta b/Assets/csc.rsp.meta
diff --git a/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock b/Assets/lilToon/CustomShaderResources/Properties/Default.lilblock
@@ -1,6 +1,8 @@
         //----------------------------------------------------------------------------------------------------------------------
         // Base
         [lilToggle]     _Invisible                  ("sInvisible", Int) = 0
+        [lilToggle]     _NoMirror                  ("sNoMirror", Int) = 0
+        [lilToggle]     _NoCamera                  ("sNoCamera", Int) = 0
                         _AsUnlit                    ("sAsUnlit", Range(0, 1)) = 0
                         _Cutoff                     ("sCutoff", Range(-0.001,1.001)) = 0.5
                         _SubpassCutoff              ("sSubpassCutoff", Range(0,1)) = 0.5

diff --git a/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock b/Assets/lilToon/CustomShaderResources/Properties/DefaultAll.lilblock
@@ -1,6 +1,8 @@
         //----------------------------------------------------------------------------------------------------------------------
         // Base
         [lilToggle]     _Invisible                  ("sInvisible", Int) = 0
+        [lilToggle]     _NoMirror                  ("sNoMirror", Int) = 0
+        [lilToggle]     _NoCamera                  ("sNoCamera", Int) = 0
                         _AsUnlit                    ("sAsUnlit", Range(0, 1)) = 0
                         _Cutoff                     ("sCutoff", Range(-0.001,1.001)) = 0.5
                         _SubpassCutoff              ("sSubpassCutoff", Range(0,1)) = 0.5

diff --git a/Assets/lilToon/CustomShaderResources/Properties/DefaultFakeShadow.lilblock b/Assets/lilToon/CustomShaderResources/Properties/DefaultFakeShadow.lilblock
@@ -1,6 +1,8 @@
         //----------------------------------------------------------------------------------------------------------------------
         // Base
         [lilToggle]     _Invisible                  ("sInvisible", Int) = 0
+        [lilToggle]     _NoMirror                  ("sNoMirror", Int) = 0
+        [lilToggle]     _NoCamera                  ("sNoCamera", Int) = 0
 
         //----------------------------------------------------------------------------------------------------------------------
         // Main

diff --git a/Assets/lilToon/CustomShaderResources/Properties/DefaultLite.lilblock b/Assets/lilToon/CustomShaderResources/Properties/DefaultLite.lilblock
@@ -1,6 +1,8 @@
         //----------------------------------------------------------------------------------------------------------------------
         // Base
         [lilToggle]     _Invisible                  ("sInvisible", Int) = 0
+        [lilToggle]     _NoMirror                  ("sNoMirror", Int) = 0
+        [lilToggle]     _NoCamera                  ("sNoCamera", Int) = 0
                         _AsUnlit                    ("sAsUnlit", Range(0, 1)) = 0
                         _Cutoff                     ("sCutoff", Range(-0.001,1.001)) = 0.5
                         _SubpassCutoff              ("sSubpassCutoff", Range(0,1)) = 0.5

diff --git a/Assets/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl b/Assets/lilToon/Shader/Includes/lil_pass_forward_normal.hlsl
@@ -129,15 +129,15 @@ float4 frag(v2f input LIL_VFACE(facing)) : SV_Target
 
     if (_NoMirror)
     {
-        if (!LIL_MATRIX_P[2][2] <= 0)
+        if (LIL_MATRIX_P[2][2] <= 0)
         {
             clip(-1);
         }
     }
 
     if (_NoCamera)
     {
-        if (!IsInVRCCamera())
+        if (IsInVRCCamera())
         {
             clip(-1);
         }