Skip to content

Commit 52ab430

Browse files
sebastienlagardeanisunity
sebastienlagarde
and
anisunity
authored
[2021.1 Backport] Backport various HDRP PR to 2020.1 (#3097)
* Update 5001_Fog_FogFallBack scene to correct bad behavior #2989 * update decal stress test reference screenshots Co-authored-by: anisunity <[email protected]>
1 parent f0e8859 commit 52ab430

File tree

21 files changed

+1296
-429
lines changed

21 files changed

+1296
-429
lines changed

‎TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback.unity‎

Lines changed: 895 additions & 299 deletions
Large diffs are not rendered by default.

‎TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/FogFallbackRT.renderTexture‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!84 &8400000
4+
RenderTexture:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_Name: FogFallbackRT
10+
m_ImageContentsHash:
11+
serializedVersion: 2
12+
Hash: 00000000000000000000000000000000
13+
m_ForcedFallbackFormat: 4
14+
m_DownscaleFallback: 0
15+
m_IsAlphaChannelOptional: 0
16+
serializedVersion: 3
17+
m_Width: 640
18+
m_Height: 360
19+
m_AntiAliasing: 1
20+
m_MipCount: -1
21+
m_DepthFormat: 2
22+
m_ColorFormat: 4
23+
m_MipMap: 0
24+
m_GenerateMips: 1
25+
m_SRGB: 1
26+
m_UseDynamicScale: 0
27+
m_BindMS: 0
28+
m_EnableCompatibleFormat: 0
29+
m_TextureSettings:
30+
serializedVersion: 2
31+
m_FilterMode: 1
32+
m_Aniso: 0
33+
m_MipBias: 0
34+
m_WrapU: 1
35+
m_WrapV: 1
36+
m_WrapW: 1
37+
m_Dimension: 2
38+
m_VolumeDepth: 1

‎TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/FogFallbackRT.renderTexture.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.

‎TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_02.asset‎

Lines changed: 160 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ MonoBehaviour:
1414
m_EditorClassIdentifier:
1515
active: 1
1616
m_AdvancedMode: 0
17+
quality:
18+
m_OverrideState: 0
19+
m_Value: 1
1720
enabled:
1821
m_OverrideState: 1
1922
m_Value: 1
@@ -26,6 +29,12 @@ MonoBehaviour:
2629
hdr: 1
2730
showAlpha: 0
2831
showEyeDropper: 1
32+
tint:
33+
m_OverrideState: 0
34+
m_Value: {r: 1, g: 1, b: 1, a: 1}
35+
hdr: 1
36+
showAlpha: 0
37+
showEyeDropper: 1
2938
maxFogDistance:
3039
m_OverrideState: 0
3140
m_Value: 5000
@@ -49,29 +58,146 @@ MonoBehaviour:
4958
maximumHeight:
5059
m_OverrideState: 0
5160
m_Value: 50
61+
meanFreePath:
62+
m_OverrideState: 0
63+
m_Value: 400
64+
min: 1
65+
enableVolumetricFog:
66+
m_OverrideState: 0
67+
m_Value: 0
5268
albedo:
5369
m_OverrideState: 0
5470
m_Value: {r: 1, g: 1, b: 1, a: 1}
5571
hdr: 0
5672
showAlpha: 1
5773
showEyeDropper: 1
58-
meanFreePath:
74+
globalLightProbeDimmer:
5975
m_OverrideState: 0
60-
m_Value: 400
61-
min: 1
62-
enableVolumetricFog:
76+
m_Value: 1
77+
min: 0
78+
max: 1
79+
depthExtent:
6380
m_OverrideState: 0
64-
m_Value: 0
81+
m_Value: 64
82+
min: 0.1
83+
denoisingMode:
84+
m_OverrideState: 0
85+
m_Value: 2
6586
anisotropy:
6687
m_OverrideState: 0
6788
m_Value: 0
6889
min: -1
6990
max: 1
70-
globalLightProbeDimmer:
91+
sliceDistributionUniformity:
7192
m_OverrideState: 0
93+
m_Value: 0.75
94+
min: 0
95+
max: 1
96+
m_FogControlMode:
97+
m_OverrideState: 0
98+
m_Value: 0
99+
screenResolutionPercentage:
100+
m_OverrideState: 0
101+
m_Value: 12.5
102+
min: 6.25
103+
max: 50
104+
volumeSliceCount:
105+
m_OverrideState: 0
106+
m_Value: 64
107+
min: 1
108+
max: 512
109+
m_VolumetricFogBudget:
110+
m_OverrideState: 0
111+
m_Value: 0.33
112+
min: 0
113+
max: 1
114+
m_ResolutionDepthRatio:
115+
m_OverrideState: 0
116+
m_Value: 0.666
117+
min: 0
118+
max: 1
119+
directionalLightsOnly:
120+
m_OverrideState: 0
121+
m_Value: 0
122+
--- !u!114 &-1075090289917962011
123+
MonoBehaviour:
124+
m_ObjectHideFlags: 3
125+
m_CorrespondingSourceObject: {fileID: 0}
126+
m_PrefabInstance: {fileID: 0}
127+
m_PrefabAsset: {fileID: 0}
128+
m_GameObject: {fileID: 0}
129+
m_Enabled: 1
130+
m_EditorHideFlags: 0
131+
m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3}
132+
m_Name: ProceduralSky
133+
m_EditorClassIdentifier:
134+
active: 1
135+
m_AdvancedMode: 0
136+
rotation:
137+
m_OverrideState: 1
138+
m_Value: 0
139+
min: 0
140+
max: 360
141+
skyIntensityMode:
142+
m_OverrideState: 1
143+
m_Value: 0
144+
exposure:
145+
m_OverrideState: 1
146+
m_Value: 1
147+
multiplier:
148+
m_OverrideState: 1
149+
m_Value: 1
150+
min: 0
151+
upperHemisphereLuxValue:
152+
m_OverrideState: 1
72153
m_Value: 1
73154
min: 0
155+
upperHemisphereLuxColor:
156+
m_OverrideState: 0
157+
m_Value: {x: 0, y: 0, z: 0}
158+
desiredLuxValue:
159+
m_OverrideState: 1
160+
m_Value: 20000
161+
updateMode:
162+
m_OverrideState: 1
163+
m_Value: 0
164+
updatePeriod:
165+
m_OverrideState: 1
166+
m_Value: 0
167+
min: 0
168+
includeSunInBaking:
169+
m_OverrideState: 1
170+
m_Value: 0
171+
sunSize:
172+
m_OverrideState: 1
173+
m_Value: 0.04
174+
min: 0
74175
max: 1
176+
sunSizeConvergence:
177+
m_OverrideState: 1
178+
m_Value: 5
179+
min: 1
180+
max: 10
181+
atmosphereThickness:
182+
m_OverrideState: 1
183+
m_Value: 1
184+
min: 0
185+
max: 5
186+
skyTint:
187+
m_OverrideState: 1
188+
m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
189+
hdr: 0
190+
showAlpha: 1
191+
showEyeDropper: 1
192+
groundColor:
193+
m_OverrideState: 1
194+
m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1}
195+
hdr: 0
196+
showAlpha: 1
197+
showEyeDropper: 1
198+
enableSunDisk:
199+
m_OverrideState: 1
200+
m_Value: 1
75201
--- !u!114 &11400000
76202
MonoBehaviour:
77203
m_ObjectHideFlags: 0
@@ -86,3 +212,31 @@ MonoBehaviour:
86212
m_EditorClassIdentifier:
87213
components:
88214
- {fileID: -9013707545174552859}
215+
- {fileID: 6396251953645422251}
216+
- {fileID: -1075090289917962011}
217+
--- !u!114 &6396251953645422251
218+
MonoBehaviour:
219+
m_ObjectHideFlags: 3
220+
m_CorrespondingSourceObject: {fileID: 0}
221+
m_PrefabInstance: {fileID: 0}
222+
m_PrefabAsset: {fileID: 0}
223+
m_GameObject: {fileID: 0}
224+
m_Enabled: 1
225+
m_EditorHideFlags: 0
226+
m_Script: {fileID: 11500000, guid: 0d7593b3a9277ac4696b20006c21dde2, type: 3}
227+
m_Name: VisualEnvironment
228+
m_EditorClassIdentifier:
229+
active: 1
230+
m_AdvancedMode: 0
231+
skyType:
232+
m_OverrideState: 1
233+
m_Value: 4
234+
cloudType:
235+
m_OverrideState: 0
236+
m_Value: 0
237+
skyAmbientMode:
238+
m_OverrideState: 0
239+
m_Value: 0
240+
fogType:
241+
m_OverrideState: 0
242+
m_Value: 0

