Skip to content

Commit bd7c001

Browse files
gam0022gam0022
committed
Managed to make it to like lava
1 parent f84becc commit bd7c001

File tree

7 files changed

+189
-10
lines changed

7 files changed

+189
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@ MonoBehaviour:
5353
conditionsFolded: 0
5454
variablesFolded: 0
5555
materialsFolded: 0
56-
constantsFolded: 0
56+
constantsFolded: 1

‎Assets/Demoscene/Projects/2018-07-12-Lava/Lava.mat

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ Material:
1919
serializedVersion: 3
2020
m_TexEnvs: []
2121
m_Floats:
22-
- _Loop: 30
22+
- _Loop: 99.2
2323
- _MinDistance: 0.01
24-
- _ShadowExtraBias: 0.01
24+
- _Power: 0.072
25+
- _ShadowExtraBias: 0.802
2526
- _ShadowLoop: 10
2627
- _ShadowMinDistance: 0.01
28+
- _Threshold: 0.85
2729
m_Colors:
28-
- _Diffuse: {r: 0, g: 0.041553974, b: 1, a: 0.4627451}
30+
- _Diffuse: {r: 0.3207547, g: 0.13768245, b: 0.13768245, a: 1}
2931
- _Emission: {r: 0, g: 0, b: 0, a: 0}
30-
- _Specular: {r: 1, g: 0, b: 0, a: 1}
32+
- _Specular: {r: 0, g: 0, b: 0, a: 1}

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Properties
1717

1818
// @block Properties
1919
// _Color2("Color2", Color) = (1.0, 1.0, 1.0, 1.0)
20+
_Threshold("Threshold", Range(-5.0, 5.0)) = 0.5
21+
_Power("Power", Range(0.0, 1.0)) = 0.5
2022
// @endblock
2123
}
2224

@@ -41,19 +43,27 @@ CGINCLUDE
4143

4244
#include "Assets/uRaymarching/Shaders/Include/Common.cginc"
4345
#include "Assets/uRaymarchingCustom/Common.cginc"
44-
#include "Assets/Demoscene/Shaders/Includes/Noise.cginc"
4546

4647
// @block DistanceFunction
48+
#include "Assets/Demoscene/Shaders/Includes/Noise.cginc"
49+
50+
float _Threshold;
51+
float _Power;
52+
4753
inline float DistanceFunction(float3 pos)
4854
{
4955
float2 c = cellular(float3(pos.xz, _Time.y));
50-
return pos.y - (c.y - c.x);
56+
float h = c.y - c.x;
57+
// h = h > _Threshold ? 1.0 : 0.0;
58+
h = pow(h, _Power);
59+
return pos.y - h;
5160
}
5261
// @endblock
5362

5463
// @block PostEffect
5564
inline void PostEffect(RaymarchInfo ray, inout PostEffectOutput o)
5665
{
66+
o.emission = step(ray.endPos.y, _Threshold) * float4(1.0, 0.0, 0.0, 1.0);
5767
}
5868
// @endblock
5969

