Skip to content

Commit 577bea1

Browse files
VeraslVerasl
authored
Updated clouds (#161)
* Start on cloud assets * Added skybox feature to render objects at scaled size * Solved culling issue by having skybox follow camera, downside is shader code(world position etc) * Small updates * cloud mesh generator moved to utility, and asset * Squashed commit of the following: commit a5da8be Author: Andre McGrail <[email protected]> Date: Mon Jan 18 11:24:23 2021 +0100 pipeline assets updated commit b202186 Author: Andre McGrail <[email protected]> Date: Mon Jan 18 11:24:04 2021 +0100 Added debug mode for boat testing commit 735aaf5 Merge: f95ad59 d07745c Author: Andre McGrail <[email protected]> Date: Mon Jan 18 11:23:24 2021 +0100 Merge branch 'master' of https://github.com/Unity-Technologies/BoatAttack commit d07745c Author: Felipe Lira <[email protected]> Date: Thu Jan 7 16:48:52 2021 +0100 Fix usage of UNITY_REVERSED_Z (#134) commit f95ad59 Author: Andre McGrail <[email protected]> Date: Tue Dec 22 11:08:30 2020 +0100 demo scene default commit 22ec6b1 Author: Andre McGrail <[email protected]> Date: Tue Dec 22 10:32:59 2020 +0100 Fixed corrupt shadergraph shader commit 9f4f201 Author: Andre McGrail <[email protected]> Date: Tue Dec 22 10:11:14 2020 +0100 Update to 2020.2.0f1 commit 4b92a5e Author: Andre McGrail <[email protected]> Date: Wed Dec 2 15:50:55 2020 +0100 Fix and improve shadows on the water (#130) commit 88679d7 Author: Andre McGrail <[email protected]> Date: Mon Nov 23 11:27:01 2020 +0100 Removed variable 'loop' as itwas causing issues for PS4 compiling (#129) * More cloud work, secondary layer, graph cleanup * additional work * Squashed commit of the following: commit 8f74fa9 Author: alexey-unity <[email protected]> Date: Wed Mar 3 11:47:46 2021 +0300 benchmark loading on ios fix (#135) * fixed build options tweaking in benchmark window * fixed benchmark mode being stuck on loading screen on ios CmdArgs() was throwing an exception due to empty argument, and it made it disabled, calling OnDisable, and removing "level loaded" callback, so we were never switching to the game level itself commit a5da8be Author: Andre McGrail <[email protected]> Date: Mon Jan 18 11:24:23 2021 +0100 pipeline assets updated commit b202186 Author: Andre McGrail <[email protected]> Date: Mon Jan 18 11:24:04 2021 +0100 Added debug mode for boat testing commit 735aaf5 Merge: f95ad59 d07745c Author: Andre McGrail <[email protected]> Date: Mon Jan 18 11:23:24 2021 +0100 Merge branch 'master' of https://github.com/Unity-Technologies/BoatAttack commit d07745c Author: Felipe Lira <[email protected]> Date: Thu Jan 7 16:48:52 2021 +0100 Fix usage of UNITY_REVERSED_Z (#134) commit f95ad59 Author: Andre McGrail <[email protected]> Date: Tue Dec 22 11:08:30 2020 +0100 demo scene default commit 22ec6b1 Author: Andre McGrail <[email protected]> Date: Tue Dec 22 10:32:59 2020 +0100 Fixed corrupt shadergraph shader commit 9f4f201 Author: Andre McGrail <[email protected]> Date: Tue Dec 22 10:11:14 2020 +0100 Update to 2020.2.0f1 commit 4b92a5e Author: Andre McGrail <[email protected]> Date: Wed Dec 2 15:50:55 2020 +0100 Fix and improve shadows on the water (#130) commit 88679d7 Author: Andre McGrail <[email protected]> Date: Mon Nov 23 11:27:01 2020 +0100 Removed variable 'loop' as itwas causing issues for PS4 compiling (#129) * More work * Added cloud layer to demo scene for iteration work * tweaks to the cloud system * small changes * work on day/night controller * tweaks to cloud shader and skybox feature * Shader work and cleanup * Height fog fix * tweaked lighting in all scenes, organization of files * Delete settings.json * final cleanup * final updates on merge
1 parent 681586f commit 577bea1

File tree

193 files changed

+62569
-4031
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+62569
-4031
lines changed

‎Assets/AddressableAssetsData/AssetGroups/Utility.asset‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ MonoBehaviour:
2525
m_Address: checkpoint
2626
m_ReadOnly: 0
2727
m_SerializedLabels: []
28+
- m_GUID: dd76f393b89c7c043a07be4d99495f5d
29+
m_Address: Assets/Objects/environment/Clouds/Shader Graphs_Clouds.mat
30+
m_ReadOnly: 0
31+
m_SerializedLabels: []
2832
m_ReadOnly: 0
2933
m_Settings: {fileID: 11400000, guid: 46fc3d082b08c4dacacae72d7016c235, type: 2}
3034
m_SchemaSet:

‎Assets/Data/UniversalRP/BoatDemoRenderer.asset‎

Lines changed: 70 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,66 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-8193634041390225171
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3}
13+
m_Name: 3D Skybox Transparent
14+
m_EditorClassIdentifier:
15+
m_Active: 1
16+
settings:
17+
passTag: 3D Skybox Transparent
18+
Event: 400
19+
filterSettings:
20+
RenderQueueType: 1
21+
LayerMask:
22+
serializedVersion: 2
23+
m_Bits: 256
24+
PassNames: []
25+
overrideMaterial: {fileID: 0}
26+
overrideMaterialPassIndex: 0
27+
overrideDepthState: 1
28+
depthCompareFunction: 4
29+
enableWrite: 0
30+
stencilSettings:
31+
overrideStencilState: 1
32+
stencilReference: 0
33+
stencilCompareFunction: 3
34+
passOperation: 0
35+
failOperation: 0
36+
zFailOperation: 0
37+
cameraSettings:
38+
overrideCamera: 0
39+
restoreCamera: 1
40+
offset: {x: 0, y: 0, z: 0, w: 0}
41+
cameraFieldOfView: 60
42+
--- !u!114 &-509393295192694670
43+
MonoBehaviour:
44+
m_ObjectHideFlags: 0
45+
m_CorrespondingSourceObject: {fileID: 0}
46+
m_PrefabInstance: {fileID: 0}
47+
m_PrefabAsset: {fileID: 0}
48+
m_GameObject: {fileID: 0}
49+
m_Enabled: 1
50+
m_EditorHideFlags: 0
51+
m_Script: {fileID: 11500000, guid: f62c9c65cf3354c93be831c8bc075510, type: 3}
52+
m_Name: NewScreenSpaceAmbientOcclusion
53+
m_EditorClassIdentifier:
54+
m_Active: 0
55+
m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3}
56+
m_Settings:
57+
Downsample: 0
58+
Source: 0
59+
NormalSamples: 1
60+
Intensity: 0.5
61+
DirectLightingStrength: 0.25
62+
Radius: 4.2
63+
SampleCount: 6
364
--- !u!114 &11400000
465
MonoBehaviour:
566
m_ObjectHideFlags: 0
@@ -14,8 +75,9 @@ MonoBehaviour:
1475
m_EditorClassIdentifier:
1576
m_RendererFeatures:
1677
- {fileID: 770174969183694509}
17-
- {fileID: 1203680893676135655}
18-
m_RendererFeatureMap: ad6e17cd0d36b00ae7a47d3a6555b410
78+
- {fileID: -8193634041390225171}
79+
- {fileID: -509393295192694670}
80+
m_RendererFeatureMap: ad6e17cd0d36b00aed286347405d4a8e72e012357f45eef8
1981
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
2082
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
2183
shaders:
@@ -24,23 +86,23 @@ MonoBehaviour:
2486
screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd,
2587
type: 3}
2688
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
27-
tileDepthInfoPS: {fileID: 4800000, guid: f451c6bec16aa51408bdfd37f70aed12, type: 3}
28-
tileDeferredPS: {fileID: 4800000, guid: 344787727e03649488a1022c09fa74b5, type: 3}
89+
tileDepthInfoPS: {fileID: 0}
90+
tileDeferredPS: {fileID: 0}
2991
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
3092
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
3193
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
3294
m_OpaqueLayerMask:
3395
serializedVersion: 2
34-
m_Bits: 4294967295
96+
m_Bits: 2147614263
3597
m_TransparentLayerMask:
3698
serializedVersion: 2
37-
m_Bits: 4294967295
99+
m_Bits: 2147614263
38100
m_DefaultStencilState:
39-
overrideStencilState: 0
101+
overrideStencilState: 1
40102
stencilReference: 1
41103
stencilCompareFunction: 8
42104
passOperation: 2
43-
failOperation: 0
105+
failOperation: 1
44106
zFailOperation: 0
45107
m_ShadowTransparentReceive: 1
46108
m_RenderingMode: 0