‎TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_03.asset‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
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: d7fd9488000d3734a9e00ee676215985, type: 3}
13+
m_Name: Volume_03
14+
m_EditorClassIdentifier:
15+
components:
16+
- {fileID: 8902598455958804791}
17+
- {fileID: 4246312208630799846}
18+
--- !u!114 &4246312208630799846
19+
MonoBehaviour:
20+
m_ObjectHideFlags: 3
21+
m_CorrespondingSourceObject: {fileID: 0}
22+
m_PrefabInstance: {fileID: 0}
23+
m_PrefabAsset: {fileID: 0}
24+
m_GameObject: {fileID: 0}
25+
m_Enabled: 1
26+
m_EditorHideFlags: 0
27+
m_Script: {fileID: 11500000, guid: 0d7593b3a9277ac4696b20006c21dde2, type: 3}
28+
m_Name: VisualEnvironment
29+
m_EditorClassIdentifier:
30+
active: 1
31+
m_AdvancedMode: 0
32+
skyType:
33+
m_OverrideState: 1
34+
m_Value: 2
35+
cloudType:
36+
m_OverrideState: 0
37+
m_Value: 0
38+
skyAmbientMode:
39+
m_OverrideState: 0
40+
m_Value: 0
41+
fogType:
42+
m_OverrideState: 0
43+
m_Value: 0
44+
--- !u!114 &8902598455958804791
45+
MonoBehaviour:
46+
m_ObjectHideFlags: 3
47+
m_CorrespondingSourceObject: {fileID: 0}
48+
m_PrefabInstance: {fileID: 0}
49+
m_PrefabAsset: {fileID: 0}
50+
m_GameObject: {fileID: 0}
51+
m_Enabled: 1
52+
m_EditorHideFlags: 0
53+
m_Script: {fileID: 11500000, guid: 3df29e7cc05fbec4aa43e06ea875565d, type: 3}
54+
m_Name: ProceduralSky
55+
m_EditorClassIdentifier:
56+
active: 1
57+
m_AdvancedMode: 0
58+
rotation:
59+
m_OverrideState: 1
60+
m_Value: 0
61+
min: 0
62+
max: 360
63+
skyIntensityMode:
64+
m_OverrideState: 1
65+
m_Value: 0
66+
exposure:
67+
m_OverrideState: 1
68+
m_Value: 1
69+
multiplier:
70+
m_OverrideState: 1
71+
m_Value: 1
72+
min: 0
73+
upperHemisphereLuxValue:
74+
m_OverrideState: 1
75+
m_Value: 1
76+
min: 0
77+
upperHemisphereLuxColor:
78+
m_OverrideState: 0
79+
m_Value: {x: 0, y: 0, z: 0}
80+
desiredLuxValue:
81+
m_OverrideState: 1
82+
m_Value: 20000
83+
updateMode:
84+
m_OverrideState: 1
85+
m_Value: 0
86+
updatePeriod:
87+
m_OverrideState: 1
88+
m_Value: 0
89+
min: 0
90+
includeSunInBaking:
91+
m_OverrideState: 1
92+
m_Value: 0
93+
sunSize:
94+
m_OverrideState: 1
95+
m_Value: 0.04
96+
min: 0
97+
max: 1
98+
sunSizeConvergence:
99+
m_OverrideState: 1
100+
m_Value: 5
101+
min: 1
102+
max: 10
103+
atmosphereThickness:
104+
m_OverrideState: 1
105+
m_Value: 1
106+
min: 0
107+
max: 5
108+
skyTint:
109+
m_OverrideState: 1
110+
m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
111+
hdr: 0
112+
showAlpha: 1
113+
showEyeDropper: 1
114+
groundColor:
115+
m_OverrideState: 1
116+
m_Value: {r: 0.369, g: 0.349, b: 0.341, a: 1}
117+
hdr: 0
118+
showAlpha: 1
119+
showEyeDropper: 1
120+
enableSunDisk:
121+
m_OverrideState: 1
122+
m_Value: 1

‎TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/5x_SkyAndFog/5001_Fog_FogFallback/Volume_03.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)