fix minor bug and reconvert all shaders.

bobsummer · May 8, 2022 · ceb595e · ceb595e
1 parent 91bef4a
commit ceb595e
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 16 deletions.
diff --git a/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Lit.txt b/Assets/uRaymarching/Editor/Resources/ShaderTemplates/uRaymarching/UniversalRP/Lit.txt
@@ -191,7 +191,6 @@ Pass
     #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
 
     #pragma shader_feature_local_fragment _SPECULARHIGHLIGHTS_OFF
-    #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
     #pragma shader_feature_local_fragment _SPECULAR_SETUP
     #pragma shader_feature_local _RECEIVE_SHADOWS_OFF
     #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
@@ -219,6 +218,7 @@ Pass
     #pragma instancing_options renderinglayer
     #pragma multi_compile _ DOTS_INSTANCING_ON
 
+    #define DEFERRED_RENDERING_PASS
     #pragma vertex Vert
     #pragma fragment Frag
     #include "<RaymarchingShaderDirectory>/DeferredLit.hlsl"

diff --git a/Assets/uRaymarching/Examples/UniversalRP/Common/URP_ForwardRenderer.asset b/Assets/uRaymarching/Examples/UniversalRP/Common/URP_ForwardRenderer.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
   m_Name: ScreenSpaceAmbientOcclusion
   m_EditorClassIdentifier: 
-  m_Active: 1
+  m_Active: 0
   m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
   m_Settings:
     Downsample: 0
@@ -94,7 +94,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a1614fc811f8f184697d9bee70ab9fe5, type: 3}
   m_Name: DecalRendererFeature
   m_EditorClassIdentifier: 
-  m_Active: 1
+  m_Active: 0
   m_Settings:
     technique: 0
     maxDrawDistance: 1000

diff --git a/Assets/uRaymarching/Examples/UniversalRP/Hex Floor/UniversalRP_HexFloor.shader b/Assets/uRaymarching/Examples/UniversalRP/Hex Floor/UniversalRP_HexFloor.shader
@@ -214,7 +214,6 @@ Pass
     #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
 
     #pragma shader_feature_local_fragment _SPECULARHIGHLIGHTS_OFF
-    #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
     #pragma shader_feature_local_fragment _SPECULAR_SETUP
     #pragma shader_feature_local _RECEIVE_SHADOWS_OFF
     #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
@@ -242,6 +241,7 @@ Pass
     #pragma instancing_options renderinglayer
     #pragma multi_compile _ DOTS_INSTANCING_ON
 
+    #define DEFERRED_RENDERING_PASS
     #pragma vertex Vert
     #pragma fragment Frag
     #include "Assets/uRaymarching/Runtime/Shaders/Include/UniversalRP/DeferredLit.hlsl"

diff --git a/...s/uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Lit.asset b/...s/uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Lit.asset
@@ -62,7 +62,7 @@ MonoBehaviour:
   blocks:
   - key: Properties
     value: // _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)
-    folded: 0
+    folded: 1
   - key: DistanceFunction
     value: "inline float DistanceFunction(float3 pos)\n{\n    float t = _Time.x;\n   
       float a = 6 * PI * t;\n    float s = pow(sin(a), 2.0);\n    float d1 = Sphere(pos,

diff --git a/Assets/uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Lit.mat b/Assets/uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Lit.mat
@@ -25,20 +25,28 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _ClearCoatMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _BlendDst: 10
-    - _BlendSrc: 5
+    - _BlendDst: 0
+    - _BlendSrc: 1
+    - _ClearCoat: 0
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 1
     - _Cull: 0
     - _DistanceMultiplier: 1
+    - _EnvironmentReflections: 1
     - _Loop: 30
     - _Metallic: 0
-    - _MinDistance: 0.0037
+    - _MinDistance: 0.003
     - _NormalDelta: 0.0001
     - _ShadowExtraBias: 0.01
     - _ShadowLoop: 10
     - _ShadowMinDistance: 0.007
-    - _Smoothness: 0.8
+    - _Smoothness: 1
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}

diff --git a/.../uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Lit.shader b/.../uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Lit.shader
@@ -142,8 +142,6 @@ Pass
     #pragma exclude_renderers d3d11_9x
     #pragma target 2.0
 
-    #define RAY_STARTS_FROM_DEPTH_TEXTURE
-
     #pragma vertex Vert
     #pragma fragment Frag
     #include "Assets/uRaymarching/Runtime/Shaders/Include/UniversalRP/ForwardLit.hlsl"
@@ -169,7 +167,6 @@ Pass
     #pragma shader_feature_local _ _DETAIL_MULX2 _DETAIL_SCALED
 
     #pragma shader_feature_local_fragment _SPECULARHIGHLIGHTS_OFF
-    #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
     #pragma shader_feature_local_fragment _SPECULAR_SETUP
     #pragma shader_feature_local _RECEIVE_SHADOWS_OFF
     #pragma shader_feature_local_fragment _ENVIRONMENTREFLECTIONS_OFF
@@ -197,6 +194,7 @@ Pass
     #pragma instancing_options renderinglayer
     #pragma multi_compile _ DOTS_INSTANCING_ON
 
+    #define DEFERRED_RENDERING_PASS
     #pragma vertex Vert
     #pragma fragment Frag
     #include "Assets/uRaymarching/Runtime/Shaders/Include/UniversalRP/DeferredLit.hlsl"

diff --git a/...uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Unlit.asset b/...uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Unlit.asset
@@ -21,7 +21,7 @@ MonoBehaviour:
   - key: ObjectShape
     value: CUBE
   - key: RaymarchingShaderDirectory
-    value: Assets\uRaymarching\Shaders\Include\UniversalRP
+    value: Assets/uRaymarching/Runtime/Shaders/Include/UniversalRP
   - key: RenderType
     value: Transparent
   - key: RenderQueue
@@ -54,7 +54,7 @@ MonoBehaviour:
   - key: RayStopsAtDepthTexture
     value: 1
   - key: RayStartsFromDepthTexture
-    value: 0
+    value: 1
   - key: ObjectScale
     value: 0
   - key: CheckIfInsideObject

diff --git a/...s/uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Unlit.mat b/...s/uRaymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Unlit.mat
@@ -2,14 +2,16 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: UniversalRP_SphereBoxMorph_Unlit
   m_Shader: {fileID: 4800000, guid: 4fecff0e10b5e4afaa2a62be1a6010b7, type: 3}
-  m_ShaderKeywords: _ZWRITE_ON
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _ZWRITE_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -23,6 +25,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _BlendDst: 1
     - _BlendSrc: 5
@@ -31,8 +34,10 @@ Material:
     - _Loop: 30
     - _Metallic: 0.5
     - _MinDistance: 0.01
+    - _NormalDelta: 0.0001
     - _Smoothness: 0.5
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
     - _Color: {r: 1, g: 0.824807, b: 0, a: 0.5019608}
+  m_BuildTextureStacks: []
diff --git a/...Raymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Unlit.shader b/...Raymarching/Examples/UniversalRP/Sphere Box Morph/UniversalRP_SphereBoxMorph_Unlit.shader
@@ -97,6 +97,7 @@ Pass
     #pragma target 2.0
 
     #define RAY_STOPS_AT_DEPTH_TEXTURE
+    #define RAY_STARTS_FROM_DEPTH_TEXTURE
 
     #pragma vertex Vert
     #pragma fragment Frag