Skip to content

Commit 3c2110f

Browse files
sindhartasindharta
authored
Merge branch 'Unity-Technologies:master' into master
2 parents fa12677 + c8747fd commit 3c2110f

File tree

193 files changed

+17256
-5284
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

+17256
-5284
lines changed

‎TestProjects/UniversalGraphicsTestECS-6000.0/Assets/Scenes/AngelRing/AngelRing.unity‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 9
16+
serializedVersion: 10
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
46-
serializedVersion: 12
47-
m_GIWorkflowMode: 1
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4847
m_GISettings:
4948
serializedVersion: 2
5049
m_BounceScale: 1
@@ -67,9 +66,6 @@ LightmapSettings:
6766
m_LightmapParameters: {fileID: 0}
6867
m_LightmapsBakeMode: 1
6968
m_TextureCompression: 1
70-
m_FinalGather: 0
71-
m_FinalGatherFiltering: 1
72-
m_FinalGatherRayCount: 256
7369
m_ReflectionCompression: 2
7470
m_MixedBakeMode: 2
7571
m_BakeBackend: 0
@@ -130,17 +126,18 @@ LightingSettings:
130126
m_PrefabInstance: {fileID: 0}
131127
m_PrefabAsset: {fileID: 0}
132128
m_Name: Settings.lighting
133-
serializedVersion: 6
134-
m_GIWorkflowMode: 1
129+
serializedVersion: 9
135130
m_EnableBakedLightmaps: 0
136131
m_EnableRealtimeLightmaps: 1
137132
m_RealtimeEnvironmentLighting: 1
138133
m_BounceScale: 1
139134
m_AlbedoBoost: 1
140135
m_IndirectOutputScale: 1
141136
m_UsingShadowmask: 1
142-
m_BakeBackend: 0
137+
m_BakeBackend: 1
143138
m_LightmapMaxSize: 1024
139+
m_LightmapSizeFixed: 0
140+
m_UseMipmapLimits: 1
144141
m_BakeResolution: 40
145142
m_Padding: 2
146143
m_LightmapCompression: 3
@@ -154,13 +151,11 @@ LightingSettings:
154151
m_FilterMode: 1
155152
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
156153
m_ExportTrainingData: 0
154+
m_EnableWorkerProcessBaking: 1
157155
m_TrainingDataDestination: TrainingData
158156
m_RealtimeResolution: 2
159157
m_ForceWhiteAlbedo: 0
160158
m_ForceUpdates: 0
161-
m_FinalGather: 0
162-
m_FinalGatherRayCount: 256
163-
m_FinalGatherFiltering: 1
164159
m_PVRCulling: 1
165160
m_PVRSampling: 1
166161
m_PVRDirectSampleCount: 32
@@ -184,8 +179,6 @@ LightingSettings:
184179
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
185180
m_PVRFilteringAtrousPositionSigmaIndirect: 2
186181
m_PVRFilteringAtrousPositionSigmaAO: 1
187-
m_PVRTiledBaking: 0
188-
m_NumRaysToShootPerTexel: -1
189182
m_RespectSceneVisibilityWhenBakingGI: 0
190183
--- !u!1001 &249969526
191184
PrefabInstance:
@@ -378,12 +371,12 @@ MonoBehaviour:
378371
m_RequiresColorTexture: 0
379372
m_Version: 2
380373
m_TaaSettings:
381-
quality: 3
382-
frameInfluence: 0.1
383-
jitterScale: 1
384-
mipBias: 0
385-
varianceClampScale: 0.9
386-
contrastAdaptiveSharpening: 0
374+
m_Quality: 3
375+
m_FrameInfluence: 0.1
376+
m_JitterScale: 1
377+
m_MipBias: 0
378+
m_VarianceClampScale: 0.9
379+
m_ContrastAdaptiveSharpening: 0
387380
--- !u!81 &759218315
388381
AudioListener:
389382
m_ObjectHideFlags: 0
@@ -466,18 +459,20 @@ MonoBehaviour:
466459
ImageComparisonSettings:
467460
TargetWidth: 960
468461
TargetHeight: 540
462+
TargetMSAASamples: 1
469463
PerPixelCorrectnessThreshold: 0.005
470464
PerPixelGammaThreshold: 0.003921569
471465
PerPixelAlphaThreshold: 0.003921569
466+
RMSEThreshold: 0
472467
AverageCorrectnessThreshold: 0.005
473468
IncorrectPixelsThreshold: 0.0000038146973
474469
UseHDR: 0
475470
UseBackBuffer: 0
476471
ImageResolution: 3
477472
ActiveImageTests: 1
478473
ActivePixelTests: -1
474+
SO: {fileID: 11400000, guid: 38185e5fc3dea1e47b68a1e60de13007, type: 2}
479475
WaitFrames: 480
480-
XRCompatible: 1
481476
CheckMemoryAllocation: 0
482477
--- !u!1 &803902813 stripped
483478
GameObject:

