Skip to content

Commit aeeae90

Browse files
committed
mod normal
1 parent 07e0d48 commit aeeae90

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,11 @@ inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
134134
{
135135
float flow = lavaFlow(ray.endPos.xz);
136136
float4 emission = lerp(_LavaEmmisiveLow, _LavaEmmisiveHigh, saturate(remap(flow, 0.6, 0.7)));
137-
o.emission = step(ray.endPos.y, _FlowThreshold + _FlowIntensity * flow) * emission;
137+
float flooded = step(ray.endPos.y, _FlowThreshold + _FlowIntensity * flow);
138+
o.emission = flooded * emission;
139+
o.normal.rgb = lerp(o.normal.rgb, half3(0.0, 1.0, 0.0), flooded);
140+
141+
// debug flow
138142
// o.emission = lavaFlow(ray.endPos.xz) * _LavaEmmisiveHigh;
139143
}
140144
// @endblock

Assets/Demoscene/Projects/2018-07-12-Lava/Lava_Profiles/Main Camera Profile.asset

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInternal: {fileID: 0}
88
m_GameObject: {fileID: 0}
99
m_Enabled: 1
@@ -18,7 +18,7 @@ MonoBehaviour:
1818
--- !u!114 &114079756082302938
1919
MonoBehaviour:
2020
m_ObjectHideFlags: 3
21-
m_PrefabParentObject: {fileID: 0}
21+
m_CorrespondingSourceObject: {fileID: 0}
2222
m_PrefabInternal: {fileID: 0}
2323
m_GameObject: {fileID: 0}
2424
m_Enabled: 1
@@ -61,7 +61,7 @@ MonoBehaviour:
6161
--- !u!114 &114212941475958504
6262
MonoBehaviour:
6363
m_ObjectHideFlags: 3
64-
m_PrefabParentObject: {fileID: 0}
64+
m_CorrespondingSourceObject: {fileID: 0}
6565
m_PrefabInternal: {fileID: 0}
6666
m_GameObject: {fileID: 0}
6767
m_Enabled: 1
@@ -75,13 +75,16 @@ MonoBehaviour:
7575
value: 1
7676
intensity:
7777
overrideState: 1
78-
value: 10
78+
value: 15
7979
threshold:
8080
overrideState: 0
8181
value: 1
8282
softKnee:
8383
overrideState: 0
8484
value: 0.5
85+
clamp:
86+
overrideState: 0
87+
value: 65472
8588
diffusion:
8689
overrideState: 0
8790
value: 7
@@ -104,7 +107,7 @@ MonoBehaviour:
104107
--- !u!114 &114397380436181274
105108
MonoBehaviour:
106109
m_ObjectHideFlags: 3
107-
m_PrefabParentObject: {fileID: 0}
110+
m_CorrespondingSourceObject: {fileID: 0}
108111
m_PrefabInternal: {fileID: 0}
109112
m_GameObject: {fileID: 0}
110113
m_Enabled: 1

0 commit comments

Comments
 (0)