‎Assets/Data/UniversalRP/PipelineAsset_Low.asset‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ MonoBehaviour:
3434
m_AdditionalLightsPerObjectLimit: 1
3535
m_AdditionalLightShadowsSupported: 0
3636
m_AdditionalLightsShadowmapResolution: 512
37-
m_ShadowDistance: 250
37+
m_ShadowDistance: 150
3838
m_ShadowCascadeCount: 1
3939
m_Cascade2Split: 0.20930393
4040
m_Cascade3Split: {x: 0.1, y: 0.3}
@@ -55,4 +55,5 @@ MonoBehaviour:
5555
m_MaxPixelLights: 0
5656
m_ShadowAtlasResolution: 256
5757
m_ShaderVariantLogLevel: 0
58+
m_VolumeFrameworkUpdateMode: 0
5859
m_ShadowCascades: 0

‎Assets/Data/UniversalRP/PipelineAsset_Medium.asset‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ MonoBehaviour:
3434
m_AdditionalLightsPerObjectLimit: 8
3535
m_AdditionalLightShadowsSupported: 1
3636
m_AdditionalLightsShadowmapResolution: 1024
37-
m_ShadowDistance: 250
37+
m_ShadowDistance: 200
3838
m_ShadowCascadeCount: 2
3939
m_Cascade2Split: 0.20930393
4040
m_Cascade3Split: {x: 0.1, y: 0.3}
@@ -55,4 +55,5 @@ MonoBehaviour:
5555
m_MaxPixelLights: 0
5656
m_ShadowAtlasResolution: 256
5757
m_ShaderVariantLogLevel: 0
58+
m_VolumeFrameworkUpdateMode: 0
5859
m_ShadowCascades: 1

