fix shadow problem #3.

hecomi · Jan 7, 2018 · 37b34e4 · 37b34e4
1 parent d6ffd2d
commit 37b34e4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 1 deletion.
diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Direct GBuffer.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Direct GBuffer.txt
@@ -16,6 +16,7 @@ Properties
 @if ShadowCaster : true
     _ShadowLoop("Shadow Loop", Range(1, 100)) = 10
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
+    _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 1.0)) = 0.01
 @endif
 
 @block Properties

diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Standard.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Standard.txt
@@ -16,6 +16,7 @@ Properties
 @if ShadowCaster : true
     _ShadowLoop("Shadow Loop", Range(1, 100)) = 10
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
+    _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 1.0)) = 0.01
 @endif
 
 @block Properties

diff --git a/Assets/uRaymarching/Examples/Scenes/Hex Floor.unity b/Assets/uRaymarching/Examples/Scenes/Hex Floor.unity
diff --git a/Assets/uRaymarching/Examples/Shaders/HexFloor.shader b/Assets/uRaymarching/Examples/Shaders/HexFloor.shader
@@ -13,6 +13,7 @@ Properties
     _MinDistance("Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowLoop("Shadow Loop", Range(1, 100)) = 10
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
+    _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 1.0)) = 0.01
 
 // @block Properties
 [Header(Additional Properties)]
@@ -93,6 +94,7 @@ inline float DistanceFunction(float3 pos)
     // combine
     return min(d1, d2);
 }
+
 // @endblock
 
 // @block PostEffect

diff --git a/Assets/uRaymarching/Examples/Shaders/SphereBoxMorph.shader b/Assets/uRaymarching/Examples/Shaders/SphereBoxMorph.shader
@@ -13,6 +13,7 @@ Properties
     _MinDistance("Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowLoop("Shadow Loop", Range(1, 100)) = 10
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
+    _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 1.0)) = 0.01
 
 // @block Properties
 // _Color("Color", Color) = (1.0, 1.0, 1.0, 1.0)

diff --git a/Assets/uRaymarching/Shaders/Include/VertFragShadowObject.cginc b/Assets/uRaymarching/Shaders/Include/VertFragShadowObject.cginc
@@ -6,9 +6,23 @@
 #include "./Raymarching.cginc"
 #include "./Utils.cginc"
 
+float _ShadowExtraBias;
 float _ShadowMinDistance;
 int _ShadowLoop;
 
+float4 ApplyLinearShadowBias(float4 clipPos)
+{
+#if defined(UNITY_REVERSED_Z)
+    clipPos.z += max(-1.0, min((unity_LightShadowBias.x - _ShadowExtraBias) / clipPos.w, 0.0));
+    float clamped = min(clipPos.z, clipPos.w * UNITY_NEAR_CLIP_VALUE);
+#else
+    clipPos.z += saturate((unity_LightShadowBias.x + _ShadowExtraBias) / clipPos.w);
+    float clamped = max(clipPos.z, clipPos.w * UNITY_NEAR_CLIP_VALUE);
+#endif
+    clipPos.z = lerp(clipPos.z, clamped, unity_LightShadowBias.y);
+    return clipPos;
+}
+
 VertShadowOutput Vert(VertShadowInput v)
 {
     VertShadowOutput o;
@@ -67,7 +81,7 @@ void Frag(
     float4 opos = mul(unity_WorldToObject, float4(ray.endPos, 1.0));
     float3 worldNormal = DecodeNormal(ray.normal);
     opos = UnityClipSpaceShadowCasterPos(opos, worldNormal);
-    opos = UnityApplyLinearShadowBias(opos);
+    opos = ApplyLinearShadowBias(opos);
     outColor = outDepth = EncodeDepth(opos);
 }
 

diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset