Merge pull request #8 from gam0022/lava

Lava

Author: gam0022

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

@@ -223,9 +223,9 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 509048559}
-  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
-  m_LocalPosition: {x: -0.04410826, y: 0.60638976, z: 11.041107}
-  m_LocalScale: {x: 0.0001, y: 0.0001, z: 0.0001}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1561136793}
   m_RootOrder: 0
@@ -252,7 +252,7 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
+  m_DynamicOccludee: 0
   m_MotionVectors: 0
   m_LightProbeUsage: 0
   m_ReflectionProbeUsage: 1

Assets/Demoscene/Projects/2018-05-28-Sandwich/Sandwich.unity

@@ -20,7 +20,7 @@ Material:
     m_TexEnvs: []
     m_Floats:
     - _Glossiness: 0.5
-    - _LocalTime: 0
+    - _LocalTime: 1.9688673
     - _Loop: 100
     - _Metallic: 0.5
     - _MinDistance: 0.01

Assets/Demoscene/Projects/2018-05-28-Sandwich/uRaymarchingShaders/WorldSandwich.mat

@@ -18,7 +18,6 @@
 			#pragma multi_compile_fog
 
 			#include "UnityCG.cginc"
-			#include "Assets/Demoscene/Shaders/Includes/PortingFromGLSL.cginc"
 			#include "Assets/Demoscene/Shaders/Includes/Noise.cginc"
 
 			struct appdata

Assets/Demoscene/Projects/2018-07-10-Cellular/Cellular.shader

@@ -0,0 +1,56 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3acd6fe57257048db802c1c4c2b75248, type: 3}
+  m_Name: Lava
+  m_EditorClassIdentifier: 
+  shaderName: Lava
+  shaderReference: {fileID: 4800000, guid: 5c314efc8c9d8449ab45d6dd0183c06e, type: 3}
+  shaderTemplate: uRaymarching/Direct GBuffer Custom
+  variables:
+  - key: Name
+    value: Lava
+  - key: Culling
+    value: Off
+  - key: RaymarchingShaderDirectory
+    value: Assets/uRaymarching/Shaders/Include
+  conditions:
+  - key: ShadowCaster
+    value: 1
+  - key: WorldSpace
+    value: 1
+  - key: FollowObjectScale
+    value: 0
+  - key: DoNotOutputDepth
+    value: 0
+  - key: CameraInsideObject
+    value: 0
+  - key: FallbackToDiffuse
+    value: 1
+  blocks:
+  - key: Properties
+    value: // _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)
+    folded: 0
+  - key: DistanceFunction
+    value: "inline float DistanceFunction(float3 pos)\n{\n    return Sphere(pos, 0.5);\n}"
+    folded: 0
+  - key: PostEffect
+    value: 'inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
+
+      {
+
+      }'
+    folded: 0
+  constants: {fileID: 11400000, guid: 4df15a420345e4af98645ddd9620aa5b, type: 2}
+  basicFolded: 1
+  conditionsFolded: 0
+  variablesFolded: 0
+  materialsFolded: 0
+  constantsFolded: 1

Assets/Demoscene/Projects/2018-07-12-Lava.meta

