diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam.unity index 5cb5c5b1437..846e3095215 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam.unity +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/015_CameraMulti_FPSCam.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -99,7 +99,8 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: ad05ec13b6d2249c4b4d86de58f15ca7, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: ac76db81d21c29148a3c1367ae7c480b, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -171,6 +174,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -195,6 +199,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &17394397 CapsuleCollider: m_ObjectHideFlags: 0 @@ -265,6 +270,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -289,6 +295,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &179225544 BoxCollider: m_ObjectHideFlags: 0 @@ -358,6 +365,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -382,6 +390,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &203432151 BoxCollider: m_ObjectHideFlags: 0 @@ -518,6 +527,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.001 UseHDR: 0 WaitFrames: 0 + XRCompatible: 0 --- !u!114 &393419561 MonoBehaviour: m_ObjectHideFlags: 0 @@ -599,6 +609,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -623,6 +634,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &402303144 CapsuleCollider: m_ObjectHideFlags: 0 @@ -693,6 +705,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -717,6 +730,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &460813058 BoxCollider: m_ObjectHideFlags: 0 @@ -786,6 +800,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -810,6 +825,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &481493011 BoxCollider: m_ObjectHideFlags: 0 @@ -879,6 +895,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -903,6 +920,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &639322558 BoxCollider: m_ObjectHideFlags: 0 @@ -972,6 +990,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -996,6 +1015,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &941973662 MeshCollider: m_ObjectHideFlags: 0 @@ -1006,9 +1026,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &941973663 MeshFilter: @@ -1066,6 +1086,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1090,6 +1111,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &988247746 BoxCollider: m_ObjectHideFlags: 0 @@ -1160,6 +1182,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1184,6 +1207,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1094738390 CapsuleCollider: m_ObjectHideFlags: 0 @@ -1254,6 +1278,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1278,6 +1303,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1098213913 BoxCollider: m_ObjectHideFlags: 0 @@ -1457,6 +1483,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1481,6 +1508,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1303464514 MeshCollider: m_ObjectHideFlags: 0 @@ -1491,9 +1519,9 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 - m_CookingOptions: 14 + m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!33 &1303464515 MeshFilter: @@ -1560,6 +1588,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1584,6 +1613,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1352488794 CapsuleCollider: m_ObjectHideFlags: 0 @@ -1669,6 +1699,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1693,6 +1724,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1373403416 BoxCollider: m_ObjectHideFlags: 0 @@ -1762,6 +1794,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1786,6 +1819,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1375891100 BoxCollider: m_ObjectHideFlags: 0 @@ -1841,6 +1875,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1865,6 +1900,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1448324807 SphereCollider: m_ObjectHideFlags: 0 @@ -1949,6 +1985,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1973,6 +2010,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1538879499 BoxCollider: m_ObjectHideFlags: 0 @@ -2073,6 +2111,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2097,6 +2136,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1612961632 BoxCollider: m_ObjectHideFlags: 0 @@ -2152,6 +2192,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2176,6 +2217,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1722798361 SphereCollider: m_ObjectHideFlags: 0 @@ -2260,6 +2302,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2284,6 +2327,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1772383506 BoxCollider: m_ObjectHideFlags: 0 @@ -2431,6 +2475,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2455,6 +2500,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1995046218 SphereCollider: m_ObjectHideFlags: 0 @@ -2524,6 +2570,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2548,6 +2595,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2072381253 SphereCollider: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/045_CustomLWPipe.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/045_CustomLWPipe.unity index 1364eb3c90f..b80f8690e3f 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/045_CustomLWPipe.unity +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/045_CustomLWPipe.unity @@ -38,12 +38,12 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.1802837, g: 0.22571404, b: 0.30692273, a: 1} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -99,7 +99,8 @@ LightmapSettings: m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: 0d54ea8b8bb6b46af9f185f49efa3381, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 0ca42b082390fae4fae354b3b4f65427, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -156,6 +159,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -180,6 +184,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &234236912 BoxCollider: m_ObjectHideFlags: 0 @@ -271,6 +276,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.001 UseHDR: 0 WaitFrames: 0 + XRCompatible: 0 --- !u!20 &380492253 Camera: m_ObjectHideFlags: 0 @@ -343,6 +349,8 @@ MonoBehaviour: m_RenderShadows: 1 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] m_RendererIndex: 4 m_VolumeLayerMask: serializedVersion: 2 @@ -353,6 +361,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -482,6 +491,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -506,6 +516,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1203640973 BoxCollider: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights-Shadows.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights-Shadows.unity index 6904e513c8f..2047d3532af 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights-Shadows.unity +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights-Shadows.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: efe2fb117b2ad274cb7d1a0a0bd9a259, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,9 +119,175 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!43 &179102703 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 18 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 8 + localAABB: + m_Center: {x: 0.012491584, y: 0.012489326, z: 0} + m_Extent: {x: 0.8037572, y: 0.15974614, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010000000300020004000000000005000300010006000200030007000100 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 8 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 224 + _typelessdata: 1e2b44bf7f5e303e00000000d24981bcd6f77fbf00000000000000802ab24c3f3bbd05be00000000097d2bbc69fc7f3f0000008000000080aef5503f63ca163e00000000968a7fbfd813753d000000800000008062904abf7eca16be000000008e387f3feca79fbd0000008000000080aef5503f63ca163e00000000d24981bcd6f77fbf00000000000000801e2b44bf7f5e303e000000008e387f3feca79fbd00000080000000802ab24c3f3bbd05be00000000968a7fbfd813753d000000800000008062904abf7eca16be00000000097d2bbc69fc7f3f0000008000000080 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.012491584, y: 0.012489326, z: 0} + m_Extent: {x: 0.8037572, y: 0.15974614, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &380492249 GameObject: m_ObjectHideFlags: 0 @@ -159,6 +326,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.0005 UseHDR: 0 WaitFrames: 0 + XRCompatible: 0 --- !u!20 &380492253 Camera: m_ObjectHideFlags: 0 @@ -231,6 +399,8 @@ MonoBehaviour: m_RenderShadows: 0 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] m_RendererIndex: 3 m_VolumeLayerMask: serializedVersion: 2 @@ -241,6 +411,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -277,6 +448,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -351,9 +523,9 @@ MonoBehaviour: - {x: 0.7912656, y: 0.13893044, z: 0} - {x: -0.75795525, y: 0.1722359, z: 0} m_ShapePathHash: 521055769 - m_PreviousPathHash: 521055769 - m_Mesh: {fileID: 1974114191} ---- !u!43 &419547705 + m_Mesh: {fileID: 839416904} + m_InstanceId: 17974 +--- !u!43 &695614661 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -370,8 +542,8 @@ Mesh: firstVertex: 0 vertexCount: 8 localAABB: - m_Center: {x: 0.012491643, y: 0.0048234463, z: 0} - m_Extent: {x: 0.78719854, y: 0.14104126, z: 0} + m_Center: {x: 0.016655356, y: 0.020815417, z: 0} + m_Extent: {x: 0.7829381, y: 0.15142049, z: 0} m_Shapes: vertices: [] shapes: [] @@ -450,7 +622,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 224 - _typelessdata: a85741bf8f5d153e0000000023f82dbbc5ff7fbf00000000000000802ab24c3f3bbd05be0000000091aa69bb95ff7f3f00000080000000807fb84c3f8323113e00000000feff7fbfa600ba390000008000000080315346bfaf7c0bbe000000008e647f3f01f98cbd00000080000000807fb84c3f8323113e0000000023f82dbbc5ff7fbf0000000000000080a85741bf8f5d153e000000008e647f3f01f98cbd00000080000000802ab24c3f3bbd05be00000000feff7fbfa600ba390000008000000080315346bfaf7c0bbe0000000091aa69bb95ff7f3f0000008000000080 + _typelessdata: 5b0942bf9c5e303e000000009612b0bcdcf07fbf000000000000008029b24c3f56bd05be00000000103eae3b12ff7f3f000000800000008062904a3fc8430e3e00000000bde07fbf49fdfcbc00000000000000801c2b44bf236dfabd00000000d1e57f3f588ae7bc000000800000008062904a3fc8430e3e000000009612b0bcdcf07fbf00000000000000805b0942bf9c5e303e00000000d1e57f3f588ae7bc000000800000008029b24c3f56bd05be00000000bde07fbf49fdfcbc00000000000000801c2b44bf236dfabd00000000103eae3b12ff7f3f0000008000000080 m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -504,8 +676,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0.012491643, y: 0.0048234463, z: 0} - m_Extent: {x: 0.78719854, y: 0.14104126, z: 0} + m_Center: {x: 0.016655356, y: 0.020815417, z: 0} + m_Extent: {x: 0.7829381, y: 0.15142049, z: 0} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -513,6 +685,7 @@ Mesh: m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: 1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: @@ -588,99 +761,264 @@ MonoBehaviour: - {x: 0.5, y: -0.5, z: 0} - {x: 0.5, y: 0.5, z: 0} - {x: -0.5, y: 0.5, z: 0} ---- !u!1 &1034387691 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1034387692} - - component: {fileID: 1034387694} - - component: {fileID: 1034387693} - m_Layer: 0 - m_Name: FG1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1034387692 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034387691} - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -1.55, y: -2.05, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2087223921} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!114 &1034387693 -MonoBehaviour: +--- !u!43 &839416904 +Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034387691} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7db70e0ea77f5ac47a8f4565a9406397, type: 3} m_Name: - m_EditorClassIdentifier: - m_ShadowGroup: 0 - m_HasRenderer: 1 - m_UseRendererSilhouette: 1 - m_CastsShadows: 1 - m_SelfShadows: 1 - m_ApplyToSortingLayers: eb0feddf00000000e980ef06 - m_ShapePath: - - {x: -0.7747069, y: -0.13621782, z: 0} - - {x: 0.79959357, y: -0.13060467, z: 0} - - {x: 0.7996902, y: 0.14173703, z: 0} - - {x: -0.7552438, y: 0.14586471, z: 0} - m_ShapePathHash: 192067821 - m_PreviousPathHash: 192067821 - m_Mesh: {fileID: 419547705} ---- !u!212 &1034387694 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1034387691} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 18 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 8 + localAABB: + m_Center: {x: 0.016655356, y: 0.020815417, z: 0} + m_Extent: {x: 0.7829381, y: 0.15142049, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010000000300020004000000000005000300010006000200030007000100 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 8 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 224 + _typelessdata: 5b0942bf9c5e303e000000009612b0bcdcf07fbf000000000000008029b24c3f56bd05be00000000103eae3b12ff7f3f000000800000008062904a3fc8430e3e00000000bde07fbf49fdfcbc00000000000000801c2b44bf236dfabd00000000d1e57f3f588ae7bc000000800000008062904a3fc8430e3e000000009612b0bcdcf07fbf00000000000000805b0942bf9c5e303e00000000d1e57f3f588ae7bc000000800000008029b24c3f56bd05be00000000bde07fbf49fdfcbc00000000000000801c2b44bf236dfabd00000000103eae3b12ff7f3f0000008000000080 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.016655356, y: 0.020815417, z: 0} + m_Extent: {x: 0.7829381, y: 0.15142049, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: +--- !u!1 &1034387691 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1034387692} + - component: {fileID: 1034387694} + - component: {fileID: 1034387693} + m_Layer: 0 + m_Name: FG1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1034387692 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034387691} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -1.55, y: -2.05, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2087223921} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!114 &1034387693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034387691} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7db70e0ea77f5ac47a8f4565a9406397, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShadowGroup: 0 + m_HasRenderer: 1 + m_UseRendererSilhouette: 1 + m_CastsShadows: 1 + m_SelfShadows: 1 + m_ApplyToSortingLayers: eb0feddf00000000e980ef06 + m_ShapePath: + - {x: -0.7747069, y: -0.13621782, z: 0} + - {x: 0.79959357, y: -0.13060467, z: 0} + - {x: 0.7996902, y: 0.14173703, z: 0} + - {x: -0.7552438, y: 0.14586471, z: 0} + m_ShapePathHash: 192067821 + m_Mesh: {fileID: 1487046161} + m_InstanceId: 17988 +--- !u!212 &1034387694 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034387691} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: 116359401 m_SortingLayer: 1 @@ -697,6 +1035,170 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!43 &1135501746 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 18 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 8 + localAABB: + m_Center: {x: 0.016655356, y: 0.020815417, z: 0} + m_Extent: {x: 0.7829381, y: 0.15142049, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010000000300020004000000000005000300010006000200030007000100 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 8 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 224 + _typelessdata: 5b0942bf9c5e303e000000009612b0bcdcf07fbf000000000000008029b24c3f56bd05be00000000103eae3b12ff7f3f000000800000008062904a3fc8430e3e00000000bde07fbf49fdfcbc00000000000000801c2b44bf236dfabd00000000d1e57f3f588ae7bc000000800000008062904a3fc8430e3e000000009612b0bcdcf07fbf00000000000000805b0942bf9c5e303e00000000d1e57f3f588ae7bc000000800000008029b24c3f56bd05be00000000bde07fbf49fdfcbc00000000000000801c2b44bf236dfabd00000000103eae3b12ff7f3f0000008000000080 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.016655356, y: 0.020815417, z: 0} + m_Extent: {x: 0.7829381, y: 0.15142049, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1250661339 GameObject: m_ObjectHideFlags: 0 @@ -802,6 +1304,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -876,8 +1379,8 @@ MonoBehaviour: - {x: 0.8162488, y: 0.14725642, z: 0} - {x: -0.7662829, y: 0.17223547, z: 0} m_ShapePathHash: 1421372441 - m_PreviousPathHash: 1421372441 - m_Mesh: {fileID: 419547705} + m_Mesh: {fileID: 179102703} + m_InstanceId: 18004 --- !u!1 &1427598797 GameObject: m_ObjectHideFlags: 0 @@ -911,6 +1414,170 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!43 &1487046161 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + serializedVersion: 10 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 18 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 8 + localAABB: + m_Center: {x: 0.012491643, y: 0.0048234463, z: 0} + m_Extent: {x: 0.78719854, y: 0.14104126, z: 0} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200010000000300020004000000000005000300010006000200030007000100 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 8 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 12 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 224 + _typelessdata: a85741bf8f5d153e0000000023f82dbbc5ff7fbf00000000000000802ab24c3f3bbd05be0000000091aa69bb95ff7f3f00000080000000807fb84c3f8323113e00000000feff7fbfa600ba390000008000000080315346bfaf7c0bbe000000008e647f3f01f98cbd00000080000000807fb84c3f8323113e0000000023f82dbbc5ff7fbf0000000000000080a85741bf8f5d153e000000008e647f3f01f98cbd00000080000000802ab24c3f3bbd05be00000000feff7fbfa600ba390000008000000080315346bfaf7c0bbe0000000091aa69bb95ff7f3f0000008000000080 + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0.012491643, y: 0.0048234463, z: 0} + m_Extent: {x: 0.78719854, y: 0.14104126, z: 0} + m_MeshUsageFlags: 0 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1517212990 GameObject: m_ObjectHideFlags: 0 @@ -943,6 +1610,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1048,8 +1716,8 @@ MonoBehaviour: - {x: 0.8162488, y: 0.14725642, z: 0} - {x: -0.7662829, y: 0.17223547, z: 0} m_ShapePathHash: 1421372441 - m_PreviousPathHash: 1421372441 - m_Mesh: {fileID: 419547705} + m_Mesh: {fileID: 1847665485} + m_InstanceId: 18020 --- !u!212 &1570417533 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1065,6 +1733,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1173,116 +1842,7 @@ MonoBehaviour: - {x: 0.5, y: -0.5, z: 0} - {x: 0.5, y: 0.5, z: 0} - {x: -0.5, y: 0.5, z: 0} ---- !u!1 &1888247323 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1888247324} - - component: {fileID: 1888247326} - - component: {fileID: 1888247325} - m_Layer: 0 - m_Name: FG2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1888247324 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888247323} - m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -0.942, y: -2.05, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2047073038} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!114 &1888247325 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888247323} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7db70e0ea77f5ac47a8f4565a9406397, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShadowGroup: 0 - m_HasRenderer: 1 - m_UseRendererSilhouette: 1 - m_CastsShadows: 1 - m_SelfShadows: 0 - m_ApplyToSortingLayers: eb0feddf00000000e980ef06 - m_ShapePath: - - {x: -0.7662828, y: -0.122278474, z: 0} - - {x: 0.7995935, y: -0.13060507, z: 0} - - {x: 0.7912656, y: 0.13893044, z: 0} - - {x: -0.75795525, y: 0.1722359, z: 0} - m_ShapePathHash: 521055769 - m_PreviousPathHash: 521055769 - m_Mesh: {fileID: 1974114191} ---- !u!212 &1888247326 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1888247323} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 116359401 - m_SortingLayer: 1 - m_SortingOrder: 0 - m_Sprite: {fileID: 7195817935496006023, guid: 418ab5c27d3054eb89959d9c715e00c9, - type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.66, y: 0.4} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!43 &1974114191 +--- !u!43 &1847665485 Mesh: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1299,8 +1859,8 @@ Mesh: firstVertex: 0 vertexCount: 8 localAABB: - m_Center: {x: 0.016655356, y: 0.020815417, z: 0} - m_Extent: {x: 0.7829381, y: 0.15142049, z: 0} + m_Center: {x: 0.012491584, y: 0.012489326, z: 0} + m_Extent: {x: 0.8037572, y: 0.15974614, z: 0} m_Shapes: vertices: [] shapes: [] @@ -1379,7 +1939,7 @@ Mesh: format: 0 dimension: 0 m_DataSize: 224 - _typelessdata: 5b0942bf9c5e303e000000009612b0bcdcf07fbf000000000000008029b24c3f56bd05be00000000103eae3b12ff7f3f000000800000008062904a3fc8430e3e00000000bde07fbf49fdfcbc00000000000000801c2b44bf236dfabd00000000d1e57f3f588ae7bc000000800000008062904a3fc8430e3e000000009612b0bcdcf07fbf00000000000000805b0942bf9c5e303e00000000d1e57f3f588ae7bc000000800000008029b24c3f56bd05be00000000bde07fbf49fdfcbc00000000000000801c2b44bf236dfabd00000000103eae3b12ff7f3f0000008000000080 + _typelessdata: 1e2b44bf7f5e303e00000000d24981bcd6f77fbf00000000000000802ab24c3f3bbd05be00000000097d2bbc69fc7f3f0000008000000080aef5503f63ca163e00000000968a7fbfd813753d000000800000008062904abf7eca16be000000008e387f3feca79fbd0000008000000080aef5503f63ca163e00000000d24981bcd6f77fbf00000000000000801e2b44bf7f5e303e000000008e387f3feca79fbd00000080000000802ab24c3f3bbd05be00000000968a7fbfd813753d000000800000008062904abf7eca16be00000000097d2bbc69fc7f3f0000008000000080 m_CompressedMesh: m_Vertices: m_NumItems: 0 @@ -1433,8 +1993,8 @@ Mesh: m_BitSize: 0 m_UVInfo: 0 m_LocalAABB: - m_Center: {x: 0.016655356, y: 0.020815417, z: 0} - m_Extent: {x: 0.7829381, y: 0.15142049, z: 0} + m_Center: {x: 0.012491584, y: 0.012489326, z: 0} + m_Extent: {x: 0.8037572, y: 0.15974614, z: 0} m_MeshUsageFlags: 0 m_BakedConvexCollisionMesh: m_BakedTriangleCollisionMesh: @@ -1442,9 +2002,120 @@ Mesh: m_MeshMetrics[1]: 1 m_MeshOptimizationFlags: 1 m_StreamData: + serializedVersion: 2 offset: 0 size: 0 path: +--- !u!1 &1888247323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1888247324} + - component: {fileID: 1888247326} + - component: {fileID: 1888247325} + m_Layer: 0 + m_Name: FG2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1888247324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888247323} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: -0.942, y: -2.05, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2047073038} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!114 &1888247325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888247323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7db70e0ea77f5ac47a8f4565a9406397, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ShadowGroup: 0 + m_HasRenderer: 1 + m_UseRendererSilhouette: 1 + m_CastsShadows: 1 + m_SelfShadows: 0 + m_ApplyToSortingLayers: eb0feddf00000000e980ef06 + m_ShapePath: + - {x: -0.7662828, y: -0.122278474, z: 0} + - {x: 0.7995935, y: -0.13060507, z: 0} + - {x: 0.7912656, y: 0.13893044, z: 0} + - {x: -0.75795525, y: 0.1722359, z: 0} + m_ShapePathHash: 521055769 + m_Mesh: {fileID: 1135501746} + m_InstanceId: 18034 +--- !u!212 &1888247326 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1888247323} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 116359401 + m_SortingLayer: 1 + m_SortingOrder: 0 + m_Sprite: {fileID: 7195817935496006023, guid: 418ab5c27d3054eb89959d9c715e00c9, + type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.66, y: 0.4} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &2002025661 GameObject: m_ObjectHideFlags: 0 @@ -1501,8 +2172,8 @@ MonoBehaviour: - {x: 0.7912656, y: 0.13893044, z: 0} - {x: -0.75795525, y: 0.1722359, z: 0} m_ShapePathHash: 521055769 - m_PreviousPathHash: 521055769 - m_Mesh: {fileID: 1974114191} + m_Mesh: {fileID: 695614661} + m_InstanceId: 18044 --- !u!212 &2002025664 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1518,6 +2189,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights.unity index 4ce3b74c64b..cbdf2fba54c 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights.unity +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 413798a17a9565f4e865f701fca65a66, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -231,6 +234,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.0005 UseHDR: 0 WaitFrames: 0 + XRCompatible: 0 --- !u!20 &380492253 Camera: m_ObjectHideFlags: 0 @@ -303,6 +307,8 @@ MonoBehaviour: m_RenderShadows: 0 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] m_RendererIndex: 3 m_VolumeLayerMask: serializedVersion: 2 @@ -313,6 +319,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -348,6 +355,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -578,6 +586,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -877,6 +886,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -958,6 +968,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1040,6 +1051,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1195,6 +1207,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights_Shader_Graph.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights_Shader_Graph.unity index efcbc1f24fb..6a4e9bcf359 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights_Shader_Graph.unity +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/056_2D_Lights_Shader_Graph.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: b7c146a6f0337cf42aeb500ed76dc0b7, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -231,6 +234,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.0005 UseHDR: 0 WaitFrames: 0 + XRCompatible: 0 --- !u!20 &380492253 Camera: m_ObjectHideFlags: 0 @@ -303,6 +307,8 @@ MonoBehaviour: m_RenderShadows: 0 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] m_RendererIndex: 3 m_VolumeLayerMask: serializedVersion: 2 @@ -313,6 +319,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -348,6 +355,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -578,6 +586,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -877,6 +886,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -958,6 +968,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1040,6 +1051,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1195,6 +1207,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/059_2D_PixelPerfect_PostProcessing.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/059_2D_PixelPerfect_PostProcessing.unity index ca284cb77b9..840f2bc7784 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/059_2D_PixelPerfect_PostProcessing.unity +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/059_2D_PixelPerfect_PostProcessing.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 4b0578f6e3cd4f64284872668ba45f51, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -203,6 +206,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -284,6 +288,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -365,6 +370,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -446,6 +452,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -527,6 +534,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -612,6 +620,8 @@ MonoBehaviour: m_RenderShadows: 0 m_RequiresDepthTextureOption: 0 m_RequiresOpaqueTextureOption: 0 + m_CameraType: 0 + m_Cameras: [] m_RendererIndex: 3 m_VolumeLayerMask: serializedVersion: 2 @@ -622,6 +632,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -721,6 +732,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.0005 UseHDR: 0 WaitFrames: 0 + XRCompatible: 0 --- !u!114 &599516828 MonoBehaviour: m_ObjectHideFlags: 0 @@ -770,6 +782,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -851,6 +864,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -932,6 +946,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1013,6 +1028,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1094,6 +1110,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1175,6 +1192,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1256,6 +1274,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1337,6 +1356,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1418,6 +1438,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1499,6 +1520,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1580,6 +1602,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1661,6 +1684,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1742,6 +1766,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1823,6 +1848,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1904,6 +1930,7 @@ SpriteRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/070_2D_Forward_Shader_Compatibility_2D.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/070_2D_Forward_Shader_Compatibility_2D.unity index 9faf14ba0cb..4e7b4195b30 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/070_2D_Forward_Shader_Compatibility_2D.unity +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/070_2D_Forward_Shader_Compatibility_2D.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +98,8 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: ba67f88411543814b9ba46130442dfb0, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -159,6 +162,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.0005 UseHDR: 0 WaitFrames: 0 + XRCompatible: 0 --- !u!20 &380492253 Camera: m_ObjectHideFlags: 0 @@ -231,6 +235,8 @@ MonoBehaviour: m_RenderShadows: 0 m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] m_RendererIndex: 2 m_VolumeLayerMask: serializedVersion: 2 @@ -241,6 +247,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -328,6 +335,16 @@ PrefabInstance: propertyPath: m_Name value: Objects objectReference: {fileID: 0} + - target: {fileID: 8686941707975464830, guid: efc9431b3060359419f0075245ee6ffd, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: dd46ded8ce2d822448c69a59f8d0e24f, type: 2} + - target: {fileID: 8686941708676956963, guid: efc9431b3060359419f0075245ee6ffd, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: e2d404d8109454745a80fe86dd2f4319, type: 2} - target: {fileID: 8701114088550318862, guid: efc9431b3060359419f0075245ee6ffd, type: 3} propertyPath: m_LocalPosition.x @@ -383,15 +400,5 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8686941707975464830, guid: efc9431b3060359419f0075245ee6ffd, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: dd46ded8ce2d822448c69a59f8d0e24f, type: 2} - - target: {fileID: 8686941708676956963, guid: efc9431b3060359419f0075245ee6ffd, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: e2d404d8109454745a80fe86dd2f4319, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: efc9431b3060359419f0075245ee6ffd, type: 3} diff --git a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_RendererFeatureActive.unity b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_RendererFeatureActive.unity index fd9880543b3..727bda645ad 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_RendererFeatureActive.unity +++ b/TestProjects/UniversalGraphicsTest/Assets/Scenes/126_RendererFeatureActive.unity @@ -180,6 +180,7 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.001 UseHDR: 0 WaitFrames: 0 + XRCompatible: 0 --- !u!20 &64132551 Camera: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs b/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs index 847bab4e264..8784d45d7cd 100644 --- a/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs +++ b/TestProjects/UniversalGraphicsTest/Assets/Test/Runtime/UniversalGraphicsTestSettings.cs @@ -3,6 +3,7 @@ public class UniversalGraphicsTestSettings : GraphicsTestSettings { public int WaitFrames = 0; + public bool XRCompatible = true; public UniversalGraphicsTestSettings() { diff --git a/com.unity.render-pipelines.universal/CHANGELOG.md b/com.unity.render-pipelines.universal/CHANGELOG.md index 9e5354125c0..92e1ad18b76 100644 --- a/com.unity.render-pipelines.universal/CHANGELOG.md +++ b/com.unity.render-pipelines.universal/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added a OnCameraCleanup() function to the ScriptableRenderPass API, that gets called by the renderer after rendering each camera - Added Default Material Type options to the 2D Renderer Data Asset property settings. - Added additional steps to the 2D Renderer setup page for quality and platform settings. +- Added option to disable XR autotests on test settings. ### Changed