‎TestProjects/UniversalGraphicsTestECS-6000.0/Assets/Scenes/Cube_HardEdge/Cube_HardEdge.unity‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
1313
--- !u!104 &2
1414
RenderSettings:
1515
m_ObjectHideFlags: 0
16-
serializedVersion: 9
16+
serializedVersion: 10
1717
m_Fog: 0
1818
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
1919
m_FogMode: 3
@@ -38,13 +38,12 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
4241
m_UseRadianceAmbientProbe: 0
4342
--- !u!157 &3
4443
LightmapSettings:
4544
m_ObjectHideFlags: 0
46-
serializedVersion: 12
47-
m_GIWorkflowMode: 1
45+
serializedVersion: 13
46+
m_BakeOnSceneLoad: 0
4847
m_GISettings:
4948
serializedVersion: 2
5049
m_BounceScale: 1
@@ -67,9 +66,6 @@ LightmapSettings:
6766
m_LightmapParameters: {fileID: 0}
6867
m_LightmapsBakeMode: 1
6968
m_TextureCompression: 1
70-
m_FinalGather: 0
71-
m_FinalGatherFiltering: 1
72-
m_FinalGatherRayCount: 256
7369
m_ReflectionCompression: 2
7470
m_MixedBakeMode: 2
7571
m_BakeBackend: 0
@@ -97,7 +93,7 @@ LightmapSettings:
9793
m_ExportTrainingData: 0
9894
m_TrainingDataDestination: TrainingData
9995
m_LightProbeSampleCountMultiplier: 4
100-
m_LightingDataAsset: {fileID: 0}
96+
m_LightingDataAsset: {fileID: 20201, guid: 0000000000000000f000000000000000, type: 0}
10197
m_LightingSettings: {fileID: 64155913}
10298
--- !u!196 &4
10399
NavMeshSettings:
@@ -130,17 +126,18 @@ LightingSettings:
130126
m_PrefabInstance: {fileID: 0}
131127
m_PrefabAsset: {fileID: 0}
132128
m_Name: Settings.lighting
133-
serializedVersion: 6
134-
m_GIWorkflowMode: 1
129+
serializedVersion: 9
135130
m_EnableBakedLightmaps: 0
136131
m_EnableRealtimeLightmaps: 1
137132
m_RealtimeEnvironmentLighting: 1
138133
m_BounceScale: 1
139134
m_AlbedoBoost: 1
140135
m_IndirectOutputScale: 1
141136
m_UsingShadowmask: 1
142-
m_BakeBackend: 0
137+
m_BakeBackend: 1
143138
m_LightmapMaxSize: 1024
139+
m_LightmapSizeFixed: 0
140+
m_UseMipmapLimits: 1
144141
m_BakeResolution: 40
145142
m_Padding: 2
146143
m_LightmapCompression: 3
@@ -154,13 +151,11 @@ LightingSettings:
154151
m_FilterMode: 1
155152
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
156153
m_ExportTrainingData: 0
154+
m_EnableWorkerProcessBaking: 1
157155
m_TrainingDataDestination: TrainingData
158156
m_RealtimeResolution: 2
159157
m_ForceWhiteAlbedo: 0
160158
m_ForceUpdates: 0
161-
m_FinalGather: 0
162-
m_FinalGatherRayCount: 256
163-
m_FinalGatherFiltering: 1
164159
m_PVRCulling: 1
165160
m_PVRSampling: 1
166161
m_PVRDirectSampleCount: 32
@@ -184,8 +179,6 @@ LightingSettings:
184179
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
185180
m_PVRFilteringAtrousPositionSigmaIndirect: 2
186181
m_PVRFilteringAtrousPositionSigmaAO: 1
187-
m_PVRTiledBaking: 0
188-
m_NumRaysToShootPerTexel: -1
189182
m_RespectSceneVisibilityWhenBakingGI: 0
190183
--- !u!1 &232167451
191184
GameObject:
@@ -266,9 +259,8 @@ Light:
266259
m_PrefabAsset: {fileID: 0}
267260
m_GameObject: {fileID: 485917294}
268261
m_Enabled: 1
269-
serializedVersion: 10
262+
serializedVersion: 11
270263
m_Type: 1
271-
m_Shape: 0
272264
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
273265
m_Intensity: 1
274266
m_Range: 10
@@ -318,8 +310,12 @@ Light:
318310
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
319311
m_UseBoundingSphereOverride: 0
320312
m_UseViewFrustumForShadowCasterCull: 1
313+
m_ForceVisible: 0
321314
m_ShadowRadius: 0
322315
m_ShadowAngle: 0
316+
m_LightUnit: 1
317+
m_LuxAtDistance: 1
318+
m_EnableSpotReflector: 1
323319
--- !u!4 &485917296
324320
Transform:
325321
m_ObjectHideFlags: 0
@@ -433,12 +429,12 @@ MonoBehaviour:
433429
m_RequiresColorTexture: 0
434430
m_Version: 2
435431
m_TaaSettings:
436-
quality: 3
437-
frameInfluence: 0.1
438-
jitterScale: 1
439-
mipBias: 0
440-
varianceClampScale: 0.9
441-
contrastAdaptiveSharpening: 0
432+
m_Quality: 3
433+
m_FrameInfluence: 0.1
434+
m_JitterScale: 1
435+
m_MipBias: 0
436+
m_VarianceClampScale: 0.9
437+
m_ContrastAdaptiveSharpening: 0
442438
--- !u!20 &1367092735
443439
Camera:
444440
m_ObjectHideFlags: 0
@@ -520,18 +516,20 @@ MonoBehaviour:
520516
ImageComparisonSettings:
521517
TargetWidth: 960
522518
TargetHeight: 540
519+
TargetMSAASamples: 1
523520
PerPixelCorrectnessThreshold: 0.005
524521
PerPixelGammaThreshold: 0.003921569
525522
PerPixelAlphaThreshold: 0.003921569
523+
RMSEThreshold: 0
526524
AverageCorrectnessThreshold: 0.005
527525
IncorrectPixelsThreshold: 0.0000038146973
528526
UseHDR: 1
529527
UseBackBuffer: 0
530528
ImageResolution: 3
531529
ActiveImageTests: 1
532530
ActivePixelTests: -1
531+
SO: {fileID: 11400000, guid: 38185e5fc3dea1e47b68a1e60de13007, type: 2}
533532
WaitFrames: 480
534-
XRCompatible: 1
535533
CheckMemoryAllocation: 0
536534
--- !u!1660057539 &9223372036854775807
537535
SceneRoots:

0 commit comments

Comments
 (0)