@@ -0,0 +1,33 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: Lava
+  m_Shader: {fileID: 4800000, guid: 5c314efc8c9d8449ab45d6dd0183c06e, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Floats:
+    - _Loop: 99.2
+    - _MinDistance: 0.01
+    - _Power: 0.038
+    - _ShadowExtraBias: 0.802
+    - _ShadowLoop: 10
+    - _ShadowMinDistance: 0.01
+    - _Threshold: 1.38
+    m_Colors:
+    - _Diffuse: {r: 0.9528302, g: 0.004494493, b: 0.004494493, a: 1}
+    - _Emission: {r: 0, g: 0, b: 0, a: 0}
+    - _Lava: {r: 1, g: 0.24644177, b: 0, a: 1}
+    - _Specular: {r: 0, g: 0, b: 0, a: 0}

Assets/Demoscene/Projects/2018-07-12-Lava/Lava.asset

@@ -0,0 +1,124 @@
+Shader "Raymarching/Lava"
+{
+
+Properties
+{
+    [Header(GBuffer)]
+    _Diffuse("Diffuse", Color) = (1.0, 1.0, 1.0, 1.0)
+    _Specular("Specular", Color) = (0.0, 0.0, 0.0, 0.0)
+    _Emission("Emission", Color) = (0.0, 0.0, 0.0, 0.0)
+
+    [Header(Raymarching Settings)]
+    _Loop("Loop", Range(1, 100)) = 30
+    _MinDistance("Minimum Distance", Range(0.001, 0.1)) = 0.01
+    _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, 1.0)) = 0.01
+
+// @block Properties
+// _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)
+_Threshold("Threshold", Range(1.0, 2.0)) = 0.5
+_Power("Power", Range(0.0, 1.0)) = 0.5
+[HDR] _Lava("Lava", Color) = (1.0, 0.0, 0.0, 1.0)
+// @endblock
+}
+
+SubShader
+{
+
+Tags
+{
+    "RenderType" = "Opaque"
+    "DisableBatching" = "True"
+}
+
+Cull Off
+
+CGINCLUDE
+
+#define WORLD_SPACE
+
+#define DISTANCE_FUNCTION DistanceFunction
+#define POST_EFFECT PostEffect
+#define PostEffectOutput GBufferOut
+
+#include "Assets/uRaymarching/Shaders/Include/Common.cginc"
+#include "Assets/uRaymarchingCustom/Common.cginc"
+
+// @block DistanceFunction
+#include "Assets/Demoscene/Shaders/Includes/Noise.cginc"
+
+float _Threshold;
+float _Power;
+
+inline float DistanceFunction(float3 pos)
+{
+    float2 c = cellular(float2(pos.xz));
+    float h = c.y - c.x;
+    h = pow(h, _Power);
+
+    float2 c2 = cellular(float2(3.0 * pos.xz));
+    h += 0.5 * pow((c2.y - c2.x), _Power);
+
+    h += 0.001 * snoise(50.0 * pos.xz);
+    return pos.y - h;
+}
+// @endblock
+
+// @block PostEffect
+float4 _Lava;
+inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
+{
+    o.emission = step(ray.endPos.y, _Threshold) * _Lava;
+}
+// @endblock
+
+#include "Assets/uRaymarching/Shaders/Include/Raymarching.cginc"
+
+ENDCG
+
+Pass
+{
+    Tags { "LightMode" = "Deferred" }
+
+    Stencil
+    {
+        Comp Always
+        Pass Replace
+        Ref 128
+    }
+
+    CGPROGRAM
+    #include "Assets/uRaymarching/Shaders/Include/VertFragDirectScreen.cginc"
+    #pragma target 3.0
+    #pragma vertex Vert
+    #pragma fragment Frag
+    #pragma exclude_renderers nomrt
+    #pragma multi_compile_prepassfinal
+    #pragma multi_compile ___ UNITY_HDR_ON
+    #pragma multi_compile OBJECT_SHAPE_CUBE OBJECT_SHAPE_SPHERE ___
+    ENDCG
+}
+
+Pass
+{
+    Tags { "LightMode" = "ShadowCaster" }
+
+    CGPROGRAM
+    #include "Assets/uRaymarching/Shaders/Include/VertFragShadowObject.cginc"
+    #pragma target 3.0
+    #pragma vertex Vert
+    #pragma fragment Frag
+    #pragma fragmentoption ARB_precision_hint_fastest
+    #pragma multi_compile_shadowcaster
+    #pragma multi_compile OBJECT_SHAPE_CUBE OBJECT_SHAPE_SPHERE ___
+    ENDCG
+}
+
+}
+
+Fallback "Diffuse"
+
+CustomEditor "uShaderTemplate.MaterialEditor"
+
+}