Skip to content

Commit fa3c363

Browse files
peeweekpeeweek
committed
Upgraded to 5.8.2-preview + PinScreen Sample
1 parent 4084e58 commit fa3c363

File tree

467 files changed

+119605
-26383
lines changed

Some content is hidden

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

467 files changed

+119605
-26383
lines changed

‎Assets/Gizmos/Cinemachine/cm_logo_lg.png

-64.6 KB
Binary file not shown.

‎Assets/HDRP/DiffusionProfiles.asset renamed to ‎Assets/HDRP/Bubonic Face.asset

+27-46
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,19 @@ MonoBehaviour:
1010
m_Enabled: 1
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: b2686e09ec7aef44bad2843e4416f057, type: 3}
13-
m_Name: DiffusionProfiles
13+
m_Name: Bubonic Face
1414
m_EditorClassIdentifier:
15+
profile:
16+
name: Bubonic Face
17+
scatteringDistance: {r: 7.2784314, g: 7.2784314, b: 7.2784314, a: 1}
18+
transmissionTint: {r: 0.5, g: 0.14076413, b: 0, a: 1}
19+
texturingMode: 0
20+
transmissionMode: 0
21+
thicknessRemap: {x: 0, y: 8.694578}
22+
worldScale: 0.09
23+
ior: 1.443
24+
hash: 1080186057
25+
m_Version: 1
1526
profiles:
1627
- name: Bubonic Face
1728
scatteringDistance: {r: 7.2784314, g: 7.2784314, b: 7.2784314, a: 1}
@@ -21,9 +32,7 @@ MonoBehaviour:
2132
thicknessRemap: {x: 0, y: 8.694578}
2233
worldScale: 0.09
2334
ior: 1.443
24-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
25-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
26-
lerpWeight: 1
35+
hash: 1080186057
2736
- name: Smoke Fake Scattering
2837
scatteringDistance: {r: 1, g: 1, b: 1, a: 1}
2938
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -32,9 +41,7 @@ MonoBehaviour:
3241
thicknessRemap: {x: 3, y: 30}
3342
worldScale: 1
3443
ior: 1
35-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
36-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
37-
lerpWeight: 1
44+
hash: 1078874990
3845
- name: Steam
3946
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
4047
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -43,9 +50,7 @@ MonoBehaviour:
4350
thicknessRemap: {x: 0, y: 5}
4451
worldScale: 1
4552
ior: 1.4
46-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
47-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
48-
lerpWeight: 1
53+
hash: 1080650646
4954
- name: SSS01
5055
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
5156
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -54,9 +59,7 @@ MonoBehaviour:
5459
thicknessRemap: {x: 0, y: 5}
5560
worldScale: 1
5661
ior: 1.4
57-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
58-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
59-
lerpWeight: 1
62+
hash: 1078544746
6063
- name: Profile 5
6164
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
6265
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -65,9 +68,7 @@ MonoBehaviour:
6568
thicknessRemap: {x: 0, y: 5}
6669
worldScale: 1
6770
ior: 1.4
68-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
69-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
70-
lerpWeight: 1
71+
hash: 1075064051
7172
- name: Profile 6
7273
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
7374
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -76,9 +77,7 @@ MonoBehaviour:
7677
thicknessRemap: {x: 0, y: 5}
7778
worldScale: 1
7879
ior: 1.4
79-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
80-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
81-
lerpWeight: 1
80+
hash: 1078566384
8281
- name: Profile 7
8382
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
8483
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -87,9 +86,7 @@ MonoBehaviour:
8786
thicknessRemap: {x: 0, y: 5}
8887
worldScale: 1
8988
ior: 1.4
90-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
91-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
92-
lerpWeight: 1
89+
hash: 1077553841
9390
- name: Profile 8
9491
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
9592
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -98,9 +95,7 @@ MonoBehaviour:
9895
thicknessRemap: {x: 0, y: 5}
9996
worldScale: 1
10097
ior: 1.4
101-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
102-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
103-
lerpWeight: 1
98+
hash: 1077146068
10499
- name: Profile 9
105100
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
106101
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -109,9 +104,7 @@ MonoBehaviour:
109104
thicknessRemap: {x: 0, y: 5}
110105
worldScale: 1
111106
ior: 1.4
112-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
113-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
114-
lerpWeight: 1
107+
hash: 1075227299
115108
- name: Profile 10
116109
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
117110
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -120,9 +113,7 @@ MonoBehaviour:
120113
thicknessRemap: {x: 0, y: 5}
121114
worldScale: 1
122115
ior: 1.4
123-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
124-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
125-
lerpWeight: 1
116+
hash: 1076666406
126117
- name: Profile 11
127118
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
128119
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -131,9 +122,7 @@ MonoBehaviour:
131122
thicknessRemap: {x: 0, y: 5}
132123
worldScale: 1
133124
ior: 1.4
134-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
135-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
136-
lerpWeight: 1
125+
hash: 1077777699
137126
- name: Profile 12
138127
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
139128
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -142,9 +131,7 @@ MonoBehaviour:
142131
thicknessRemap: {x: 0, y: 5}
143132
worldScale: 1
144133
ior: 1.4
145-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
146-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
147-
lerpWeight: 1
134+
hash: 1082111175
148135
- name: Profile 13
149136
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
150137
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -153,9 +140,7 @@ MonoBehaviour:
153140
thicknessRemap: {x: 0, y: 5}
154141
worldScale: 1
155142
ior: 1.4
156-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
157-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
158-
lerpWeight: 1
143+
hash: 1075397316
159144
- name: Profile 14
160145
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
161146
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -164,9 +149,7 @@ MonoBehaviour:
164149
thicknessRemap: {x: 0, y: 5}
165150
worldScale: 1
166151
ior: 1.4
167-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
168-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
169-
lerpWeight: 1
152+
hash: 1079843341
170153
- name: Profile 15
171154
scatteringDistance: {r: 0.5, g: 0.5, b: 0.5, a: 1}
172155
transmissionTint: {r: 1, g: 1, b: 1, a: 1}
@@ -175,6 +158,4 @@ MonoBehaviour:
175158
thicknessRemap: {x: 0, y: 5}
176159
worldScale: 1
177160
ior: 1.4
178-
scatterDistance1: {r: 0.3, g: 0.3, b: 0.3, a: 0}
179-
scatterDistance2: {r: 0.5, g: 0.5, b: 0.5, a: 0}
180-
lerpWeight: 1
161+
hash: 1076158975

