ver 0.18.3-alpha

yoship1639 · Apr 7, 2022 · a4a21c4 · a4a21c4
1 parent 88ab981
commit a4a21c4
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## [0.18.3] - 2022-04-08
+- Lightweighted logic for normal correction.
+
 ## [0.18.2] - 2022-04-05
 - Added renderer feature for when outlines do not work during deferred rendering.
 

diff --git a/Editor/ShaderGUI/LitShader.cs b/Editor/ShaderGUI/LitShader.cs
@@ -47,7 +47,7 @@ public override void OnGUI(MaterialEditor materialEditor, MaterialProperty[] pro
             var blendModeChanged = false;
 
             // version
-            GUILayout.Label("UniToon ver 0.18.2-alpha");
+            GUILayout.Label("UniToon ver 0.18.3-alpha");
 
             EditorGUILayout.Space();
             changed = MaterialGUI.Enum<UniToonVersion>("Version", FindProperty("_UniToonVer", properties));

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # UniToon
 
-ver 0.18.2-alpha
+ver 0.18.3-alpha
 
 Physically-based Toon Shader for game applications. Compliant with Unity standard rendering functions. It is not targeted to be multifunctional in order to keep performance, but to be universally usable.
 

diff --git a/Shaders/URP_2021_1/LitForwardPass.hlsl b/Shaders/URP_2021_1/LitForwardPass.hlsl
@@ -51,7 +51,7 @@ struct Varyings
 #endif
 
     float4 screenPos                : TEXCOORD9;
-    float3 originWS                 : TEXCOORD10;
+    float3 normalCorrectWS          : TEXCOORD10;
 
     float4 positionCS               : SV_POSITION;
     UNITY_VERTEX_INPUT_INSTANCE_ID
@@ -150,7 +150,12 @@ Varyings LitPassVertex(Attributes input)
 
     output.positionCS = vertexInput.positionCS;
     output.screenPos = output.positionCS;
-    output.originWS = TransformObjectToWorld(_NormalCorrectOrigin);
+
+    float3 normalCorrectOS = (input.positionOS.xyz - _NormalCorrectOrigin);
+    float3 normalCorrectDir = normalCorrectOS;
+    normalCorrectDir.y = 0.0;
+    normalCorrectDir = SafeNormalize(normalCorrectDir);
+    output.normalCorrectWS = TransformObjectToWorldNormal(normalCorrectDir);
 
     return output;
 }
@@ -181,10 +186,7 @@ half4 LitPassFragment(Varyings input) : SV_Target
     half ramp;
 
     // normal correct
-    half3 normalCorrectWS = (input.positionWS - input.originWS);
-    normalCorrectWS.y = 0.0;
-    normalCorrectWS = normalize(normalCorrectWS);
-    inputData.normalWS = normalize(lerp(inputData.normalWS, normalCorrectWS, _NormalCorrect));
+    inputData.normalWS = normalize(lerp(inputData.normalWS, input.normalCorrectWS, _NormalCorrect));
 
     half4 color = UniToonFragmentPBR(inputData, surfaceData, shadeColor, _ToonyFactor, ramp);
 

diff --git a/Shaders/URP_2021_2/LitForwardPass.hlsl b/Shaders/URP_2021_2/LitForwardPass.hlsl
@@ -60,7 +60,7 @@ struct Varyings
 #endif
 
     float4 screenPos                : TEXCOORD10;
-    float3 originWS                 : TEXCOORD11;
+    float3 normalCorrectWS          : TEXCOORD11;
 
     float4 positionCS               : SV_POSITION;
     UNITY_VERTEX_INPUT_INSTANCE_ID
@@ -189,7 +189,12 @@ Varyings LitPassVertex(Attributes input)
 
     output.positionCS = vertexInput.positionCS;
     output.screenPos = output.positionCS;
-    output.originWS = TransformObjectToWorld(_NormalCorrectOrigin);
+
+    float3 normalCorrectOS = (input.positionOS.xyz - _NormalCorrectOrigin);
+    float3 normalCorrectDir = normalCorrectOS;
+    normalCorrectDir.y = 0.0;
+    normalCorrectDir = SafeNormalize(normalCorrectDir);
+    output.normalCorrectWS = TransformObjectToWorldNormal(normalCorrectDir);
 
     return output;
 }
@@ -226,10 +231,7 @@ half4 LitPassFragment(Varyings input) : SV_Target
     half ramp;
 
     // normal correct
-    half3 normalCorrectWS = (input.positionWS - input.originWS);
-    normalCorrectWS.y = 0.0;
-    normalCorrectWS = normalize(normalCorrectWS);
-    inputData.normalWS = normalize(lerp(inputData.normalWS, normalCorrectWS, _NormalCorrect));
+    inputData.normalWS = normalize(lerp(inputData.normalWS, input.normalCorrectWS, _NormalCorrect));
 
     half4 color = UniToonFragmentPBR(inputData, surfaceData, shadeColor, _ToonyFactor, ramp);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.yoship1639.unitoon",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "displayName": "UniToon",
   "description": "A universally usable toon shader. compliant with Unity standard rendering functions, aiming to create a shader that can withstand avatar use across platforms, such as VRM, which is expected to grow in the future",
   "unity": "2020.2",