‎Assets/Data/UniversalRP/PlanarReflectionRenderer.asset‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: de640fe3d0db1804a85f9fc8f5cadab6, type: 3}
1313
m_Name: PlanarReflectionRenderer
1414
m_EditorClassIdentifier:
15-
m_RendererFeatures: []
16-
m_RendererFeatureMap:
15+
m_RendererFeatures:
16+
- {fileID: 8871527528365487580}
17+
m_RendererFeatureMap: dcf5529f48ff1d7b
1718
postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
1819
xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
1920
shaders:
@@ -22,24 +23,63 @@ MonoBehaviour:
2223
screenSpaceShadowPS: {fileID: 4800000, guid: 0f854b35a0cf61a429bd5dcfea30eddd,
2324
type: 3}
2425
samplingPS: {fileID: 4800000, guid: 04c410c9937594faa893a11dceb85f7e, type: 3}
25-
tileDepthInfoPS: {fileID: 4800000, guid: f451c6bec16aa51408bdfd37f70aed12, type: 3}
26-
tileDeferredPS: {fileID: 4800000, guid: 344787727e03649488a1022c09fa74b5, type: 3}
26+
tileDepthInfoPS: {fileID: 0}
27+
tileDeferredPS: {fileID: 0}
2728
stencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3}
2829
fallbackErrorPS: {fileID: 4800000, guid: e6e9a19c3678ded42a3bc431ebef7dbd, type: 3}
2930
materialErrorPS: {fileID: 4800000, guid: 5fd9a8feb75a4b5894c241777f519d4e, type: 3}
3031
m_OpaqueLayerMask:
3132
serializedVersion: 2
32-
m_Bits: 4294967295
33+
m_Bits: 2147613751
3334
m_TransparentLayerMask:
3435
serializedVersion: 2
35-
m_Bits: 4294967295
36+
m_Bits: 2147613751
3637
m_DefaultStencilState:
37-
overrideStencilState: 0
38+
overrideStencilState: 1
3839
stencilReference: 1
3940
stencilCompareFunction: 8
4041
passOperation: 2
41-
failOperation: 0
42+
failOperation: 1
4243
zFailOperation: 0
4344
m_ShadowTransparentReceive: 1
4445
m_RenderingMode: 0
4546
m_AccurateGbufferNormals: 0
47+
--- !u!114 &8871527528365487580
48+
MonoBehaviour:
49+
m_ObjectHideFlags: 0
50+
m_CorrespondingSourceObject: {fileID: 0}
51+
m_PrefabInstance: {fileID: 0}
52+
m_PrefabAsset: {fileID: 0}
53+
m_GameObject: {fileID: 0}
54+
m_Enabled: 1
55+
m_EditorHideFlags: 0
56+
m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3}
57+
m_Name: 3D Skybox Transparent
58+
m_EditorClassIdentifier:
59+
m_Active: 1
60+
settings:
61+
passTag: 3D Skybox Transparent
62+
Event: 400
63+
filterSettings:
64+
RenderQueueType: 1
65+
LayerMask:
66+
serializedVersion: 2
67+
m_Bits: 256
68+
PassNames: []
69+
overrideMaterial: {fileID: 0}
70+
overrideMaterialPassIndex: 0
71+
overrideDepthState: 1
72+
depthCompareFunction: 4
73+
enableWrite: 0
74+
stencilSettings:
75+
overrideStencilState: 1
76+
stencilReference: 0
77+
stencilCompareFunction: 3
78+
passOperation: 0
79+
failOperation: 0
80+
zFailOperation: 0
81+
cameraSettings:
82+
overrideCamera: 0
83+
restoreCamera: 1
84+
offset: {x: 0, y: 0, z: 0, w: 0}
85+
cameraFieldOfView: 60

‎Assets/Data/Volumes/BaseEffects.asset‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ MonoBehaviour:
2424
min: 0
2525
scatter:
2626
m_OverrideState: 1
27-
m_Value: 0.85
27+
m_Value: 0.8
2828
min: 0
2929
max: 1
3030
clamp:
3131
m_OverrideState: 1
32-
m_Value: 250
32+
m_Value: 50
3333
min: 0
3434
tint:
3535
m_OverrideState: 0
@@ -40,6 +40,11 @@ MonoBehaviour:
4040
highQualityFiltering:
4141
m_OverrideState: 0
4242
m_Value: 0
43+
skipIterations:
44+
m_OverrideState: 1
45+
m_Value: 3
46+
min: 0
47+
max: 16
4348
dirtTexture:
4449
m_OverrideState: 0
4550
m_Value: {fileID: 0}
@@ -125,7 +130,7 @@ MonoBehaviour:
125130
m_Value: {x: 0.5, y: 0.5}
126131
intensity:
127132
m_OverrideState: 1
128-
m_Value: 0.218
133+
m_Value: 0.241
129134
min: 0
130135
max: 1
131136
smoothness:
@@ -169,4 +174,4 @@ MonoBehaviour:
169174
m_AdvancedMode: 0
170175
mode:
171176
m_OverrideState: 1
172-
m_Value: 2
177+
m_Value: 1

‎Assets/Data/Volumes/MainMenu.asset‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -76,42 +76,3 @@ MonoBehaviour:
7676
m_EditorClassIdentifier:
7777
components:
7878
- {fileID: -1955596298342919953}
79-
- {fileID: 3427765988297945578}
80-
--- !u!114 &3427765988297945578
81-
MonoBehaviour:
82-
m_ObjectHideFlags: 3
83-
m_CorrespondingSourceObject: {fileID: 0}
84-
m_PrefabInstance: {fileID: 0}
85-
m_PrefabAsset: {fileID: 0}
86-
m_GameObject: {fileID: 0}
87-
m_Enabled: 1
88-
m_EditorHideFlags: 0
89-
m_Script: {fileID: 11500000, guid: 66f335fb1ffd8684294ad653bf1c7564, type: 3}
90-
m_Name: ColorAdjustments
91-
m_EditorClassIdentifier:
92-
active: 0
93-
m_AdvancedMode: 0
94-
postExposure:
95-
m_OverrideState: 1
96-
m_Value: -2
97-
contrast:
98-
m_OverrideState: 0
99-
m_Value: 0
100-
min: -100
101-
max: 100
102-
colorFilter:
103-
m_OverrideState: 0
104-
m_Value: {r: 1, g: 1, b: 1, a: 1}
105-
hdr: 1
106-
showAlpha: 0
107-
showEyeDropper: 1
108-
hueShift:
109-
m_OverrideState: 0
110-
m_Value: 0
111-
min: -180
112-
max: 180
113-
saturation:
114-
m_OverrideState: 0
115-
m_Value: 0
116-
min: -100
117-
max: 100

0 commit comments

Comments
 (0)