Fix for uRaymarching v0.0.4

Author: gam0022

Assets/Demoscene/TheGlow/TheGlowWorld.shader

@@ -36,14 +36,12 @@ CGINCLUDE
 
 #define WORLD_SPACE
 
-
-
-
 #define DISTANCE_FUNCTION DistanceFunction
 #define POST_EFFECT PostEffect
 #define PostEffectOutput GBufferOut
 
-#include "Assets/Raymarching/Shaders/Include/Common.cginc"
+#include "Assets/uRaymarching/Shaders/Include/Common.cginc"
+#include "Assets/uRaymarchingCustom/Common.cginc"
 
 // @block DistanceFunction
 #define PI2 (2.0 * PI)
@@ -129,7 +127,7 @@ inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
 }
 // @endblock
 
-#include "Assets/Raymarching/Shaders/Include/Raymarching.cginc"
+#include "Assets/uRaymarching/Shaders/Include/Raymarching.cginc"
 
 ENDCG
 
@@ -145,35 +143,21 @@ Pass
     }
 
     CGPROGRAM
-    #include "Assets/Raymarching/Shaders/Include/VertFragDirectScreen.cginc"
+    #include "Assets/uRaymarching/Shaders/Include/VertFragDirectScreen.cginc"
     #pragma target 3.0
     #pragma vertex Vert
     #pragma fragment Frag
-    #pragma multi_compile_prepassfinal
-    #pragma multi_compile OBJECT_SHAPE_CUBE OBJECT_SHAPE_SPHERE ___
     #pragma exclude_renderers nomrt
-    ENDCG
-}
-
-Pass
-{
-    Tags { "LightMode" = "ShadowCaster" }
-
-    CGPROGRAM
-    #include "Assets/Raymarching/Shaders/Include/VertFragShadowObject.cginc"
-    #pragma target 3.0
-    #pragma vertex Vert
-    #pragma fragment Frag
-    #pragma multi_compile_shadowcaster
+    #pragma multi_compile_prepassfinal
+    #pragma multi_compile ___ UNITY_HDR_ON
     #pragma multi_compile OBJECT_SHAPE_CUBE OBJECT_SHAPE_SPHERE ___
-    #pragma fragmentoption ARB_precision_hint_fastest
     ENDCG
 }
 
 }
 
 Fallback Off
 
-CustomEditor "Raymarching.MaterialEditor"
+CustomEditor "uShaderTemplate.MaterialEditor"
 
 }

Assets/uRaymarchingCustom.meta

@@ -0,0 +1,15 @@
+#ifndef CUSTOM_COMMON_H
+#define CUSTOM_COMMON_H
+
+//float3 _Scale = float3(1, 1, 1);
+
+//#define UNITY_PASS_DEFERRED
+//#include "UnityCG.cginc"
+//#include "UnityPBSLighting.cginc"
+//#include "./Structs.cginc"
+//#include "./Utils.cginc"
+//#include "./Camera.cginc"
+#include "./Math.cginc"
+#include "./Primitives.cginc"
+
+#endif

Assets/uRaymarchingCustom/Common.cginc

@@ -0,0 +1,21 @@
+#ifndef CUSTOM_MATH_H
+#define CUSTOM_MATH_H
+
+#include "Assets/uRaymarching/Shaders/Include/Math.cginc"
+
+inline float RepeatLimit(float pos, float span, float limit)
+{
+    return Mod(clamp(pos, -limit, limit), span) - span * 0.5;
+}
+
+inline float2 RepeatLimit(float2 pos, float2 span, float2 limit)
+{
+    return Mod(clamp(pos, -limit, limit), span) - span * 0.5;
+}
+
+inline float3 RepeatLimit(float3 pos, float3 span, float3 limit)
+{
+    return Mod(clamp(pos, -limit, limit), span) - span * 0.5;
+}
+
+#endif

Assets/uRaymarchingCustom/Common.cginc.meta

@@ -0,0 +1,12 @@
+#ifndef CUSTOM_PRIMITIVES_H
+#define CUSTOM_PRIMITIVES_H
+
+#include "Assets/uRaymarching/Shaders/Include/Primitives.cginc"
+
+inline float sdBox(float3 p, float3 b)
+{
+  float3 d = abs(p) - b;
+  return min(max(d.x,max(d.y,d.z)),0.0) + length(max(d,0.0));
+}
+
+#endif