add NormalDelta that is used when differentiating distance function t…

…o get normal.
hecomi · Jun 27, 2020 · a2574b0 · a2574b0
1 parent 204b79e
commit a2574b0
Show file tree

Hide file tree

Showing 26 changed files with 579 additions and 54 deletions.
diff --git a/...ts/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Deferred/Direct GBuffer.txt b/...ts/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Deferred/Direct GBuffer.txt
@@ -14,14 +14,15 @@ Properties
     [Enum(UnityEngine.Rendering.CullMode)] _Cull("Culling", Int) = 2
 
     [Header(Raymarching)]
-    _Loop("Loop", Range(1, 100)) = 30
+    [IntRange] _Loop("Loop", Range(1, 100)) = 30
     _MinDistance("Minimum Distance", Range(0.001, 0.1)) = 0.01
     _DistanceMultiplier("Distance Multiplier", Range(0.001, 2.0)) = 1.0
 @if ShadowCaster : true
-    _ShadowLoop("Shadow Loop", Range(1, 100)) = 10
+    [IntRange] _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, 0.1)) = 0.01
 @endif
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 @block Properties
 // _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)

diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Deferred/Standard.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Deferred/Standard.txt
@@ -22,6 +22,7 @@ Properties
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 0.1)) = 0.01
 @endif
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 @block Properties
 // _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)

diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Forward/Standard.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Forward/Standard.txt
@@ -27,6 +27,7 @@ Properties
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 0.1)) = 0.0
 @endif
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 @block Properties
 // _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)

diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Forward/Unlit.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/Forward/Unlit.txt
@@ -25,6 +25,7 @@ Properties
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 0.1)) = 0.01
 @endif
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 @block Properties
 // _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)

diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Lit.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Lit.txt
@@ -26,6 +26,7 @@ Properties
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(-1.0, 1.0)) = 0.01
 @endif
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 @block Properties
 // [Header(Additional Properties)]

diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Unlit.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Unlit.txt
@@ -23,6 +23,7 @@ Properties
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(-1.0, 1.0)) = 0.01
 @endif
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 @block Properties
 // [Header(Additional Properties)]

diff --git a/Assets/uRaymarching/Examples/Deferred/Hex Floor/Deffered_HexFloor.shader b/Assets/uRaymarching/Examples/Deferred/Hex Floor/Deffered_HexFloor.shader
@@ -18,6 +18,7 @@ Properties
     _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, 0.1)) = 0.01
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 // @block Properties
 [Header(Additional Properties)]
@@ -47,7 +48,7 @@ CGINCLUDE
 #define POST_EFFECT PostEffect
 #define PostEffectOutput SurfaceOutputStandard
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -131,7 +132,7 @@ Pass
     }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/DeferredStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/DeferredStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -146,7 +147,7 @@ Pass
     Tags { "LightMode" = "ShadowCaster" }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ShadowCaster.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ShadowCaster.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag

diff --git a/Assets/uRaymarching/Examples/Deferred/Mod World/Deffered_ModWorld.shader b/Assets/uRaymarching/Examples/Deferred/Mod World/Deffered_ModWorld.shader
@@ -16,6 +16,8 @@ Properties
     _MinDistance("Minimum Distance", Range(0.001, 0.1)) = 0.01
     _DistanceMultiplier("Distance Multiplier", Range(0.001, 2.0)) = 1.0
 
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
+
 // @block Properties
 [Header(Additional Parameters)]
 _Grid("Grid", 2D) = "" {}
@@ -52,7 +54,7 @@ CGINCLUDE
 #define POST_EFFECT PostEffect
 #define PostEffectOutput SurfaceOutputStandard
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -92,7 +94,7 @@ Pass
     }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/DeferredStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/DeferredStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag

diff --git a/Assets/uRaymarching/Examples/Deferred/Sphere Box Morph/Deffered_SphereBoxMorph.shader b/Assets/uRaymarching/Examples/Deferred/Sphere Box Morph/Deffered_SphereBoxMorph.shader
@@ -18,6 +18,7 @@ Properties
     _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, 0.1)) = 0.01
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 // @block Properties
 // _Color("Color", Color) = (1.0, 1.0, 1.0, 1.0)
@@ -48,7 +49,7 @@ CGINCLUDE
 #define POST_EFFECT PostEffect
 #define PostEffectOutput SurfaceOutputStandard
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -85,7 +86,7 @@ Pass
     }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/DeferredStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/DeferredStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -100,7 +101,7 @@ Pass
     Tags { "LightMode" = "ShadowCaster" }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ShadowCaster.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ShadowCaster.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag

diff --git a/Assets/uRaymarching/Examples/Forward/Hex Floor/Forward_HexFloor.shader b/Assets/uRaymarching/Examples/Forward/Hex Floor/Forward_HexFloor.shader
@@ -20,6 +20,7 @@ Properties
     _ShadowLoop("Shadow Loop", Range(1, 100)) = 30
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 0.1)) = 0.0
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 // @block Properties
 [Header(Additional Properties)]
@@ -51,7 +52,7 @@ CGINCLUDE
 #define PostEffectOutput SurfaceOutputStandard
 #define POST_EFFECT PostEffect
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -130,7 +131,7 @@ Pass
     ZWrite [_ZWrite]
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardBaseStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardBaseStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -147,7 +148,7 @@ Pass
     Blend One One
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardAddStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardAddStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -163,7 +164,7 @@ Pass
     Tags { "LightMode" = "ShadowCaster" }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ShadowCaster.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ShadowCaster.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag

diff --git a/Assets/uRaymarching/Examples/Forward/Lighting/Forward_Sphere.shader b/Assets/uRaymarching/Examples/Forward/Lighting/Forward_Sphere.shader
@@ -20,6 +20,7 @@ Properties
     _ShadowLoop("Shadow Loop", Range(1, 100)) = 30
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 0.1)) = 0.0
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 // @block Properties
 // _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)
@@ -50,7 +51,7 @@ CGINCLUDE
 #define PostEffectOutput SurfaceOutputStandard
 #define POST_EFFECT PostEffect
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -74,7 +75,7 @@ Pass
     ZWrite [_ZWrite]
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardBaseStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardBaseStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -91,7 +92,7 @@ Pass
     Blend One One
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardAddStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardAddStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -107,7 +108,7 @@ Pass
     Tags { "LightMode" = "ShadowCaster" }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ShadowCaster.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ShadowCaster.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag

diff --git a/Assets/uRaymarching/Examples/Forward/Mod World for VR/Forward_ModWorld_for_VR.shader b/Assets/uRaymarching/Examples/Forward/Mod World for VR/Forward_ModWorld_for_VR.shader
@@ -20,6 +20,7 @@ Properties
     _ShadowLoop("Shadow Loop", Range(1, 100)) = 30
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 0.1)) = 0.0
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 // @block Properties
 [Header(Additional Parameters)]
@@ -55,7 +56,7 @@ CGINCLUDE
 #define PostEffectOutput SurfaceOutputStandard
 #define POST_EFFECT PostEffect
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -89,7 +90,7 @@ Pass
     ZWrite [_ZWrite]
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardBaseStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardBaseStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -106,7 +107,7 @@ Pass
     Blend One One
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardAddStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardAddStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -122,7 +123,7 @@ Pass
     Tags { "LightMode" = "ShadowCaster" }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ShadowCaster.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ShadowCaster.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag

diff --git a/Assets/uRaymarching/Examples/Forward/Mod World/Forward_ModWorld.shader b/Assets/uRaymarching/Examples/Forward/Mod World/Forward_ModWorld.shader
@@ -16,6 +16,8 @@ Properties
     _MinDistance("Minimum Distance", Range(0.001, 0.1)) = 0.01
     _DistanceMultiplier("Distance Multiplier", Range(0.001, 2.0)) = 1.0
 
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
+
 // @block Properties
 [Header(Additional Parameters)]
 _Grid("Grid", 2D) = "" {}
@@ -48,7 +50,7 @@ CGINCLUDE
 #define POST_EFFECT PostEffect
 #define PostEffectOutput float4
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -88,7 +90,7 @@ Pass
     ZWrite [_ZWrite]
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardBaseUnlit.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardBaseUnlit.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag

diff --git a/Assets/uRaymarching/Examples/Forward/Sphere Box Morph/SphereBoxMorphForwardStandard.shader b/Assets/uRaymarching/Examples/Forward/Sphere Box Morph/SphereBoxMorphForwardStandard.shader
@@ -20,6 +20,7 @@ Properties
     _ShadowLoop("Shadow Loop", Range(1, 100)) = 30
     _ShadowMinDistance("Shadow Minimum Distance", Range(0.001, 0.1)) = 0.01
     _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 0.1)) = 0.0
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
 
 // @block Properties
 // _Color("Color", Color) = (1.0, 1.0, 1.0, 1.0)
@@ -52,7 +53,7 @@ CGINCLUDE
 #define PostEffectOutput SurfaceOutputStandard
 #define POST_EFFECT PostEffect
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -85,7 +86,7 @@ Pass
     ZWrite [_ZWrite]
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardBaseStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardBaseStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -102,7 +103,7 @@ Pass
     Blend One One
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardAddStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardAddStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -118,7 +119,7 @@ Pass
     Tags { "LightMode" = "ShadowCaster" }
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ShadowCaster.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ShadowCaster.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag

diff --git a/...arching/Examples/Forward/Sphere Box Morph/SphereBoxMorphForwardStandardTransparent.shader b/...arching/Examples/Forward/Sphere Box Morph/SphereBoxMorphForwardStandardTransparent.shader
@@ -19,6 +19,8 @@ Properties
     _MinDistance("Minimum Distance", Range(0.001, 0.1)) = 0.01
     _DistanceMultiplier("Distance Multiplier", Range(0.001, 2.0)) = 1.0
 
+    [PowerSlider(10.0)] _NormalDelta("NormalDelta", Range(0.00001, 0.1)) = 0.0001
+
 // @block Properties
 [Header(Additional Properties)]
 _Alpha("Alpha", Range(0, 1)) = 0.5
@@ -49,7 +51,7 @@ CGINCLUDE
 #define PostEffectOutput SurfaceOutputStandard
 #define POST_EFFECT PostEffect
 
-#include "Assets/uRaymarching/Shaders/Include/Legacy/Common.cginc"
+#include "Assets\uRaymarching\Shaders\Include\Legacy/Common.cginc"
 
 // @block DistanceFunction
 inline float DistanceFunction(float3 pos)
@@ -85,7 +87,7 @@ Pass
     ZWrite [_ZWrite]
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardBaseStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardBaseStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
@@ -102,7 +104,7 @@ Pass
     Blend One One
 
     CGPROGRAM
-    #include "Assets/uRaymarching/Shaders/Include/Legacy/ForwardAddStandard.cginc"
+    #include "Assets\uRaymarching\Shaders\Include\Legacy/ForwardAddStandard.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag