Merge pull request #11 from gam0022/lava-animation

Lava animation

Author: gam0022

.gitignore

@@ -90,3 +90,6 @@ com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
 fabric.properties
+
+# Unity Recorder
+Recordings/

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

@@ -16,8 +16,6 @@ Properties
     _ShadowExtraBias("Shadow Extra Bias", Range(0.0, 1.0)) = 0.01
 
 // @block Properties
-// _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)
-_LocalTime("Local Time", Float) = 0
 [HDR] _SlideEmission("Slide Emission", Color) = (2.0, 2.0, 5.0, 1.0)
 // @endblock
 }
@@ -76,7 +74,7 @@ inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
 
     float byTime = abs(sin(PI * 1.0 / 4 * _LocalTime));
     float intensity = byPosY * byTime;
- 
+
     o.emission = _SlideEmission * intensity;
 }
 // @endblock
@@ -129,4 +127,4 @@ Fallback "Diffuse"
 
 CustomEditor "uShaderTemplate.MaterialEditor"
 
-}
+}

Assets/Demoscene/Projects/2018-05-28-Sandwich/uRaymarchingShaders/Sandwich.shader

@@ -3,7 +3,7 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
@@ -36,21 +36,59 @@ MonoBehaviour:
     value: 1
   blocks:
   - key: Properties
-    value: // _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)
+    value: '_CellularPower("Cellular Power", Range(0.0, 1.0)) = 0.5
+
+      [HDR] _LavaEmmisiveHigh("Lava Emmisive High", Color) = (1.0, 0.0, 0.0, 1.0)
+
+      [HDR] _LavaEmmisiveLow("Lava Emmisive Low", Color) = (1.0, 0.0, 0.0, 1.0)
+
+      _Noise("Noise", 2D) = "gray" {}
+
+      _FlowThreshold("Flow Threshold", Range(1.0, 2.0)) = 0.5
+
+      _FlowIntensity("Flow Intensity", Range(0.0, 1.0)) = 0.2
+
+      _FlowSpeed("Flow Speed", Range(0.0, 5.0)) = 0.2'
     folded: 0
   - key: DistanceFunction
-    value: "inline float DistanceFunction(float3 pos)\n{\n    return Sphere(pos, 0.5);\n}"
+    value: "#include \"Assets/Demoscene/Shaders/Includes/Common.cginc\"\n#include
+      \"Assets/Demoscene/Shaders/Includes/Noise.cginc\"\n\nfloat _CellularPower;\n\ninline
+      float DistanceFunction(float3 pos)\n{\n    float2 c = cellular(float2(pos.xz));\n
+      \   float h = pow(c.y - c.x, _CellularPower);\n\n    float2 c2 = cellular(float2(3.0
+      * pos.xz));\n    h += 0.5 * pow((c2.y - c2.x), _CellularPower);\n\n    float2
+      c3 = cellular(float2(20.0 * pos.xz));\n    //h += 0.05 * pow((c3.y - c3.x),
+      _CellularPower);\n\n    h += 0.002 * snoise(50.0 * pos.xz);\n    return pos.y
+      - h;\n}"
     folded: 0
   - key: PostEffect
-    value: 'inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
-
-      {
-
-      }'
+    value: "float _LocalTime;\nfloat4 _LavaEmmisiveLow;\nfloat4 _LavaEmmisiveHigh;\nsampler2D
+      _Noise;\nfloat _FlowThreshold;\nfloat _FlowIntensity;\nfloat _FlowSpeed;\n\n//
+      https://www.shadertoy.com/view/lslXRS\nfloat noise( in vec2 x ){\n    return
+      tex2D(_Noise, x*.01).x;\n}\n\nvec2 gradn(vec2 p)\n{\n\tfloat ep = .09;\n\tfloat
+      gradx = noise(vec2(p.x+ep,p.y))-noise(vec2(p.x-ep,p.y));\n\tfloat grady = noise(vec2(p.x,p.y+ep))-noise(vec2(p.x,p.y-ep));\n\treturn
+      vec2(gradx,grady);\n}\n\nfloat lavaFlow(in vec2 p)\n{\n\tfloat z=2.;\n\tfloat
+      rz = 0.;\n\tvec2 bp = p;\n\tfor (float i= 1.; i < 4.; i++)\n\t{\n\t\t//primary
+      flow speed\n\t\tp += _LocalTime * .6 * _FlowSpeed;\n\n\t\t//secondary flow speed
+      (speed of the perceived flow)\n\t\tbp += _LocalTime * 1.9 * _FlowSpeed;\n\n\t\t//displacement
+      field (try changing _LocalTime multiplier)\n\t\tvec2 gr = gradn(i*p*.34 + _LocalTime
+      * 1.);\n\n\t\t//rotation of the displacement field\n\t\t// gr *= rotateMat(_LocalTime
+      * 6.-(0.05 * p.x + 0.03 * p.y) * 40.);\n\t\tgr = mul(rotateMat(_LocalTime *
+      6.-(0.05 * p.x + 0.03 * p.y) * 40.), gr);\n\n\t\t//displace the system\n\t\tp
+      += gr*.5;\n\n\t\t//add noise octave\n\t\trz+= (sin(noise(p) * 7.) * 0.5 + 0.5)
+      / z;\n\n\t\t//blend factor (blending displaced system with base system)\n\t\t//you
+      could call this advection factor (.5 being low, .95 being high)\n\t\tp = mix(bp,
+      p, .77);\n\n\t\t//intensity scaling\n\t\tz *= 1.4;\n\t\t//octave scaling\n\t\tp
+      *= 2.;\n\t\tbp *= 1.9;\n\t}\n\treturn rz;\n}\n\ninline void PostEffect(RaymarchInfo
+      ray, inout PostEffectOutput o)\n{\n    float flow = lavaFlow(ray.endPos.xz);\n
+      \   float4 emission = lerp(_LavaEmmisiveLow, _LavaEmmisiveHigh, saturate(remap(flow,
+      0.7, 0.8)));\n    float flooded = step(ray.endPos.y, _FlowThreshold + _FlowIntensity
+      * flow);\n    o.emission = flooded * emission;\n    o.normal.rgb = normalize(lerp(o.normal.rgb,
+      half3(0.0, 1.0, 0.0), saturate(remap(ray.endPos.y, _FlowThreshold, 5.0))));\n\n
+      \   // debug flow\n    // o.emission = lavaFlow(ray.endPos.xz) * _LavaEmmisiveHigh;\n}"
     folded: 0
   constants: {fileID: 11400000, guid: 4df15a420345e4af98645ddd9620aa5b, type: 2}
   basicFolded: 1
   conditionsFolded: 0
   variablesFolded: 0
   materialsFolded: 0
-  constantsFolded: 1
+  constantsFolded: 0

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

@@ -4,7 +4,7 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_Name: Lava
   m_Shader: {fileID: 4800000, guid: 5c314efc8c9d8449ab45d6dd0183c06e, type: 3}
@@ -17,17 +17,25 @@ Material:
   disabledShaderPasses: []
   m_SavedProperties:
     serializedVersion: 3
-    m_TexEnvs: []
+    m_TexEnvs:
+    - _Noise:
+        m_Texture: {fileID: 2800000, guid: e80c3c84ea861404d8a427db8b7abf04, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
-    - _Loop: 99.2
+    - _CellularPower: 0.066
+    - _FlowIntensity: 0.158
+    - _FlowSpeed: 0.5
+    - _FlowThreshold: 1.239
+    - _LocalTime: 0
+    - _Loop: 50
     - _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}
+    - _Diffuse: {r: 0.5566038, g: 0, b: 0, a: 0.4392157}
     - _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}
+    - _LavaEmmisiveHigh: {r: 4, g: 3.592157, b: 0.47058824, a: 1}
+    - _LavaEmmisiveLow: {r: 16, g: 0.5026177, b: 0, a: 1}
+    - _Specular: {r: 0.7169812, g: 0.3756585, b: 0.11160557, a: 0.72156864}