add HexFloor sample for UniversalRP.

hecomi · Jan 5, 2020 · 0536416 · 0536416
1 parent a98eab7
commit 0536416
Show file tree

Hide file tree

Showing 33 changed files with 725 additions and 175 deletions.
diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Lit.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Lit.txt
@@ -70,6 +70,7 @@ HLSLINCLUDE
 #include "<RaymarchingShaderDirectory>/Primitives.hlsl"
 #include "<RaymarchingShaderDirectory>/Math.hlsl"
 #include "<RaymarchingShaderDirectory>/Structs.hlsl"
+#include "<RaymarchingShaderDirectory>/Utils.hlsl"
 
 @block DistanceFunction
 inline float DistanceFunction(float3 pos)

diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Unlit.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Unlit.txt
@@ -67,6 +67,7 @@ HLSLINCLUDE
 #include "<RaymarchingShaderDirectory>/Primitives.hlsl"
 #include "<RaymarchingShaderDirectory>/Math.hlsl"
 #include "<RaymarchingShaderDirectory>/Structs.hlsl"
+#include "<RaymarchingShaderDirectory>/Utils.hlsl"
 
 @block DistanceFunction
 inline float DistanceFunction(float3 pos)

diff --git a/Assets/uRaymarching/Examples/UniversalRP/Common.meta b/Assets/uRaymarching/Examples/UniversalRP/Common.meta
diff --git a/...ching/Examples/UniversalRP/BuiltinLit.mat → ...xamples/UniversalRP/Common/BuiltinLit.mat b/...ching/Examples/UniversalRP/BuiltinLit.mat → ...xamples/UniversalRP/Common/BuiltinLit.mat
diff --git a/.../Examples/UniversalRP/BuiltinLit.mat.meta → ...es/UniversalRP/Common/BuiltinLit.mat.meta b/.../Examples/UniversalRP/BuiltinLit.mat.meta → ...es/UniversalRP/Common/BuiltinLit.mat.meta
diff --git a/...les/UniversalRP/URP_ForwardRenderer.asset → ...versalRP/Common/URP_ForwardRenderer.asset b/...les/UniversalRP/URP_ForwardRenderer.asset → ...versalRP/Common/URP_ForwardRenderer.asset
diff --git a/...niversalRP/URP_ForwardRenderer.asset.meta → ...lRP/Common/URP_ForwardRenderer.asset.meta b/...niversalRP/URP_ForwardRenderer.asset.meta → ...lRP/Common/URP_ForwardRenderer.asset.meta
diff --git a/...ng/Examples/UniversalRP/UniversalRP.asset → ...ples/UniversalRP/Common/UniversalRP.asset b/...ng/Examples/UniversalRP/UniversalRP.asset → ...ples/UniversalRP/Common/UniversalRP.asset
@@ -19,7 +19,7 @@ MonoBehaviour:
   m_RendererDataList:
   - {fileID: 11400000, guid: 6f4c88aadb0244f358f6c9b0b2f71245, type: 2}
   m_DefaultRendererIndex: 0
-  m_RequireDepthTexture: 1
+  m_RequireDepthTexture: 0
   m_RequireOpaqueTexture: 0
   m_OpaqueDownsampling: 1
   m_SupportsTerrainHoles: 0

diff --git a/...amples/UniversalRP/UniversalRP.asset.meta → ...UniversalRP/Common/UniversalRP.asset.meta b/...amples/UniversalRP/UniversalRP.asset.meta → ...UniversalRP/Common/UniversalRP.asset.meta
diff --git a/Assets/uRaymarching/Examples/UniversalRP/Hex Floor.meta b/Assets/uRaymarching/Examples/UniversalRP/Hex Floor.meta