‎Assets/HDRP/Bubonic Face.asset.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Gizmos.meta renamed to ‎Assets/HDRP/DefaultSettings.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/HDRP/DefaultSettings/DefaultPostprocessingSettings.asset

+184
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
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: DefaultPostprocessingSettings
14+
m_EditorClassIdentifier:
15+
components:
16+
- {fileID: 4245329729632590140}
17+
- {fileID: 4291193248687608038}
18+
- {fileID: 2926520594555130314}
19+
--- !u!114 &2926520594555130314
20+
MonoBehaviour:
21+
m_ObjectHideFlags: 3
22+
m_CorrespondingSourceObject: {fileID: 0}
23+
m_PrefabInstance: {fileID: 0}
24+
m_PrefabAsset: {fileID: 0}
25+
m_GameObject: {fileID: 0}
26+
m_Enabled: 1
27+
m_EditorHideFlags: 0
28+
m_Script: {fileID: 11500000, guid: f086a068d4c5889438831b3ae9afc11c, type: 3}
29+
m_Name: Tonemapping
30+
m_EditorClassIdentifier:
31+
active: 1
32+
m_AdvancedMode: 0
33+
mode:
34+
m_OverrideState: 1
35+
m_Value: 2
36+
toeStrength:
37+
m_OverrideState: 0
38+
m_Value: 0
39+
min: 0
40+
max: 1
41+
toeLength:
42+
m_OverrideState: 0
43+
m_Value: 0.5
44+
min: 0
45+
max: 1
46+
shoulderStrength:
47+
m_OverrideState: 0
48+
m_Value: 0
49+
min: 0
50+
max: 1
51+
shoulderLength:
52+
m_OverrideState: 0
53+
m_Value: 0.5
54+
min: 0
55+
shoulderAngle:
56+
m_OverrideState: 0
57+
m_Value: 0
58+
min: 0
59+
max: 1
60+
gamma:
61+
m_OverrideState: 0
62+
m_Value: 1
63+
min: 0.001
64+
--- !u!114 &4245329729632590140
65+
MonoBehaviour:
66+
m_ObjectHideFlags: 3
67+
m_CorrespondingSourceObject: {fileID: 0}
68+
m_PrefabInstance: {fileID: 0}
69+
m_PrefabAsset: {fileID: 0}
70+
m_GameObject: {fileID: 0}
71+
m_Enabled: 1
72+
m_EditorHideFlags: 0
73+
m_Script: {fileID: 11500000, guid: 2d08ce26990eb1a4a9177b860541e702, type: 3}
74+
m_Name: Exposure
75+
m_EditorClassIdentifier:
76+
active: 1
77+
m_AdvancedMode: 0
78+
mode:
79+
m_OverrideState: 1
80+
m_Value: 0
81+
meteringMode:
82+
m_OverrideState: 1
83+
m_Value: 2
84+
luminanceSource:
85+
m_OverrideState: 1
86+
m_Value: 1
87+
fixedExposure:
88+
m_OverrideState: 1
89+
m_Value: 14
90+
compensation:
91+
m_OverrideState: 1
92+
m_Value: 0
93+
limitMin:
94+
m_OverrideState: 1
95+
m_Value: -10
96+
limitMax:
97+
m_OverrideState: 1
98+
m_Value: 20
99+
curveMap:
100+
m_OverrideState: 1
101+
m_Value:
102+
serializedVersion: 2
103+
m_Curve:
104+
- serializedVersion: 3
105+
time: -10
106+
value: -10
107+
inSlope: 0
108+
outSlope: 1
109+
tangentMode: 0
110+
weightedMode: 0
111+
inWeight: 0
112+
outWeight: 0
113+
- serializedVersion: 3
114+
time: 20
115+
value: 20
116+
inSlope: 1
117+
outSlope: 0
118+
tangentMode: 0
119+
weightedMode: 0
120+
inWeight: 0
121+
outWeight: 0
122+
m_PreInfinity: 2
123+
m_PostInfinity: 2
124+
m_RotationOrder: 4
125+
adaptationMode:
126+
m_OverrideState: 1
127+
m_Value: 1
128+
adaptationSpeedDarkToLight:
129+
m_OverrideState: 1
130+
m_Value: 3
131+
min: 0.001
132+
adaptationSpeedLightToDark:
133+
m_OverrideState: 1
134+
m_Value: 1
135+
min: 0.001
136+
--- !u!114 &4291193248687608038
137+
MonoBehaviour:
138+
m_ObjectHideFlags: 3
139+
m_CorrespondingSourceObject: {fileID: 0}
140+
m_PrefabInstance: {fileID: 0}
141+
m_PrefabAsset: {fileID: 0}
142+
m_GameObject: {fileID: 0}
143+
m_Enabled: 1
144+
m_EditorHideFlags: 0
145+
m_Script: {fileID: 11500000, guid: 24f077503be6ae942a1e1245dbd53ea9, type: 3}
146+
m_Name: Bloom
147+
m_EditorClassIdentifier:
148+
active: 1
149+
m_AdvancedMode: 0
150+
intensity:
151+
m_OverrideState: 1
152+
m_Value: 0.2
153+
min: 0
154+
max: 1
155+
scatter:
156+
m_OverrideState: 0
157+
m_Value: 0.7
158+
min: 0
159+
max: 1
160+
tint:
161+
m_OverrideState: 0
162+
m_Value: {r: 1, g: 1, b: 1, a: 1}
163+
hdr: 0
164+
showAlpha: 0
165+
showEyeDropper: 1
166+
dirtTexture:
167+
m_OverrideState: 0
168+
m_Value: {fileID: 0}
169+
dirtIntensity:
170+
m_OverrideState: 0
171+
m_Value: 0
172+
min: 0
173+
highQualityFiltering:
174+
m_OverrideState: 0
175+
m_Value: 1
176+
resolution:
177+
m_OverrideState: 0
178+
m_Value: 2
179+
prefilter:
180+
m_OverrideState: 0
181+
m_Value: 0
182+
anamorphic:
183+
m_OverrideState: 0
184+
m_Value: 1

‎Assets/Samples/Volumetric/Volumetric Profile.asset.meta renamed to ‎Assets/HDRP/DefaultSettings/DefaultPostprocessingSettings.asset.meta

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)