Skip to content

Commit 4928374

Browse files
Revert "Changed Ambient Mode to Dynamic by default (#5465)"
This reverts commit ab06631.
1 parent ca77aca commit 4928374

File tree

49 files changed

+3351
-5738
lines changed

Some content is hidden

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

49 files changed

+3351
-5738
lines changed

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1213_Lit_anisotropy/Scene Settings Profile.asset

Lines changed: 5 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,6 @@ MonoBehaviour:
3131
skyType:
3232
m_OverrideState: 1
3333
m_Value: 1
34-
cloudType:
35-
m_OverrideState: 0
36-
m_Value: 0
37-
skyAmbientMode:
38-
m_OverrideState: 1
39-
m_Value: 0
40-
windOrientation:
41-
m_OverrideState: 0
42-
m_Value: 0
43-
windSpeed:
44-
m_OverrideState: 0
45-
m_Value: 100
4634
fogType:
4735
m_OverrideState: 1
4836
m_Value: 0
@@ -62,6 +50,8 @@ MonoBehaviour:
6250
rotation:
6351
m_OverrideState: 1
6452
m_Value: 0
53+
min: 0
54+
max: 360
6555
skyIntensityMode:
6656
m_OverrideState: 1
6757
m_Value: 0
@@ -71,12 +61,11 @@ MonoBehaviour:
7161
multiplier:
7262
m_OverrideState: 1
7363
m_Value: 1
64+
min: 0
7465
upperHemisphereLuxValue:
7566
m_OverrideState: 1
7667
m_Value: 2.2355762
77-
upperHemisphereLuxColor:
78-
m_OverrideState: 0
79-
m_Value: {x: 0, y: 0, z: 0}
68+
min: 0
8069
desiredLuxValue:
8170
m_OverrideState: 1
8271
m_Value: 20000
@@ -86,84 +75,10 @@ MonoBehaviour:
8675
updatePeriod:
8776
m_OverrideState: 1
8877
m_Value: 0
78+
min: 0
8979
includeSunInBaking:
9080
m_OverrideState: 1
9181
m_Value: 0
9282
hdriSky:
9383
m_OverrideState: 1
9484
m_Value: {fileID: 8900000, guid: 9c13f7d97fda704439868458dc2385ed, type: 3}
95-
distortionMode:
96-
m_OverrideState: 0
97-
m_Value: 0
98-
flowmap:
99-
m_OverrideState: 0
100-
m_Value: {fileID: 0}
101-
upperHemisphereOnly:
102-
m_OverrideState: 0
103-
m_Value: 1
104-
scrollOrientation:
105-
m_OverrideState: 0
106-
m_Value:
107-
mode: 1
108-
customValue: 0
109-
additiveValue: 0
110-
multiplyValue: 1
111-
scrollSpeed:
112-
m_OverrideState: 0
113-
m_Value:
114-
mode: 1
115-
customValue: 100
116-
additiveValue: 0
117-
multiplyValue: 1
118-
enableBackplate:
119-
m_OverrideState: 0
120-
m_Value: 0
121-
backplateType:
122-
m_OverrideState: 0
123-
m_Value: 0
124-
groundLevel:
125-
m_OverrideState: 0
126-
m_Value: 0
127-
scale:
128-
m_OverrideState: 0
129-
m_Value: {x: 32, y: 32}
130-
projectionDistance:
131-
m_OverrideState: 0
132-
m_Value: 16
133-
plateRotation:
134-
m_OverrideState: 0
135-
m_Value: 0
136-
plateTexRotation:
137-
m_OverrideState: 0
138-
m_Value: 0
139-
plateTexOffset:
140-
m_OverrideState: 0
141-
m_Value: {x: 0, y: 0}
142-
blendAmount:
143-
m_OverrideState: 0
144-
m_Value: 0
145-
shadowTint:
146-
m_OverrideState: 0
147-
m_Value: {r: 0.5, g: 0.5, b: 0.5, a: 1}
148-
pointLightShadow:
149-
m_OverrideState: 0
150-
m_Value: 0
151-
dirLightShadow:
152-
m_OverrideState: 0
153-
m_Value: 0
154-
rectLightShadow:
155-
m_OverrideState: 0
156-
m_Value: 0
157-
m_SkyVersion: 1
158-
enableDistortion:
159-
m_OverrideState: 0
160-
m_Value: 0
161-
procedural:
162-
m_OverrideState: 0
163-
m_Value: 1
164-
scrollDirection:
165-
m_OverrideState: 0
166-
m_Value: 0
167-
m_ObsoleteScrollSpeed:
168-
m_OverrideState: 0
169-
m_Value: 1

TestProjects/HDRP_Tests/Assets/GraphicTests/Scenes/1x_Materials/1214_Lit_LowResTransparent.unity

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@ Transform:
153153
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
154154
m_LocalPosition: {x: -10.02, y: -0.94, z: -0.01785475}
155155
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
156-
m_ConstrainProportionsScale: 0
157156
m_Children: []
158157
m_Father: {fileID: 1560707990}
159158
m_RootOrder: 3
@@ -313,7 +312,7 @@ PrefabInstance:
313312
- target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7,
314313
type: 3}
315314
propertyPath: m_Version
316-
value: 8
315+
value: 7
317316
objectReference: {fileID: 0}
318317
- target: {fileID: 114777190906822814, guid: c07ace9ab142ca9469fa377877c2f1e7,
319318
type: 3}
@@ -588,7 +587,6 @@ Transform:
588587
m_LocalRotation: {x: 0.12893414, y: -0, z: -0, w: 0.99165314}
589588
m_LocalPosition: {x: 0, y: -0.23820874, z: -0.19019747}
590589
m_LocalScale: {x: 1, y: 1, z: 1}
591-
m_ConstrainProportionsScale: 0
592590
m_Children:
593591
- {fileID: 150555374}
594592
- {fileID: 1560707990}
@@ -624,7 +622,6 @@ Transform:
624622
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
625623
m_LocalPosition: {x: -10.05, y: 1.76, z: -0.02}
626624
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
627-
m_ConstrainProportionsScale: 0
628625
m_Children: []
629626
m_Father: {fileID: 1560707990}
630627
m_RootOrder: 2
@@ -824,7 +821,6 @@ MonoBehaviour:
824821
m_BarnDoorAngle: 90
825822
m_BarnDoorLength: 0.05
826823
m_preserveCachedShadow: 0
827-
m_OnDemandShadowRenderOnPlacement: 1
828824
m_ShadowCascadeRatios:
829825
- 0.05
830826
- 0.2
@@ -840,6 +836,7 @@ MonoBehaviour:
840836
useOldInspector: 0
841837
useVolumetric: 1
842838
featuresFoldout: 1
839+
showAdditionalSettings: 0
843840
m_AreaLightEmissiveMeshShadowCastingMode: 0
844841
m_AreaLightEmissiveMeshMotionVectorGenerationMode: 0
845842
m_AreaLightEmissiveMeshLayer: -1
@@ -923,7 +920,6 @@ Transform:
923920
m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
924921
m_LocalPosition: {x: 0, y: 0, z: 0}
925922
m_LocalScale: {x: 1, y: 1, z: 1}
926-
m_ConstrainProportionsScale: 0
927923
m_Children: []
928924
m_Father: {fileID: 0}
929925
m_RootOrder: 2
@@ -1020,7 +1016,6 @@ Transform:
10201016
m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341}
10211017
m_LocalPosition: {x: -10.628, y: -3.2892313, z: -0.3983413}
10221018
m_LocalScale: {x: 2, y: 2, z: 2}
1023-
m_ConstrainProportionsScale: 0
10241019
m_Children: []
10251020
m_Father: {fileID: 0}
10261021
m_RootOrder: 5
@@ -1117,7 +1112,6 @@ Transform:
11171112
m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341}
11181113
m_LocalPosition: {x: -14.967999, y: -3.2892313, z: -0.3983413}
11191114
m_LocalScale: {x: 2, y: 2, z: 2}
1120-
m_ConstrainProportionsScale: 0
11211115
m_Children: []
11221116
m_Father: {fileID: 0}
11231117
m_RootOrder: 8
@@ -1214,7 +1208,6 @@ Transform:
12141208
m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341}
12151209
m_LocalPosition: {x: -10.628, y: 1.6230732, z: -1.7315147}
12161210
m_LocalScale: {x: 2, y: 2, z: 2}
1217-
m_ConstrainProportionsScale: 0
12181211
m_Children: []
12191212
m_Father: {fileID: 0}
12201213
m_RootOrder: 3
@@ -1248,7 +1241,6 @@ Transform:
12481241
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
12491242
m_LocalPosition: {x: -10.02, y: -3.01, z: -0.02}
12501243
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
1251-
m_ConstrainProportionsScale: 0
12521244
m_Children: []
12531245
m_Father: {fileID: 1560707990}
12541246
m_RootOrder: 4
@@ -1427,7 +1419,6 @@ Transform:
14271419
m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341}
14281420
m_LocalPosition: {x: -14.967999, y: -0.7896553, z: -1.0767106}
14291421
m_LocalScale: {x: 2, y: 2, z: 2}
1430-
m_ConstrainProportionsScale: 0
14311422
m_Children: []
14321423
m_Father: {fileID: 0}
14331424
m_RootOrder: 7
@@ -1524,7 +1515,6 @@ Transform:
15241515
m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341}
15251516
m_LocalPosition: {x: -10.628, y: -0.7896553, z: -1.0767106}
15261517
m_LocalScale: {x: 2, y: 2, z: 2}
1527-
m_ConstrainProportionsScale: 0
15281518
m_Children: []
15291519
m_Father: {fileID: 0}
15301520
m_RootOrder: 4
@@ -1558,7 +1548,6 @@ Transform:
15581548
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
15591549
m_LocalPosition: {x: -2.68, y: 2.941782, z: 0}
15601550
m_LocalScale: {x: 3, y: 3, z: 3}
1561-
m_ConstrainProportionsScale: 0
15621551
m_Children: []
15631552
m_Father: {fileID: 1560707990}
15641553
m_RootOrder: 1
@@ -1737,7 +1726,6 @@ Transform:
17371726
m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341}
17381727
m_LocalPosition: {x: -14.967999, y: 1.6230732, z: -1.7315147}
17391728
m_LocalScale: {x: 2, y: 2, z: 2}
1740-
m_ConstrainProportionsScale: 0
17411729
m_Children: []
17421730
m_Father: {fileID: 0}
17431731
m_RootOrder: 6
@@ -1771,7 +1759,6 @@ Transform:
17711759
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
17721760
m_LocalPosition: {x: -6.818, y: 2.941782, z: 0}
17731761
m_LocalScale: {x: 3, y: 3, z: 1}
1774-
m_ConstrainProportionsScale: 0
17751762
m_Children: []
17761763
m_Father: {fileID: 1560707990}
17771764
m_RootOrder: 0
@@ -1884,7 +1871,6 @@ Transform:
18841871
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
18851872
m_LocalPosition: {x: -8.23, y: 0, z: 0}
18861873
m_LocalScale: {x: 1, y: 1, z: 1}
1887-
m_ConstrainProportionsScale: 0
18881874
m_Children:
18891875
- {fileID: 1517719156}
18901876
- {fileID: 1270125020}
@@ -1987,7 +1973,6 @@ Transform:
19871973
m_LocalRotation: {x: -0.73307997, y: -0, z: -0, w: 0.6801425}
19881974
m_LocalPosition: {x: -12.526949, y: -0.15709, z: 4.54}
19891975
m_LocalScale: {x: 2.1692, y: 1, z: 2.3152}
1990-
m_ConstrainProportionsScale: 0
19911976
m_Children: []
19921977
m_Father: {fileID: 0}
19931978
m_RootOrder: 9
@@ -2037,7 +2022,7 @@ MonoBehaviour:
20372022
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
20382023
m_Name:
20392024
m_EditorClassIdentifier:
2040-
m_IsGlobal: 1
2025+
isGlobal: 1
20412026
priority: 0
20422027
blendDistance: 0
20432028
weight: 1
@@ -2052,7 +2037,6 @@ Transform:
20522037
m_LocalRotation: {x: -0.13211717, y: -0, z: -0, w: 0.9912341}
20532038
m_LocalPosition: {x: 0, y: -0.23820874, z: -0.19019747}
20542039
m_LocalScale: {x: 1, y: 1, z: 1}
2055-
m_ConstrainProportionsScale: 0
20562040
m_Children: []
20572041
m_Father: {fileID: 0}
20582042
m_RootOrder: 1

0 commit comments

Comments
 (0)