Skip to content

Commit 0741432

Browse files
authored
Merge pull request #2 from gam0022/update-u-raymarching
Update uRaymarching v0.0.4
2 parents 2506a56 + 7fa143c commit 0741432

File tree

158 files changed

+2209
-1120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+2209
-1120
lines changed

.idea/.idea.unity-demoscene/.idea/contentModel.xml

Lines changed: 93 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Demoscene/TheGlow/TheGlowWorld.shader

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@ CGINCLUDE
3636

3737
#define WORLD_SPACE
3838

39-
40-
41-
4239
#define DISTANCE_FUNCTION DistanceFunction
4340
#define POST_EFFECT PostEffect
4441
#define PostEffectOutput GBufferOut
4542

46-
#include "Assets/Raymarching/Shaders/Include/Common.cginc"
43+
#include "Assets/uRaymarching/Shaders/Include/Common.cginc"
44+
#include "Assets/uRaymarchingCustom/Common.cginc"
4745

4846
// @block DistanceFunction
4947
#define PI2 (2.0 * PI)
@@ -129,7 +127,7 @@ inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
129127
}
130128
// @endblock
131129

132-
#include "Assets/Raymarching/Shaders/Include/Raymarching.cginc"
130+
#include "Assets/uRaymarching/Shaders/Include/Raymarching.cginc"
133131

134132
ENDCG
135133

@@ -145,35 +143,21 @@ Pass
145143
}
146144

147145
CGPROGRAM
148-
#include "Assets/Raymarching/Shaders/Include/VertFragDirectScreen.cginc"
146+
#include "Assets/uRaymarching/Shaders/Include/VertFragDirectScreen.cginc"
149147
#pragma target 3.0
150148
#pragma vertex Vert
151149
#pragma fragment Frag
152-
#pragma multi_compile_prepassfinal
153-
#pragma multi_compile OBJECT_SHAPE_CUBE OBJECT_SHAPE_SPHERE ___
154150
#pragma exclude_renderers nomrt
155-
ENDCG
156-
}
157-
158-
Pass
159-
{
160-
Tags { "LightMode" = "ShadowCaster" }
161-
162-
CGPROGRAM
163-
#include "Assets/Raymarching/Shaders/Include/VertFragShadowObject.cginc"
164-
#pragma target 3.0
165-
#pragma vertex Vert
166-
#pragma fragment Frag
167-
#pragma multi_compile_shadowcaster
151+
#pragma multi_compile_prepassfinal
152+
#pragma multi_compile ___ UNITY_HDR_ON
168153
#pragma multi_compile OBJECT_SHAPE_CUBE OBJECT_SHAPE_SPHERE ___
169-
#pragma fragmentoption ARB_precision_hint_fastest
170154
ENDCG
171155
}
172156

173157
}
174158

175159
Fallback Off
176160

177-
CustomEditor "Raymarching.MaterialEditor"
161+
CustomEditor "uShaderTemplate.MaterialEditor"
178162

179163
}

Assets/Raymarching/Editor/ColorScheme.cs

Lines changed: 0 additions & 27 deletions
This file was deleted.

Assets/Raymarching/Editor/Common.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)