Skip to content

Commit abedc0b

Browse files
committed
Updated water shader added.
Stored with a new plane, material and timeline asset.
1 parent 6be6f64 commit abedc0b

File tree

8 files changed

+308396
-16
lines changed

8 files changed

+308396
-16
lines changed

UOP1_Project/Assets/Art/Materials/Water.mat

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ Material:
4040
m_Texture: {fileID: 0}
4141
m_Scale: {x: 1, y: 1}
4242
m_Offset: {x: 0, y: 0}
43+
- _NormalFromTexture_6D2F1CB1_Texture_0:
44+
m_Texture: {fileID: 2800000, guid: cdfa7f9cd6129ea4096c6af086f30325, type: 3}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
4347
- _OcclusionMap:
4448
m_Texture: {fileID: 0}
4549
m_Scale: {x: 1, y: 1}
@@ -53,32 +57,39 @@ Material:
5357
m_Scale: {x: 1, y: 1}
5458
m_Offset: {x: 0, y: 0}
5559
m_Floats:
56-
- Foam_Amount: 6.9
57-
- Foam_Cutoff: 3.4
58-
- Foam_Evolution_Speed: 1
59-
- Foam_Scale: 2.8
60-
- Global_Fading: 15
61-
- Light_Probe_Contribution: 1
62-
- Refaction_Scale: 5
63-
- Refraction_Evolution_Speed: 1.5
64-
- Refraction_Height: 0.2
60+
- Foam_Amount: 1.25
61+
- Foam_Cutoff: 0.58
62+
- Foam_Evolution_Speed: 0.95
63+
- Foam_Scale: 1.16
64+
- Global_Fading: 90
65+
- Light_Probe_Contribution: 0.34
66+
- Refaction_Scale: 0.09
67+
- Refraction_Evolution_Speed: 0
68+
- Refraction_Height: 0.077
6569
- Refraction_Scale: 9.11
6670
- Vector1_157E1F63: 2
71+
- Vector1_2B58F275: -0.14
72+
- Vector1_2FBE3DFA: 0.73
6773
- Vector1_338BB9F0: 88.91
6874
- Vector1_416519C8: 0.5
6975
- Vector1_44082C02: 1.18
7076
- Vector1_461A434E: 5
7177
- Vector1_4B42586: 4
7278
- Vector1_5442BDBE: 1.5
7379
- Vector1_54589480: 0.5
80+
- Vector1_65DAC18D: 1
7481
- Vector1_6CEF81B6: -9.77
75-
- Vector1_77A997E: 0.33
82+
- Vector1_77A997E: 0.096
83+
- Vector1_7A056A02: 1.61
84+
- Vector1_8CEB4E60: 0.84
7685
- Vector1_C37602FC: 23.9
7786
- Vector1_CB18EF2B: 3
87+
- Vector1_EA2D80AD: 8.55
7888
- Vector1_EB7F5DFB: 150
79-
- Water_Depth: 1.9
80-
- Wave_Height: 0.23
81-
- Wave_Scale: 10
89+
- Vector1_F591A23A: -0.44
90+
- Water_Depth: 5
91+
- Wave_Height: 0
92+
- Wave_Scale: 0
8293
- Wave_Speed: 2
8394
- _AlphaClip: 0
8495
- _Blend: 0
@@ -108,8 +119,8 @@ Material:
108119
- Color_AF7C2181: {r: 1, g: 1, b: 1, a: 0.6666667}
109120
- Far_Color: {r: 0.20392156, g: 0.43921566, b: 0.8156863, a: 0}
110121
- Foam_Color: {r: 1, g: 1, b: 1, a: 1}
111-
- Shallow_Water_Color: {r: 0.27450964, g: 0.894, b: 0.75159276, a: 0}
112-
- Trough_Color: {r: 0, g: 0.38972965, b: 0.5098035, a: 0.5372549}
122+
- Shallow_Water_Color: {r: 0.15566038, g: 0.4847411, b: 0.6226415, a: 0.9764706}
123+
- Trough_Color: {r: 1, g: 0.67197025, b: 0.15566039, a: 0.5372549}
113124
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
114125
- _Color: {r: 1, g: 1, b: 1, a: 1}
115126
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

UOP1_Project/Assets/Scenes/Skybox/ClearSky.meta renamed to UOP1_Project/Assets/Prefabs/Nature/Water2.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

UOP1_Project/Assets/Prefabs/Nature/Water2/Water2.shadergraph

Lines changed: 1721 additions & 0 deletions
Large diffs are not rendered by default.

UOP1_Project/Assets/Prefabs/Nature/Water2/Water2.shadergraph.meta

Lines changed: 10 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)