‎Assets/Demoscene/Projects/2018-07-12-Lava/Lava.unity

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,12 +289,12 @@ MonoBehaviour:
289289
m_PrefabParentObject: {fileID: 0}
290290
m_PrefabInternal: {fileID: 0}
291291
m_GameObject: {fileID: 1896176113}
292-
m_Enabled: 0
292+
m_Enabled: 1
293293
m_EditorHideFlags: 0
294294
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
295295
m_Name:
296296
m_EditorClassIdentifier:
297-
sharedProfile: {fileID: 11400000, guid: bed12a2ab8e6efe4e8f0b60177b18517, type: 2}
297+
sharedProfile: {fileID: 11400000, guid: c6277e5ab657147c78ac036a6b17f69f, type: 2}
298298
isGlobal: 1
299299
blendDistance: 0
300300
weight: 1
@@ -305,7 +305,7 @@ MonoBehaviour:
305305
m_PrefabParentObject: {fileID: 0}
306306
m_PrefabInternal: {fileID: 0}
307307
m_GameObject: {fileID: 1896176113}
308-
m_Enabled: 0
308+
m_Enabled: 1
309309
m_EditorHideFlags: 0
310310
m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3}
311311
m_Name:

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

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 151 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,151 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_GameObject: {fileID: 0}
9+
m_Enabled: 1
10+
m_EditorHideFlags: 0
11+
m_Script: {fileID: 11500000, guid: 8e6292b2c06870d4495f009f912b9600, type: 3}
12+
m_Name: Main Camera Profile
13+
m_EditorClassIdentifier:
14+
settings:
15+
- {fileID: 114212941475958504}
16+
- {fileID: 114397380436181274}
17+
- {fileID: 114079756082302938}
18+
--- !u!114 &114079756082302938
19+
MonoBehaviour:
20+
m_ObjectHideFlags: 3
21+
m_PrefabParentObject: {fileID: 0}
22+
m_PrefabInternal: {fileID: 0}
23+
m_GameObject: {fileID: 0}
24+
m_Enabled: 1
25+
m_EditorHideFlags: 0
26+
m_Script: {fileID: 11500000, guid: 40b924e2dad56384a8df2a1e111bb675, type: 3}
27+
m_Name: Vignette
28+
m_EditorClassIdentifier:
29+
active: 1
30+
enabled:
31+
overrideState: 1
32+
value: 1
33+
mode:
34+
overrideState: 0
35+
value: 0
36+
color:
37+
overrideState: 0
38+
value: {r: 0, g: 0, b: 0, a: 1}
39+
center:
40+
overrideState: 0
41+
value: {x: 0.5, y: 0.5}
42+
intensity:
43+
overrideState: 1
44+
value: 0.377
45+
smoothness:
46+
overrideState: 1
47+
value: 1
48+
roundness:
49+
overrideState: 0
50+
value: 1
51+
rounded:
52+
overrideState: 0
53+
value: 0
54+
mask:
55+
overrideState: 0
56+
value: {fileID: 0}
57+
defaultState: 1
58+
opacity:
59+
overrideState: 0
60+
value: 1
61+
--- !u!114 &114212941475958504
62+
MonoBehaviour:
63+
m_ObjectHideFlags: 3
64+
m_PrefabParentObject: {fileID: 0}
65+
m_PrefabInternal: {fileID: 0}
66+
m_GameObject: {fileID: 0}
67+
m_Enabled: 1
68+
m_EditorHideFlags: 0
69+
m_Script: {fileID: 11500000, guid: 48a79b01ea5641d4aa6daa2e23605641, type: 3}
70+
m_Name: Bloom
71+
m_EditorClassIdentifier:
72+
active: 1
73+
enabled:
74+
overrideState: 1
75+
value: 1
76+
intensity:
77+
overrideState: 1
78+
value: 10
79+
threshold:
80+
overrideState: 0
81+
value: 1
82+
softKnee:
83+
overrideState: 0
84+
value: 0.5
85+
diffusion:
86+
overrideState: 0
87+
value: 7
88+
anamorphicRatio:
89+
overrideState: 0
90+
value: 0
91+
color:
92+
overrideState: 0
93+
value: {r: 1, g: 1, b: 1, a: 1}
94+
fastMode:
95+
overrideState: 0
96+
value: 0
97+
dirtTexture:
98+
overrideState: 0
99+
value: {fileID: 0}
100+
defaultState: 1
101+
dirtIntensity:
102+
overrideState: 0
103+
value: 0
104+
--- !u!114 &114397380436181274
105+
MonoBehaviour:
106+
m_ObjectHideFlags: 3
107+
m_PrefabParentObject: {fileID: 0}
108+
m_PrefabInternal: {fileID: 0}
109+
m_GameObject: {fileID: 0}
110+
m_Enabled: 1
111+
m_EditorHideFlags: 0
112+
m_Script: {fileID: 11500000, guid: c1cb7e9e120078f43bce4f0b1be547a7, type: 3}
113+
m_Name: AmbientOcclusion
114+
m_EditorClassIdentifier:
115+
active: 0
116+
enabled:
117+
overrideState: 1
118+
value: 1
119+
mode:
120+
overrideState: 0
121+
value: 0
122+
intensity:
123+
overrideState: 0
124+
value: 0
125+
color:
126+
overrideState: 0
127+
value: {r: 0, g: 0, b: 0, a: 1}
128+
ambientOnly:
129+
overrideState: 0
130+
value: 1
131+
noiseFilterTolerance:
132+
overrideState: 0
133+
value: 0
134+
blurTolerance:
135+
overrideState: 0
136+
value: -4.6
137+
upsampleTolerance:
138+
overrideState: 0
139+
value: -12
140+
thicknessModifier:
141+
overrideState: 0
142+
value: 1
143+
directLightingStrength:
144+
overrideState: 0
145+
value: 0
146+
radius:
147+
overrideState: 0
148+
value: 0.25
149+
quality:
150+
overrideState: 0
151+
value: 2

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

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)