fix ShadowCaster pass bug when using Metal or DX11.

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

Hide file tree

Showing 8 changed files with 8 additions and 17 deletions.
diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Direct GBuffer.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Direct GBuffer.txt
@@ -16,7 +16,6 @@ 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.02
 @endif
 
 @block Properties

diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Standard.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Standard.txt
@@ -16,7 +16,6 @@ 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.02
 @endif
 
 @block Properties

diff --git a/Assets/uRaymarching/Examples/Materials/HexFloor.mat b/Assets/uRaymarching/Examples/Materials/HexFloor.mat
diff --git a/Assets/uRaymarching/Examples/Shaders/HexFloor.shader b/Assets/uRaymarching/Examples/Shaders/HexFloor.shader
@@ -13,7 +13,6 @@ 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.02
 
 // @block Properties
 [Header(Additional Properties)]
@@ -94,7 +93,6 @@ 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,7 +13,6 @@ 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.02
 
 // @block Properties
 // _Color("Color", Color) = (1.0, 1.0, 1.0, 1.0)

diff --git a/Assets/uRaymarching/Shaders/Include/Utils.cginc b/Assets/uRaymarching/Shaders/Include/Utils.cginc
@@ -35,6 +35,11 @@ inline float3 EncodeNormal(float3 normal)
     return normal * 0.5 + 0.5;
 }
 
+inline float3 DecodeNormal(float3 normal)
+{
+    return 2.0 * normal - 1.0;
+}
+
 inline bool IsInnerCube(float3 pos, float3 scale)
 {
     return all(max(scale * 0.5 - abs(pos), 0.0));

diff --git a/Assets/uRaymarching/Shaders/Include/VertFragShadowObject.cginc b/Assets/uRaymarching/Shaders/Include/VertFragShadowObject.cginc
@@ -8,23 +8,14 @@
 
 float _ShadowMinDistance;
 int _ShadowLoop;
-float _ShadowExtraBias;
-
-float4 ApplyLinearShadowBias(float4 clipPos)
-{
-    clipPos.z += saturate((unity_LightShadowBias.x + _ShadowExtraBias) / clipPos.w);
-    float clamped = max(clipPos.z, clipPos.w * UNITY_NEAR_CLIP_VALUE);
-    clipPos.z = lerp(clipPos.z, clamped, unity_LightShadowBias.y);
-    return clipPos;
-}
 
 VertShadowOutput Vert(VertShadowInput v)
 {
     VertShadowOutput o;
     o.pos = UnityObjectToClipPos(v.vertex);
     o.screenPos = o.pos;
     o.worldPos = mul(unity_ObjectToWorld, v.vertex);
-    o.normal = v.normal;
+    o.normal = mul(unity_ObjectToWorld, v.normal);
     return o;
 }
 
@@ -74,9 +65,9 @@ void Frag(
     if (!_Raymarch(ray)) discard;
 
     float4 opos = mul(unity_WorldToObject, float4(ray.endPos, 1.0));
-    float3 worldNormal = 2.0 * ray.normal - 1.0;
+    float3 worldNormal = DecodeNormal(ray.normal);
     opos = UnityClipSpaceShadowCasterPos(opos, worldNormal);
-    opos = ApplyLinearShadowBias(opos);
+    opos = UnityApplyLinearShadowBias(opos);
     outColor = outDepth = EncodeDepth(opos);
 }
 

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