diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs index 5c11e019aa1..07c2c4b47a0 100644 --- a/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs @@ -57,7 +57,7 @@ public IEnumerator Run(GraphicsTestCase testCase) // ScreenCapture.CaptureScreenshotAsTexture --> does not work since colorspace is wrong, would need colorspace change and thus color compression // ScreenCapture.CaptureScreenshotIntoRenderTexture --> does not work since texture is flipped, would need another pass // so we need to capture and reload the resulting file. - ScreenCapture.CaptureScreenshot(tempScreenshotFile); + ScreenCapture.CaptureScreenshot(tempScreenshotFile, ScreenCapture.StereoScreenCaptureMode.BothEyes); // NOTE: there's discussions around whether Unity has actually documented this correctly. // Unity says: next frame MUST have the file ready diff --git a/com.unity.render-pipelines.core/Editor/Drawing.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader.meta similarity index 77% rename from com.unity.render-pipelines.core/Editor/Drawing.meta rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader.meta index cf7a35a15f0..6411622a94a 100644 --- a/com.unity.render-pipelines.core/Editor/Drawing.meta +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 079a8e4faab04ff2929b3d925675cc2d +guid: bcdef7b531aed92468d64ffca8cbc08d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/001_xr_ShaderGraph.png b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/001_xr_ShaderGraph.png similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/001_xr_ShaderGraph.png rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/001_xr_ShaderGraph.png diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/001_xr_ShaderGraph.png.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/001_xr_ShaderGraph.png.meta similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/001_xr_ShaderGraph.png.meta rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/001_xr_ShaderGraph.png.meta diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/002_xr_InstancedRendering.png b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/002_xr_InstancedRendering.png similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/002_xr_InstancedRendering.png rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/002_xr_InstancedRendering.png diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/002_xr_InstancedRendering.png.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/002_xr_InstancedRendering.png.meta similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/002_xr_InstancedRendering.png.meta rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/002_xr_InstancedRendering.png.meta diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/003_xr_OpaqueTexture.png b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/003_xr_OpaqueTexture.png similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/003_xr_OpaqueTexture.png rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/003_xr_OpaqueTexture.png diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/003_xr_OpaqueTexture.png.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/003_xr_OpaqueTexture.png.meta similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/003_xr_OpaqueTexture.png.meta rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/003_xr_OpaqueTexture.png.meta diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_ShaderGraph.png b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_ShaderGraph.png similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_ShaderGraph.png rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_ShaderGraph.png diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_ShaderGraph.png.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_ShaderGraph.png.meta similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_ShaderGraph.png.meta rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_ShaderGraph.png.meta diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_InstancedRendering.png b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_InstancedRendering.png similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_InstancedRendering.png rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_InstancedRendering.png diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_InstancedRendering.png.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_InstancedRendering.png.meta similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_InstancedRendering.png.meta rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_InstancedRendering.png.meta diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_OpaqueTexture.png b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_OpaqueTexture.png similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_OpaqueTexture.png rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_OpaqueTexture.png diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_OpaqueTexture.png.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_OpaqueTexture.png.meta similarity index 100% rename from TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_OpaqueTexture.png.meta rename to TestProjects/ShaderGraphUniversalStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_OpaqueTexture.png.meta diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/001_xr_ShaderGraph.unity b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/001_xr_ShaderGraph.unity index 295ddb8395c..6a7a9f48ee0 100644 --- a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/001_xr_ShaderGraph.unity +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/001_xr_ShaderGraph.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: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 0091453abcbc5514cb34d30a506b9085, + 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} @@ -168,6 +171,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -192,6 +196,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &784134335 MeshFilter: m_ObjectHideFlags: 0 @@ -212,7 +217,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &971756569 GameObject: @@ -228,6 +233,7 @@ GameObject: - component: {fileID: 971756571} - component: {fileID: 971756570} - component: {fileID: 971756573} + - component: {fileID: 971756576} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -286,7 +292,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -298,6 +303,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -351,13 +357,31 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971756569} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -9.97} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1807164839} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &971756576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 --- !u!1 &1161206970 GameObject: m_ObjectHideFlags: 0 @@ -448,8 +472,39 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 40, y: -45, z: 0} +--- !u!1 &1807164838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1807164839} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1807164839 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1807164838} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -9.97} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 971756575} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1973193401 GameObject: m_ObjectHideFlags: 0 @@ -497,6 +552,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -521,6 +577,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1973193404 MeshFilter: m_ObjectHideFlags: 0 @@ -541,5 +598,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering.unity b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering.unity index 0f253a9ecab..358d387f2cc 100644 --- a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering.unity +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/002_xr_InstancedRendering.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: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 50097717900dd124c93cd765332250ea, + 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} @@ -182,6 +185,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -206,6 +210,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &581458189 MeshFilter: m_ObjectHideFlags: 0 @@ -247,7 +252,7 @@ Transform: - {fileID: 1398952324} - {fileID: 581458186} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &966429866 GameObject: @@ -310,6 +315,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -334,6 +340,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &966429870 MeshFilter: m_ObjectHideFlags: 0 @@ -389,6 +396,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -413,6 +421,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1161536114 MeshFilter: m_ObjectHideFlags: 0 @@ -496,6 +505,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -520,6 +530,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1398952327 MeshFilter: m_ObjectHideFlags: 0 @@ -541,6 +552,7 @@ GameObject: - component: {fileID: 1592147964} - component: {fileID: 1592147968} - component: {fileID: 1592147967} + - component: {fileID: 1592147969} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -606,13 +618,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1592147963} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 2, y: 5.1, z: -9.97} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1643781290} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1592147967 MonoBehaviour: m_ObjectHideFlags: 0 @@ -648,7 +660,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -660,9 +671,59 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &1592147969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592147963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!1 &1643781289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1643781290} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1643781290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1643781289} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 2, y: 5.1, z: -9.97} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1592147966} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1998637911 GameObject: m_ObjectHideFlags: 0 @@ -753,7 +814,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 58.775, y: 111.76, z: 80.152} --- !u!1 &2010304970 GameObject: @@ -802,6 +863,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -826,6 +888,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &2010304973 MeshFilter: m_ObjectHideFlags: 0 diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/003_xr_OpaqueTexture.unity b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/003_xr_OpaqueTexture.unity index 76146e8dbd4..2fb6e7b6821 100644 --- a/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/003_xr_OpaqueTexture.unity +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/Scenes/003_xr_OpaqueTexture.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: 2bb9afe444e57b042835f0ed647b04ab, + 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} @@ -182,6 +185,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -206,6 +210,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &581458189 MeshFilter: m_ObjectHideFlags: 0 @@ -243,7 +248,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} @@ -262,6 +267,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -286,6 +292,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &814224479 MeshFilter: m_ObjectHideFlags: 0 @@ -306,7 +313,7 @@ Transform: m_LocalScale: {x: 7.662875, y: 7.662875, z: 7.662875} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 63.238003, y: 112.76501, z: 64.532005} --- !u!1 &911258241 GameObject: @@ -339,7 +346,7 @@ Transform: - {fileID: 1398952324} - {fileID: 581458186} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &966429866 GameObject: @@ -402,6 +409,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -426,6 +434,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &966429870 MeshFilter: m_ObjectHideFlags: 0 @@ -495,6 +504,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -519,6 +529,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1398952327 MeshFilter: m_ObjectHideFlags: 0 @@ -540,6 +551,7 @@ GameObject: - component: {fileID: 1592147964} - component: {fileID: 1592147968} - component: {fileID: 1592147967} + - component: {fileID: 1592147969} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -581,7 +593,7 @@ Camera: near clip plane: 0.3 far clip plane: 1000 field of view: 60 - orthographic: 1 + orthographic: 0 orthographic size: 3 m_Depth: -1 m_CullingMask: @@ -605,13 +617,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1592147963} - m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 2, y: 5.1, z: -2} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1615928273} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1592147967 MonoBehaviour: m_ObjectHideFlags: 0 @@ -647,7 +659,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -659,9 +670,59 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &1592147969 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592147963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!1 &1615928272 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1615928273} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1615928273 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1615928272} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 2, y: 5.1, z: -2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1592147966} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1998637911 GameObject: m_ObjectHideFlags: 0 @@ -752,5 +813,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 58.775, y: 111.76, z: 80.152} diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/XR.meta new file mode 100644 index 00000000000..d09a43f8433 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bd1c6df251da9e949b9d3bbbb2b531d9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders.meta new file mode 100644 index 00000000000..52f7fca9b8c --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22919eb8017f35342b11dd8315b18abc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders/Mock HMD Loader.asset b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders/Mock HMD Loader.asset new file mode 100644 index 00000000000..f7b4662c3db --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders/Mock HMD Loader.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0660e8fc444734757ae6f6c40c2d33a0, type: 3} + m_Name: Mock HMD Loader + m_EditorClassIdentifier: diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders/Mock HMD Loader.asset.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders/Mock HMD Loader.asset.meta new file mode 100644 index 00000000000..7ce49d259d5 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Loaders/Mock HMD Loader.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bb58ac463a21ec84da8075b4d1bff695 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings.meta new file mode 100644 index 00000000000..547e13c4de0 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6dc5f1f29399a8d488db32e44eed80dd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings/Mock HMD Build Settings.asset b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings/Mock HMD Build Settings.asset new file mode 100644 index 00000000000..0acbf623d4a --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings/Mock HMD Build Settings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8bf066bf8a4947a1be502d267edb82f, type: 3} + m_Name: Mock HMD Build Settings + m_EditorClassIdentifier: + renderMode: 1 diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings/Mock HMD Build Settings.asset.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings/Mock HMD Build Settings.asset.meta new file mode 100644 index 00000000000..4ca8679f704 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/Settings/Mock HMD Build Settings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f5e2543633abe7d47aff7142f331df8f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR/XRGeneralSettings.asset b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/XRGeneralSettings.asset new file mode 100644 index 00000000000..166b7fa75d1 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/XRGeneralSettings.asset @@ -0,0 +1,48 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3} + m_Name: XRGeneralSettings + m_EditorClassIdentifier: + Keys: 01000000 + Values: + - {fileID: 1495469327853492347} +--- !u!114 &1495469327853492347 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: Standalone Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: 4190920664652722549} + m_InitManagerOnStart: 1 +--- !u!114 &4190920664652722549 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: Standalone Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 1 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: + - {fileID: 11400000, guid: bb58ac463a21ec84da8075b4d1bff695, type: 2} diff --git a/TestProjects/ShaderGraphUniversalStereo/Assets/XR/XRGeneralSettings.asset.meta b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/XRGeneralSettings.asset.meta new file mode 100644 index 00000000000..f8209082cd1 --- /dev/null +++ b/TestProjects/ShaderGraphUniversalStereo/Assets/XR/XRGeneralSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94eecc09e86374849b3d549d1fe98951 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json b/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json index 25e8d959a79..fe35366c24f 100644 --- a/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json +++ b/TestProjects/ShaderGraphUniversalStereo/Packages/manifest.json @@ -1,50 +1,52 @@ { - "dependencies": { - "com.unity.ext.nunit": "1.0.0", - "com.unity.ide.rider": "1.1.4", - "com.unity.ide.visualstudio": "1.0.11", - "com.unity.ide.vscode": "1.1.3", - "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", - "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", - "com.unity.shadergraph": "file:../../../com.unity.shadergraph", - "com.unity.test-framework": "1.1.14", - "com.unity.test-framework.build": "0.0.1-preview.12", - "com.unity.test-framework.utp-reporter": "1.0.2-preview", - "com.unity.testframework.graphics": "7.2.2-preview", - "com.unity.ugui": "1.0.0", - "com.unity.xr.legacyinputhelpers": "2.1.2", - "com.unity.modules.ai": "1.0.0", - "com.unity.modules.androidjni": "1.0.0", - "com.unity.modules.animation": "1.0.0", - "com.unity.modules.assetbundle": "1.0.0", - "com.unity.modules.audio": "1.0.0", - "com.unity.modules.cloth": "1.0.0", - "com.unity.modules.director": "1.0.0", - "com.unity.modules.imageconversion": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.particlesystem": "1.0.0", - "com.unity.modules.physics": "1.0.0", - "com.unity.modules.physics2d": "1.0.0", - "com.unity.modules.screencapture": "1.0.0", - "com.unity.modules.terrain": "1.0.0", - "com.unity.modules.terrainphysics": "1.0.0", - "com.unity.modules.tilemap": "1.0.0", - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.uielements": "1.0.0", - "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", - "com.unity.modules.unitywebrequestassetbundle": "1.0.0", - "com.unity.modules.unitywebrequestaudio": "1.0.0", - "com.unity.modules.unitywebrequesttexture": "1.0.0", - "com.unity.modules.unitywebrequestwww": "1.0.0", - "com.unity.modules.vehicles": "1.0.0", - "com.unity.modules.video": "1.0.0", - "com.unity.modules.vr": "1.0.0", - "com.unity.modules.wind": "1.0.0", - "com.unity.modules.xr": "1.0.0" - }, + "dependencies": { + "com.unity.ext.nunit": "1.0.0", + "com.unity.ide.rider": "1.1.4", + "com.unity.ide.visualstudio": "1.0.11", + "com.unity.ide.vscode": "1.1.3", + "com.unity.xr.legacyinputhelpers": "2.1.2", + "com.unity.render-pipelines.core": "file:../../../com.unity.render-pipelines.core", + "com.unity.render-pipelines.universal": "file:../../../com.unity.render-pipelines.universal", + "com.unity.shadergraph": "file:../../../com.unity.shadergraph", + "com.unity.test-framework": "1.1.14", + "com.unity.test-framework.build": "0.0.1-preview.12", + "com.unity.test-framework.utp-reporter": "1.0.2-preview", + "com.unity.testframework.graphics": "7.2.2-preview", + "com.unity.ugui": "1.0.0", + "com.unity.xr.management": "3.0.5", + "com.unity.xr.mock-hmd": "1.0.1-preview.6", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, "disableProjectUpdate": true, "testables": [ "com.unity.render-pipelines.core", diff --git a/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/EditorBuildSettings.asset b/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/EditorBuildSettings.asset index 1e6dfe34e3b..4368621c4d1 100644 --- a/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,8 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/002_xr_InstancedRendering.unity guid: e2be1657f285b724c8e4fc40a9ab77fd - - enabled: 0 - path: Assets/Scenes/003_xr_OpaqueTexture.unity - guid: a486d8dba66829f49aec5385f9dc2c26 - m_configObjects: {} + m_configObjects: + com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 94eecc09e86374849b3d549d1fe98951, + type: 2} + xr.sdk.mock-hmd.settings: {fileID: 11400000, guid: f5e2543633abe7d47aff7142f331df8f, + type: 2} diff --git a/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/ProjectSettings.asset b/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/ProjectSettings.asset index 3c345318620..05d2d7449e0 100644 --- a/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/ShaderGraphUniversalStereo/ProjectSettings/ProjectSettings.asset @@ -310,7 +310,7 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: - m_BuildTarget: Standalone - m_Enabled: 1 + m_Enabled: 0 m_Devices: - MockHMD openGLRequireES31: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs index b9f19f1bb0d..4a63fd3c543 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs +++ b/TestProjects/UniversalGfxTestStereo/Assets/CommonAssets/Scripts/LWGraphicsTests.cs @@ -6,6 +6,7 @@ using UnityEngine.XR; using UnityEngine.TestTools.Graphics; using UnityEngine.SceneManagement; +using System.IO; public class LWGraphicsTests { @@ -14,9 +15,9 @@ public class LWGraphicsTests [UnityTest, Category("LightWeightRP")] [PrebuildSetup("SetupGraphicsTestCases")] - [UseGraphicsTestCases(lwPackagePath)] - - + [UseGraphicsTestCases(lwPackagePath)] + + public IEnumerator Run(GraphicsTestCase testCase) { SceneManager.LoadScene(testCase.ScenePath); @@ -24,23 +25,126 @@ public IEnumerator Run(GraphicsTestCase testCase) // Always wait one frame for scene load yield return null; - var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x=>x.GetComponent()); + var cameras = GameObject.FindGameObjectsWithTag("MainCamera").Select(x => x.GetComponent()); var settings = Object.FindObjectOfType(); - Assert.IsNotNull(settings, "Invalid test scene, couldn't find LWGraphicsTestSettings"); - - // Stereo screen capture on Mac generates monoscopic images and won't be fixed. - Assume.That((Application.platform != RuntimePlatform.OSXEditor && Application.platform != RuntimePlatform.OSXPlayer), "Stereo tests do not run on MacOSX."); - - XRSettings.gameViewRenderMode = GameViewRenderMode.BothEyes; + Assert.IsNotNull(settings, "Invalid test scene, couldn't find LWGraphicsTestSettings"); + + // Stereo screen capture on Mac generates monoscopic images and won't be fixed. + Assume.That((Application.platform != RuntimePlatform.OSXEditor && Application.platform != RuntimePlatform.OSXPlayer), "Stereo tests do not run on MacOSX."); + + var referenceImage = testCase.ReferenceImage; + // make sure we're rendering in the same size as the reference image, otherwise this is not really comparable. + Screen.SetResolution(referenceImage.width, referenceImage.height, FullScreenMode.Windowed); + + XRSettings.gameViewRenderMode = GameViewRenderMode.BothEyes; yield return null; - - foreach (var camera in cameras) + + foreach (var camera in cameras) camera.stereoTargetEye = StereoTargetEyeMask.Both; + var tempScreenshotFile = Path.ChangeExtension(Path.GetTempFileName(), ".png"); + // clean up previous file if it happens to exist at this point + if (FileAvailable(tempScreenshotFile)) + System.IO.File.Delete(tempScreenshotFile); + for (int i = 0; i < settings.WaitFrames; i++) yield return null; - ImageAssert.AreEqual(testCase.ReferenceImage, cameras.Where(x => x != null), settings.ImageComparisonSettings); + // wait for rendering to complete + yield return new WaitForEndOfFrame(); + + // we'll take a screenshot here, as what we want to compare is the actual result on-screen. + // ScreenCapture.CaptureScreenshotAsTexture --> does not work since colorspace is wrong, would need colorspace change and thus color compression + // ScreenCapture.CaptureScreenshotIntoRenderTexture --> does not work since texture is flipped, would need another pass + // so we need to capture and reload the resulting file. + ScreenCapture.CaptureScreenshot(tempScreenshotFile, ScreenCapture.StereoScreenCaptureMode.BothEyes); + + // NOTE: there's discussions around whether Unity has actually documented this correctly. + // Unity says: next frame MUST have the file ready + // Community says: not true, file write might take longer, so have to explicitly check the file handle before use + // https://forum.unity.com/threads/how-to-wait-for-capturescreen-to-complete.172194/ + yield return null; + while (!FileAvailable(tempScreenshotFile)) + yield return null; + + // load the screenshot back into memory and change to the same format as we want to compare with + var actualImage = new Texture2D(referenceImage.width, referenceImage.height); + actualImage.LoadImage(System.IO.File.ReadAllBytes(tempScreenshotFile)); + + if (actualImage.width != referenceImage.width || actualImage.height != referenceImage.height) + { + Debug.LogWarning("[" + testCase.ScenePath + "] Image size differs (ref: " + referenceImage.width + "x" + referenceImage.height + " vs. actual: " + actualImage.width + "x" + actualImage.height + "). " + (Application.isEditor ? " is your GameView set to a different resolution than the reference images?" : "is your build size different than the reference images?")); + actualImage = ChangeTextureSize(actualImage, referenceImage.width, referenceImage.height); + } + // ref is usually in RGB24 or RGBA32 while actual is in ARGB32, we need to convert formats + if (referenceImage.format != actualImage.format) + { + actualImage = ChangeTextureFormat(actualImage, referenceImage.format); + } + + // delete temporary file + File.Delete(tempScreenshotFile); + + // for testing + // File.WriteAllBytes("reference.png", referenceImage.EncodeToPNG()); + // File.WriteAllBytes("actual.png", actualImage.EncodeToPNG()); + + ImageAssert.AreEqual(referenceImage, actualImage, settings.ImageComparisonSettings); + } + + static bool FileAvailable(string path) + { + if (!File.Exists(path)) + { + return false; + } + + FileInfo file = new System.IO.FileInfo(path); + FileStream stream = null; + + try + { + stream = file.Open(FileMode.Open, FileAccess.Read, FileShare.None); + } + catch (IOException) + { + // Can be either: + // - file is processed by another thread + // - file is still being written to + // - file does not really exist yet + return false; + } + finally + { + if (stream != null) + stream.Close(); + } + + return true; + } + + + static Texture2D ChangeTextureSize(Texture2D source, int newWidth, int newHeight) + { + source.filterMode = FilterMode.Bilinear; + RenderTexture rt = RenderTexture.GetTemporary(newWidth, newHeight); + rt.filterMode = FilterMode.Bilinear; + RenderTexture.active = rt; + Graphics.Blit(source, rt); + var nTex = new Texture2D(newWidth, newHeight, source.format, false); + nTex.ReadPixels(new Rect(0, 0, newWidth, newWidth), 0, 0); + nTex.Apply(); + RenderTexture.active = null; + return nTex; + } + + static Texture2D ChangeTextureFormat(Texture2D texture, TextureFormat newFormat) + { + Texture2D tex = new Texture2D(texture.width, texture.height, newFormat, false); + tex.SetPixels(texture.GetPixels()); + tex.Apply(); + + return tex; } #if UNITY_EDITOR diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/001_xr_Camera_Clip.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/001_xr_Camera_Clip.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/001_xr_Camera_Clip.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/001_xr_Camera_Clip.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/003_xr_LitShaderMaps.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/003_xr_LitShaderMaps.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/003_xr_LitShaderMaps.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/003_xr_LitShaderMaps.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/004_xr_UnlitSprites.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/004_xr_UnlitSprites.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/004_xr_UnlitSprites.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/004_xr_UnlitSprites.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/004_xr_UnlitSprites.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/004_xr_UnlitSprites.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/004_xr_UnlitSprites.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/004_xr_UnlitSprites.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/011_xr_CenterLine.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/011_xr_CenterLine.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/011_xr_CenterLine.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/011_xr_CenterLine.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/013_xr_PostFX_Simple.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/013_xr_PostFX_Simple.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/013_xr_PostFX_Simple.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/013_xr_PostFX_Simple.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/013_xr_PostFX_Simple.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/013_xr_PostFX_Simple.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/013_xr_PostFX_Simple.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/013_xr_PostFX_Simple.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/014_xr_PostFX_Complex_NoAA.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/014_xr_PostFX_Complex_NoAA.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/014_xr_PostFX_Complex_NoAA.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/014_xr_PostFX_Complex_NoAA.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/014_xr_PostFX_Complex_NoAA.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/014_xr_PostFX_Complex_NoAA.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/014_xr_PostFX_Complex_NoAA.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/014_xr_PostFX_Complex_NoAA.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/015_xr_PostFX_FXAA.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/015_xr_PostFX_FXAA.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/015_xr_PostFX_FXAA.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/015_xr_PostFX_FXAA.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/015_xr_PostFX_FXAA.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/015_xr_PostFX_FXAA.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/015_xr_PostFX_FXAA.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/015_xr_PostFX_FXAA.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/016_xr_PostFX_SMAA.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/016_xr_PostFX_SMAA.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/016_xr_PostFX_SMAA.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/016_xr_PostFX_SMAA.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/016_xr_PostFX_SMAA.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/016_xr_PostFX_SMAA.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/016_xr_PostFX_SMAA.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/016_xr_PostFX_SMAA.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/017_xr_Particles_Additive.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/017_xr_Particles_Additive.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/017_xr_Particles_Additive.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/017_xr_Particles_Additive.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/018_xr_Particles_Multiply.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/018_xr_Particles_Multiply.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/018_xr_Particles_Multiply.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/018_xr_Particles_Multiply.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/022_xr_Static_Batching.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/022_xr_Static_Batching.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/022_xr_Static_Batching.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/022_xr_Static_Batching.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/126_SampleDepth.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/126_SampleDepth.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/126_SampleDepth.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/126_SampleDepth.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/126_SampleDepth.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/126_SampleDepth.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/MockHMD/126_SampleDepth.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/Mock HMD Loader/126_SampleDepth.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png new file mode 100644 index 00000000000..a0544a2568f --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3173cb31c416cccaad122036e734cb75f5c80ea14badbdc51240125a05f96859 +size 24998 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_Camera_Clip.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_Camera_Clip.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/001_xr_Camera_Clip.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png new file mode 100644 index 00000000000..352456e4327 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3eebfb3c6cd4648b1da6ee1c5d81d9ff413f5d6ef99b6115b40887193450ca1 +size 202681 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/002_xr_LitShaderLightProbes.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png new file mode 100644 index 00000000000..f4f80304bcb --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e06e421f17854bd406f3f30db369284b23b4a4af7a6f8cd9e1689a2d7e34d09 +size 240693 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_LitShaderMaps.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_LitShaderMaps.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/003_xr_LitShaderMaps.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/004_xr_UnlitSprites.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/004_xr_UnlitSprites.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/004_xr_UnlitSprites.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/004_xr_UnlitSprites.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/004_xr_UnlitSprites.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/004_xr_UnlitSprites.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/004_xr_UnlitSprites.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/004_xr_UnlitSprites.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png new file mode 100644 index 00000000000..afe0f70f28c --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a24cd41d8cbeacdd1d1533da6907f767b37b1a8fb2bcf6691837f4a38015e59b +size 360371 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/005_xr_PBS_EnvironmentBRDF_Spheres.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png new file mode 100644 index 00000000000..c5dcad9414c --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4fe68cf42729aa16bc30fc1c5dc04a4745eed21a42e15fa85aabdcb5cfdc1dc7 +size 90085 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/006_xr_Lighting_Scene_Directional.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png new file mode 100644 index 00000000000..cb5ab9f0a81 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5935e401e50f1e6b86952388659f7fc4b35f59016aeadcb77bd1d6d2d1e1ff7c +size 197085 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/007_xr_Lighting_Scene_DirectionalBaked.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png new file mode 100644 index 00000000000..019c9fd8f73 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dffcf8d9447ec89fe71108e2ce0c7b9bab9f11ee972d3ed24384a2c2fcaaa958 +size 75289 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/009_xr_Lighting_BasicSpot.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png new file mode 100644 index 00000000000..cac95cfac43 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ece5bb3db49a57e0088353dffc3c81b9dbc158a8780735b65c95c045144d3ee +size 246531 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/010_xr_Shader_PBRvalidation_Specular.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png new file mode 100644 index 00000000000..a76849526d3 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0208e5d8446e36aada7b2f7a75c821602727d260c3abb57d6615b15d0a257e0 +size 11242 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/011_xr_CenterLine.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/011_xr_CenterLine.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/011_xr_CenterLine.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/013_xr_PostFX_Simple.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/013_xr_PostFX_Simple.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/013_xr_PostFX_Simple.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/013_xr_PostFX_Simple.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/013_xr_PostFX_Simple.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/013_xr_PostFX_Simple.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/013_xr_PostFX_Simple.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/013_xr_PostFX_Simple.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/014_xr_PostFX_Complex_NoAA.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/014_xr_PostFX_Complex_NoAA.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/014_xr_PostFX_Complex_NoAA.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/014_xr_PostFX_Complex_NoAA.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/014_xr_PostFX_Complex_NoAA.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/014_xr_PostFX_Complex_NoAA.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/014_xr_PostFX_Complex_NoAA.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/014_xr_PostFX_Complex_NoAA.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/015_xr_PostFX_FXAA.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/015_xr_PostFX_FXAA.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/015_xr_PostFX_FXAA.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/015_xr_PostFX_FXAA.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/015_xr_PostFX_FXAA.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/015_xr_PostFX_FXAA.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/015_xr_PostFX_FXAA.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/015_xr_PostFX_FXAA.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/016_xr_PostFX_SMAA.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/016_xr_PostFX_SMAA.png similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/016_xr_PostFX_SMAA.png rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/016_xr_PostFX_SMAA.png diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/016_xr_PostFX_SMAA.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/016_xr_PostFX_SMAA.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/016_xr_PostFX_SMAA.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/016_xr_PostFX_SMAA.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png new file mode 100644 index 00000000000..f81d4736339 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d37aa545091086d5940650d82d4d3c4590f2266735ef436000a0cee79dbd2965 +size 44467 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/017_xr_Particles_Additive.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/017_xr_Particles_Additive.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/017_xr_Particles_Additive.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png new file mode 100644 index 00000000000..cedb13d1655 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26d3ceccf8e7ce7ec2cdcb1bf419ec09d05337be61f325db16d6b6ecccb83e85 +size 189274 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/018_xr_Particles_Multiply.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/018_xr_Particles_Multiply.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/018_xr_Particles_Multiply.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png new file mode 100644 index 00000000000..3acbe06db27 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ab55e805a7585db170c2899cf89df2d93f83095f27da9e4c38e154e474531ac +size 115957 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/019_xr_Particles_AlphaBlend.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png new file mode 100644 index 00000000000..40b17e8c070 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ef9895f581fbebd796552df53d603f25c49fb2938f716663d61c99ae726ec530 +size 55008 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/020_xr_Lighting_ReflectionProbe.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png new file mode 100644 index 00000000000..9a7d5b94d44 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0fb2c21aef9c815969f0650ee8cc1e5b8e65974920d308930db4634b5fa7313 +size 86409 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/021_xr_Realtime_ReflectionProbe.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png new file mode 100644 index 00000000000..f955160a527 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a8d3c65dad891cf14a3cd0728bf81f6ac1cda403e8ef840a651ba135469c354 +size 58521 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/022_xr_Static_Batching.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/022_xr_Static_Batching.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/022_xr_Static_Batching.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/126_SampleDepth.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/126_SampleDepth.png new file mode 100644 index 00000000000..0b6dbdb9c56 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/126_SampleDepth.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1fc8e9690b08c5f396e9077c6fc50e545f7516fde917f9f9e6af3bc972e29af +size 44740 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/126_SampleDepth.png.meta b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/126_SampleDepth.png.meta similarity index 100% rename from TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/126_SampleDepth.png.meta rename to TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/Mock HMD Loader/126_SampleDepth.png.meta diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_Camera_Clip.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_Camera_Clip.png deleted file mode 100644 index 0ce9cc5068c..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/001_xr_Camera_Clip.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bea2044bb6fcb7e46eaea3f72c45ef7be90ee16503ed82d1163ad021ce392333 -size 19757 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png deleted file mode 100644 index 3539974c6e8..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/002_xr_LitShaderLightProbes.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c0bcc38317a89b38e6cd67383aa2a2ac5ee6da95e8efef08b38bf9f84bcb178 -size 198744 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_LitShaderMaps.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_LitShaderMaps.png deleted file mode 100644 index 2728282a297..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/003_xr_LitShaderMaps.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eed7f11e74d495c90a955aa59007fbe1fa81e786097dcbb20c1c5cbe1728a374 -size 155398 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png deleted file mode 100644 index 305570d3d88..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/005_xr_PBS_EnvironmentBRDF_Spheres.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d15c9133e1ee391a5c808ddb217ea16f93a1d64c1a21d47d1e3de33f50c34e23 -size 443318 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png deleted file mode 100644 index 85650b55dda..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/006_xr_Lighting_Scene_Directional.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07ce8d52c2674d5d0d272f13778926ade3af4beaf68808e4c926bde54bfedbbc -size 71775 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png deleted file mode 100644 index 5ae98a7be74..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/007_xr_Lighting_Scene_DirectionalBaked.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6fe0493bc4cbfdf436b86479f3d42a4c531ce68629cd4ac44d0262678f578615 -size 225839 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png deleted file mode 100644 index 5d35c7b278d..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/009_xr_Lighting_BasicSpot.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b3279438ec05168c91942d9941a327b2c6e79315b910f3cb0535033cea95041 -size 82133 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png deleted file mode 100644 index 7a0d1366b37..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/010_xr_Shader_PBRvalidation_Specular.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c09e62dcf59780a51f09db7d2f9e37b4497bd087ba96ea33afff0ff9a8cd872a -size 243070 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/011_xr_CenterLine.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/011_xr_CenterLine.png deleted file mode 100644 index 776c1a63c52..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/011_xr_CenterLine.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2121143f361f6d3745c2b7bdbec693df6276a5a4c58e766711718ff454a63a84 -size 11798 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/017_xr_Particles_Additive.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/017_xr_Particles_Additive.png deleted file mode 100644 index aab35fb7196..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/017_xr_Particles_Additive.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a78a703479cd3a56c8227e2b9abe9f4acf3f3effa43cde624487d35976e1495 -size 29500 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/018_xr_Particles_Multiply.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/018_xr_Particles_Multiply.png deleted file mode 100644 index dcdaf4958d8..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/018_xr_Particles_Multiply.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3167b120e1f2b43fdb8a76dff1ee9c7757b6e886bf37f6897f1c11c644a8781b -size 129512 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png deleted file mode 100644 index 8cd7dc48a71..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/019_xr_Particles_AlphaBlend.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:041ad897ad2e91e6f5fbacd1042acaa8f77637b01274397333bb9b676ad0b9f8 -size 152144 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png deleted file mode 100644 index fba3118af2d..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/020_xr_Lighting_ReflectionProbe.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73b93732245ed9c67a2397eef19513141698d50a6435a29f7bc32ad758667e88 -size 56601 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png deleted file mode 100644 index 17973cb9462..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/021_xr_Realtime_ReflectionProbe.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e6831be9f0461c0880301bd7a5a6368e5cd6997cc7a66b236f81b08492928909 -size 99952 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/022_xr_Static_Batching.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/022_xr_Static_Batching.png deleted file mode 100644 index 6824e095472..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/022_xr_Static_Batching.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72a41b6aed378fbb580c30a9f6a33198fd3da8d974be118a1a1afcc1311a8833 -size 50778 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/126_SampleDepth.png b/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/126_SampleDepth.png deleted file mode 100644 index 3fe563bcda8..00000000000 --- a/TestProjects/UniversalGfxTestStereo/Assets/ReferenceImages/Linear/WindowsPlayer/Direct3D11/MockHMD/126_SampleDepth.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:061e847d73be64399a69a99e152f29408fa4c025ad2e835edf9b331581076099 -size 26537 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip.unity index 68c0b3fc3e0..b245bcfbda1 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/001_xr_Camera_Clip.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -94,10 +94,12 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: ca4478b80bdd6bf4f8789f034f3352ba, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -152,6 +156,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -163,6 +169,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -175,6 +182,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &418390281 MeshFilter: m_ObjectHideFlags: 0 @@ -190,12 +198,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 418390279} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.5, y: 0, z: -6.95} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 1886710564} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &444558257 GameObject: @@ -229,6 +237,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -240,6 +250,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -252,6 +263,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &444558259 MeshFilter: m_ObjectHideFlags: 0 @@ -267,12 +279,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 444558257} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.5, y: 0, z: -6.5499997} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 1886710564} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &952102529 GameObject: @@ -306,6 +318,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -317,6 +331,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -329,6 +344,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &952102531 MeshFilter: m_ObjectHideFlags: 0 @@ -344,12 +360,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952102529} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -8.5} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Father: {fileID: 1886710564} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &971756569 GameObject: @@ -364,6 +380,8 @@ GameObject: - component: {fileID: 971756572} - component: {fileID: 971756571} - component: {fileID: 971756570} + - component: {fileID: 971756573} + - component: {fileID: 971756576} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -380,7 +398,6 @@ MonoBehaviour: m_GameObject: {fileID: 971756569} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -389,6 +406,7 @@ MonoBehaviour: TargetHeight: 360 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!81 &971756571 AudioListener: @@ -406,6 +424,37 @@ Behaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971756569} m_Enabled: 1 +--- !u!114 &971756573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!20 &971756574 Camera: m_ObjectHideFlags: 0 @@ -463,6 +512,24 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &971756576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 --- !u!1 &1161206970 GameObject: m_ObjectHideFlags: 0 @@ -488,8 +555,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1161206970} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.75 m_Range: 10 @@ -504,6 +572,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -511,12 +597,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1161206972 @@ -533,3 +622,36 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 40, y: -45, z: 0} +--- !u!1 &1886710563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1886710564} + m_Layer: 0 + m_Name: Spheres + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1886710564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1886710563} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 9.97} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 952102532} + - {fileID: 418390282} + - {fileID: 444558260} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes.unity index 2b08e6baf41..b9970ee9f27 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/002_xr_LitShaderLightProbes.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -95,11 +95,12 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: 613a9463fe73c445fb318d0495f0605a, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 864365478} --- !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} @@ -168,6 +171,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -179,6 +184,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -191,6 +197,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &98766306 MeshFilter: m_ObjectHideFlags: 0 @@ -245,6 +252,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -256,6 +265,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -268,6 +278,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &224607759 MeshFilter: m_ObjectHideFlags: 0 @@ -322,6 +333,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -333,6 +346,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -345,6 +359,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &228096115 MeshFilter: m_ObjectHideFlags: 0 @@ -399,6 +414,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -410,6 +427,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -422,6 +440,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &406892360 MeshFilter: m_ObjectHideFlags: 0 @@ -476,6 +495,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -487,6 +508,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -499,6 +521,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &415250980 MeshFilter: m_ObjectHideFlags: 0 @@ -553,6 +576,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -564,6 +589,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -576,6 +602,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &445798929 MeshFilter: m_ObjectHideFlags: 0 @@ -625,7 +652,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400000, guid: b56f0b54c8a1042f3ae9a8904a576f5d, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 400000, guid: b56f0b54c8a1042f3ae9a8904a576f5d, type: 3} propertyPath: m_LocalScale.x @@ -691,6 +718,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -702,6 +731,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -714,6 +744,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &648335566 MeshFilter: m_ObjectHideFlags: 0 @@ -768,6 +799,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -779,6 +812,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -791,6 +825,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &657955516 MeshFilter: m_ObjectHideFlags: 0 @@ -845,6 +880,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -856,6 +893,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -868,6 +906,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &688864697 MeshFilter: m_ObjectHideFlags: 0 @@ -876,6 +915,67 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 688864694} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!850595691 &864365478 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Settings.lighting + serializedVersion: 2 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 2 + m_UsingShadowmask: 0 + m_BakeBackend: 1 + m_LightmapMaxSize: 256 + m_BakeResolution: 28 + m_Padding: 2 + m_TextureCompression: 1 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 1 + m_LightmapsBakeMode: 0 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15200, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 1 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 256 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRRussianRouletteStartBounce: 2 + m_PVREnvironmentMIS: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 --- !u!1 &952102529 GameObject: m_ObjectHideFlags: 0 @@ -908,6 +1008,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -919,6 +1021,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -931,6 +1034,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &952102531 MeshFilter: m_ObjectHideFlags: 0 @@ -966,6 +1070,8 @@ GameObject: - component: {fileID: 971756572} - component: {fileID: 971756571} - component: {fileID: 971756570} + - component: {fileID: 971756573} + - component: {fileID: 971756576} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -982,7 +1088,6 @@ MonoBehaviour: m_GameObject: {fileID: 971756569} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -991,6 +1096,7 @@ MonoBehaviour: TargetHeight: 512 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!81 &971756571 AudioListener: @@ -1008,6 +1114,37 @@ Behaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971756569} m_Enabled: 1 +--- !u!114 &971756573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!20 &971756574 Camera: m_ObjectHideFlags: 0 @@ -1058,13 +1195,31 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971756569} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1, z: -1.8} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1983342011} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &971756576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 --- !u!1 &984030965 GameObject: m_ObjectHideFlags: 0 @@ -1111,6 +1266,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1122,6 +1279,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1134,6 +1292,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &984030968 MeshFilter: m_ObjectHideFlags: 0 @@ -1188,6 +1347,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1199,6 +1360,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1211,6 +1373,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1032385992 MeshFilter: m_ObjectHideFlags: 0 @@ -1265,6 +1428,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1276,6 +1441,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1288,6 +1454,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1071677615 MeshFilter: m_ObjectHideFlags: 0 @@ -1342,6 +1509,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1353,6 +1522,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1365,6 +1535,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1090253500 MeshFilter: m_ObjectHideFlags: 0 @@ -1419,6 +1590,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1430,6 +1603,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1442,6 +1616,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1176034415 MeshFilter: m_ObjectHideFlags: 0 @@ -1496,6 +1671,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1507,6 +1684,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1519,6 +1697,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1178234607 MeshFilter: m_ObjectHideFlags: 0 @@ -1573,6 +1752,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1584,6 +1765,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1596,6 +1778,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1193547150 MeshFilter: m_ObjectHideFlags: 0 @@ -1657,7 +1840,7 @@ Transform: - {fileID: 657955514} - {fileID: 1071677613} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1341023563 GameObject: @@ -1705,6 +1888,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1716,6 +1901,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1728,6 +1914,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1341023566 MeshFilter: m_ObjectHideFlags: 0 @@ -1761,8 +1948,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1498576948} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 3 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.5 m_Range: 14.427318 @@ -1777,6 +1965,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1784,12 +1990,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 2.9, y: 2.9} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1498576950 @@ -1804,7 +2013,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} --- !u!1 &1500563947 GameObject: @@ -1852,6 +2061,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1863,6 +2074,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1875,6 +2087,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1500563950 MeshFilter: m_ObjectHideFlags: 0 @@ -1929,6 +2142,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1940,6 +2155,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1952,6 +2168,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1518576412 MeshFilter: m_ObjectHideFlags: 0 @@ -2006,6 +2223,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2017,6 +2236,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2029,6 +2249,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1533891192 MeshFilter: m_ObjectHideFlags: 0 @@ -2083,6 +2304,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2094,6 +2317,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2106,6 +2330,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1566664494 MeshFilter: m_ObjectHideFlags: 0 @@ -2139,8 +2364,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1707585266} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 3 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 0.5 m_Range: 14.427318 @@ -2155,6 +2381,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -2162,12 +2406,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 2.9, y: 2.9} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1707585268 @@ -2182,7 +2429,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &1723821744 GameObject: @@ -2230,6 +2477,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2241,6 +2490,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2253,6 +2503,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1723821747 MeshFilter: m_ObjectHideFlags: 0 @@ -2307,6 +2558,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2318,6 +2571,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2330,6 +2584,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1779788943 MeshFilter: m_ObjectHideFlags: 0 @@ -2425,7 +2680,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1931301372 GameObject: @@ -2473,6 +2728,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2484,6 +2741,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2496,6 +2754,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1931301375 MeshFilter: m_ObjectHideFlags: 0 @@ -2504,3 +2763,34 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1931301372} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1983342010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1983342011} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1983342011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1983342010} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -1.8} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 971756575} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps.unity index 4449758b1b1..7f3bfd99279 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps.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: 112000004, guid: cde702c7d66d1794987fc17a218f7bee, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8d82af0b7eed740459aa2d63f1b4cca0, + 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} @@ -155,6 +158,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -195,12 +199,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 35430816} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.6, y: -1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 5 + m_Father: {fileID: 1449187708} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &167879083 GameObject: @@ -235,6 +239,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -275,12 +280,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 167879083} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.2, y: -0.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 3 + m_Father: {fileID: 1449187708} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &316403771 GameObject: @@ -315,6 +320,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -355,12 +361,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 316403771} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 1449187708} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &442397141 GameObject: @@ -395,6 +401,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -435,12 +442,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 442397141} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.2, y: 0.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 7 + m_Father: {fileID: 1449187708} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &952102529 GameObject: @@ -475,6 +482,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -515,12 +523,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 952102529} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -1.2, y: -0.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Father: {fileID: 1449187708} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &971756569 GameObject: @@ -535,6 +543,8 @@ GameObject: - component: {fileID: 971756572} - component: {fileID: 971756571} - component: {fileID: 971756570} + - component: {fileID: 971756576} + - component: {fileID: 971756573} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -577,6 +587,24 @@ Behaviour: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971756569} m_Enabled: 1 +--- !u!114 &971756573 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 --- !u!20 &971756574 Camera: m_ObjectHideFlags: 0 @@ -634,6 +662,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &971756576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1161206970 GameObject: m_ObjectHideFlags: 0 @@ -726,6 +785,44 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 40, y: -45, z: 0} +--- !u!1 &1449187707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1449187708} + m_Layer: 0 + m_Name: Spheres + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1449187708 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449187707} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 952102532} + - {fileID: 167879086} + - {fileID: 1664660675} + - {fileID: 35430819} + - {fileID: 1511850539} + - {fileID: 442397144} + - {fileID: 1823431994} + - {fileID: 316403774} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1511850536 GameObject: m_ObjectHideFlags: 0 @@ -759,6 +856,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -799,12 +897,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1511850536} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.6, y: -1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 + m_Father: {fileID: 1449187708} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1664660672 GameObject: @@ -839,6 +937,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -879,12 +978,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1664660672} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.6, y: 1.5, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 4 + m_Father: {fileID: 1449187708} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1823431991 GameObject: @@ -919,6 +1018,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -959,10 +1059,10 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1823431991} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 1.2, y: 0.6, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 + m_Father: {fileID: 1449187708} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/LightingData.asset b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/LightingData.asset index ad1c10c70f7..be38d4e2755 100644 Binary files a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/LightingData.asset and b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/003_xr_LitShaderMaps/LightingData.asset differ diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/004_xr_UnlitSprites.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/004_xr_UnlitSprites.unity index d4cd0197ff7..aa70a79e253 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/004_xr_UnlitSprites.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/004_xr_UnlitSprites.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &4 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -94,10 +94,12 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 71171e3c0b55dd540a845c57cc2feebf, + type: 2} --- !u!196 &5 NavMeshSettings: serializedVersion: 2 @@ -117,6 +119,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -165,6 +169,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -176,6 +182,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -230,6 +237,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -241,6 +250,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -323,6 +333,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -334,6 +346,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -388,6 +401,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -399,6 +414,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -481,6 +497,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -492,6 +510,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -546,6 +565,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -557,6 +578,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -639,6 +661,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -650,6 +674,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -718,6 +743,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -729,6 +756,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -783,6 +811,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -794,6 +824,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -862,6 +893,8 @@ SpriteMask: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -873,6 +906,7 @@ SpriteMask: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -907,7 +941,7 @@ Transform: m_LocalScale: {x: 4, y: 4, z: 4} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &428156588 GameObject: @@ -940,6 +974,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -951,6 +987,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1019,6 +1056,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1030,6 +1069,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1112,6 +1152,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1123,6 +1165,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1191,6 +1234,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1202,6 +1247,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1256,6 +1302,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1267,6 +1315,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1349,6 +1398,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1360,6 +1411,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1428,6 +1480,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1439,6 +1493,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1462,6 +1517,37 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 +--- !u!1 &653172508 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 653172509} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &653172509 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 653172508} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -2.31} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1648817169} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &678438520 GameObject: m_ObjectHideFlags: 0 @@ -1493,6 +1579,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1504,6 +1592,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1572,6 +1661,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1583,6 +1674,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1618,7 +1710,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &753597899 GameObject: @@ -1665,6 +1757,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1676,6 +1770,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1744,6 +1839,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1755,6 +1852,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1809,6 +1907,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1820,6 +1920,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1902,6 +2003,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1913,6 +2016,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1967,6 +2071,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1978,6 +2084,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2046,6 +2153,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2057,6 +2166,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2125,6 +2235,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2136,6 +2248,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2204,6 +2317,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2215,6 +2330,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2283,6 +2399,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2294,6 +2412,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2376,6 +2495,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2387,6 +2508,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2466,7 +2588,7 @@ Transform: - {fileID: 1886542089} - {fileID: 171385560} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1204397068 GameObject: @@ -2499,6 +2621,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2510,6 +2634,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2578,6 +2703,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2589,6 +2716,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2657,6 +2785,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2668,6 +2798,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2750,6 +2881,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2761,6 +2894,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2815,6 +2949,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2826,6 +2962,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2894,6 +3031,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2905,6 +3044,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2973,6 +3113,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2984,6 +3126,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3066,6 +3209,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3077,6 +3222,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3149,7 +3295,7 @@ Transform: - {fileID: 819975677} - {fileID: 178661732} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1454607863 GameObject: @@ -3182,6 +3328,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3193,6 +3341,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3261,6 +3410,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3272,6 +3423,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3340,6 +3492,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3351,6 +3505,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3433,6 +3588,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3444,6 +3601,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3512,6 +3670,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3523,6 +3683,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3591,6 +3752,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3602,6 +3765,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3638,6 +3802,8 @@ GameObject: - component: {fileID: 1648817166} - component: {fileID: 1648817165} - component: {fileID: 1648817167} + - component: {fileID: 1648817171} + - component: {fileID: 1648817170} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -3670,7 +3836,6 @@ MonoBehaviour: m_GameObject: {fileID: 1648817164} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -3679,6 +3844,7 @@ MonoBehaviour: TargetHeight: 360 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!20 &1648817168 Camera: @@ -3731,12 +3897,61 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1648817164} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -2.31} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 653172509} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1648817170 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648817164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!114 &1648817171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1648817164} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1662069425 GameObject: m_ObjectHideFlags: 0 @@ -3782,6 +3997,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3793,6 +4010,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3861,6 +4079,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3872,6 +4092,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3926,6 +4147,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3937,6 +4160,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4005,6 +4229,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4016,6 +4242,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4084,6 +4311,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4095,6 +4324,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4130,7 +4360,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1886542087 GameObject: @@ -4163,6 +4393,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4174,6 +4406,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4242,6 +4475,8 @@ SpriteMask: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4253,6 +4488,7 @@ SpriteMask: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4287,7 +4523,7 @@ Transform: m_LocalScale: {x: 6.95, y: 4, z: 4} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!1 &2018068496 GameObject: @@ -4334,6 +4570,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4345,6 +4583,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4399,6 +4638,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4410,6 +4651,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4478,6 +4720,8 @@ SpriteRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4489,6 +4733,7 @@ SpriteRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres.unity index 07a60f1f3b3..77bc1bafd25 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -94,11 +94,13 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: ce4c8be9a39a14477a6a3a3eb7a8d7df, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: b64f699bbe0e7f14d963bd598b027b83, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +172,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -179,6 +185,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -191,6 +198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &252287055 SphereCollider: m_ObjectHideFlags: 0 @@ -259,6 +267,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -270,6 +280,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -282,6 +293,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &322091927 SphereCollider: m_ObjectHideFlags: 0 @@ -327,7 +339,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 550069014} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -2.7} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 769120356} @@ -337,7 +349,7 @@ Transform: - {fileID: 962898989} - {fileID: 851838883} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &769120355 GameObject: @@ -386,6 +398,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -397,6 +411,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -409,6 +424,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &769120358 SphereCollider: m_ObjectHideFlags: 0 @@ -477,6 +493,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -488,6 +506,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -500,6 +519,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &798028156 SphereCollider: m_ObjectHideFlags: 0 @@ -568,6 +588,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -579,6 +601,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -591,6 +614,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &810020709 SphereCollider: m_ObjectHideFlags: 0 @@ -659,6 +683,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -670,6 +696,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -682,6 +709,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &849224292 SphereCollider: m_ObjectHideFlags: 0 @@ -750,6 +778,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -761,6 +791,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -773,6 +804,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &851838885 SphereCollider: m_ObjectHideFlags: 0 @@ -841,6 +873,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -852,6 +886,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -864,6 +899,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &962898991 SphereCollider: m_ObjectHideFlags: 0 @@ -898,6 +934,8 @@ GameObject: - component: {fileID: 1008298674} - component: {fileID: 1008298673} - component: {fileID: 1008298675} + - component: {fileID: 1008298679} + - component: {fileID: 1008298678} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -930,7 +968,6 @@ MonoBehaviour: m_GameObject: {fileID: 1008298672} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -939,6 +976,7 @@ MonoBehaviour: TargetHeight: 360 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!20 &1008298676 Camera: @@ -997,6 +1035,55 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1008298678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008298672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!114 &1008298679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1008298672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1314488577 GameObject: m_ObjectHideFlags: 0 @@ -1044,6 +1131,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1055,6 +1144,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1067,6 +1157,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1314488580 SphereCollider: m_ObjectHideFlags: 0 @@ -1135,6 +1226,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1146,6 +1239,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1158,6 +1252,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &1400747435 SphereCollider: m_ObjectHideFlags: 0 @@ -1179,36 +1274,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1400747432} m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1932601823 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1932601824} - m_Layer: 0 - m_Name: Spheres - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1932601824 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1932601823} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -5.5, y: 0, z: -4} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2099827075 GameObject: m_ObjectHideFlags: 0 @@ -1233,7 +1298,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099827075} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -2.7} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2146338816} @@ -1243,7 +1308,7 @@ Transform: - {fileID: 798028154} - {fileID: 322091925} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2146338815 GameObject: @@ -1292,6 +1357,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1303,6 +1370,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1315,6 +1383,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2146338818 SphereCollider: m_ObjectHideFlags: 0 @@ -1383,6 +1452,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1394,6 +1465,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1406,6 +1478,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2147315254 SphereCollider: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/006_xr_Lighting_Scene_Directional.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/006_xr_Lighting_Scene_Directional.unity index e6491e48327..7345a3f7712 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/006_xr_Lighting_Scene_Directional.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/006_xr_Lighting_Scene_Directional.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -94,11 +94,13 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: 74e316885f585454d987a2267a43e348, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 73840ca7b3c328744b6d8c496b0e2b65, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +172,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -179,6 +185,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -191,6 +198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &26681922 BoxCollider: m_ObjectHideFlags: 0 @@ -225,6 +233,8 @@ GameObject: - component: {fileID: 64132549} - component: {fileID: 64132548} - component: {fileID: 64132550} + - component: {fileID: 64132554} + - component: {fileID: 64132553} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -257,7 +267,6 @@ MonoBehaviour: m_GameObject: {fileID: 64132547} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -266,6 +275,7 @@ MonoBehaviour: TargetHeight: 360 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!20 &64132551 Camera: @@ -317,13 +327,62 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 64132547} - m_LocalRotation: {x: -0.5426103, y: 0.095794484, z: -0.062440075, w: -0.8321651} - m_LocalPosition: {x: 1.45, y: 3.59, z: -1.66} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1594034932} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -2.38, y: 24.98, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &64132553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64132547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!114 &64132554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64132547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &167691301 GameObject: m_ObjectHideFlags: 0 @@ -371,6 +430,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -382,6 +443,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -394,6 +456,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &167691304 CapsuleCollider: m_ObjectHideFlags: 0 @@ -463,6 +526,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -474,6 +539,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -486,6 +552,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &281365731 BoxCollider: m_ObjectHideFlags: 0 @@ -554,6 +621,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -565,6 +634,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -577,6 +647,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &296695530 BoxCollider: m_ObjectHideFlags: 0 @@ -645,6 +716,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -656,6 +729,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -668,6 +742,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &298101722 BoxCollider: m_ObjectHideFlags: 0 @@ -736,6 +811,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -747,6 +824,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -759,6 +837,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &369856835 BoxCollider: m_ObjectHideFlags: 0 @@ -827,6 +906,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -838,6 +919,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -850,6 +932,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &428667561 CapsuleCollider: m_ObjectHideFlags: 0 @@ -919,6 +1002,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -930,6 +1015,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -942,6 +1028,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &452319022 BoxCollider: m_ObjectHideFlags: 0 @@ -1010,6 +1097,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1021,6 +1110,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1033,6 +1123,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &505928751 BoxCollider: m_ObjectHideFlags: 0 @@ -1101,6 +1192,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1112,6 +1205,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1124,6 +1218,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &524424330 BoxCollider: m_ObjectHideFlags: 0 @@ -1192,6 +1287,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1203,6 +1300,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1215,6 +1313,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &568231090 BoxCollider: m_ObjectHideFlags: 0 @@ -1283,6 +1382,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1294,6 +1395,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1306,6 +1408,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &708911050 MeshCollider: m_ObjectHideFlags: 0 @@ -1316,9 +1419,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 &708911051 MeshFilter: @@ -1375,6 +1478,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1386,6 +1491,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1398,6 +1504,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &794026446 BoxCollider: m_ObjectHideFlags: 0 @@ -1466,6 +1573,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1477,6 +1586,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1489,6 +1599,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &800060192 BoxCollider: m_ObjectHideFlags: 0 @@ -1557,6 +1668,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1568,6 +1681,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1580,6 +1694,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &927092476 BoxCollider: m_ObjectHideFlags: 0 @@ -1648,6 +1763,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1659,6 +1776,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1671,6 +1789,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &930364246 CapsuleCollider: m_ObjectHideFlags: 0 @@ -1740,6 +1859,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1751,6 +1872,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1763,6 +1885,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &993488026 BoxCollider: m_ObjectHideFlags: 0 @@ -1809,8 +1932,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1014564735} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 2 m_Range: 10 @@ -1825,6 +1949,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1832,12 +1974,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1014564737 @@ -1852,7 +1997,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 16, y: 51.21, z: 0} --- !u!1 &1133400470 GameObject: @@ -1901,6 +2046,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1912,6 +2059,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1924,6 +2072,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1133400473 BoxCollider: m_ObjectHideFlags: 0 @@ -1992,6 +2141,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2003,6 +2154,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2015,6 +2167,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1139547678 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2084,6 +2237,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2095,6 +2250,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2107,6 +2263,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1147846335 BoxCollider: m_ObjectHideFlags: 0 @@ -2175,6 +2332,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2186,6 +2345,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2198,6 +2358,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1157142476 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2267,6 +2428,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2278,6 +2441,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2290,6 +2454,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1177688384 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2359,6 +2524,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2370,6 +2537,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2382,6 +2550,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1321805572 BoxCollider: m_ObjectHideFlags: 0 @@ -2450,6 +2619,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2461,6 +2632,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2473,6 +2645,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1327624593 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2542,6 +2715,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2553,6 +2728,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2565,6 +2741,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1340567911 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2634,6 +2811,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2645,6 +2824,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2657,6 +2837,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1345549253 BoxCollider: m_ObjectHideFlags: 0 @@ -2725,6 +2906,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2736,6 +2919,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2748,6 +2932,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1359757062 BoxCollider: m_ObjectHideFlags: 0 @@ -2816,6 +3001,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2827,6 +3014,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2839,6 +3027,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1378183167 BoxCollider: m_ObjectHideFlags: 0 @@ -2907,6 +3096,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2918,6 +3109,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2930,6 +3122,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1388229977 BoxCollider: m_ObjectHideFlags: 0 @@ -2998,6 +3191,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3009,6 +3204,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3021,6 +3217,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1389183587 BoxCollider: m_ObjectHideFlags: 0 @@ -3089,6 +3286,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3100,6 +3299,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3112,6 +3312,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1435330148 BoxCollider: m_ObjectHideFlags: 0 @@ -3180,6 +3381,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3191,6 +3394,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3203,6 +3407,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1454960491 BoxCollider: m_ObjectHideFlags: 0 @@ -3271,6 +3476,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3282,6 +3489,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3294,6 +3502,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1527750762 BoxCollider: m_ObjectHideFlags: 0 @@ -3362,6 +3571,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3373,6 +3584,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3385,6 +3597,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1544254619 BoxCollider: m_ObjectHideFlags: 0 @@ -3406,6 +3619,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544254616} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1594034931 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1594034932} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1594034932 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1594034931} + m_LocalRotation: {x: 0.5426085, y: -0.09579734, z: 0.06244291, w: 0.8321657} + m_LocalPosition: {x: 1.45, y: 3.59, z: -1.66} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 64132552} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 66.212, y: -13.137, z: -0.005} --- !u!1 &1597136632 GameObject: m_ObjectHideFlags: 0 @@ -3453,6 +3697,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3464,6 +3710,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3476,6 +3723,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1597136635 BoxCollider: m_ObjectHideFlags: 0 @@ -3544,6 +3792,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3555,6 +3805,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3567,6 +3818,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1654025342 BoxCollider: m_ObjectHideFlags: 0 @@ -3635,6 +3887,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3646,6 +3900,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3658,6 +3913,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1689592831 BoxCollider: m_ObjectHideFlags: 0 @@ -3726,6 +3982,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3737,6 +3995,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3749,6 +4008,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1720948457 BoxCollider: m_ObjectHideFlags: 0 @@ -3817,6 +4077,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3828,6 +4090,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3840,6 +4103,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1738898958 BoxCollider: m_ObjectHideFlags: 0 @@ -3908,6 +4172,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3919,6 +4185,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3931,6 +4198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1749854636 BoxCollider: m_ObjectHideFlags: 0 @@ -4029,7 +4297,7 @@ Transform: - {fileID: 568231088} - {fileID: 369856833} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1836967589 GameObject: @@ -4078,6 +4346,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4089,6 +4359,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4101,6 +4372,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1836967592 BoxCollider: m_ObjectHideFlags: 0 @@ -4169,6 +4441,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4180,6 +4454,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4192,6 +4467,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1880253848 BoxCollider: m_ObjectHideFlags: 0 @@ -4260,6 +4536,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4271,6 +4549,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4283,6 +4562,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1899611855 BoxCollider: m_ObjectHideFlags: 0 @@ -4351,6 +4631,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4362,6 +4644,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4374,6 +4657,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1911185333 BoxCollider: m_ObjectHideFlags: 0 @@ -4442,6 +4726,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4453,6 +4739,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4465,6 +4752,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1939386830 BoxCollider: m_ObjectHideFlags: 0 @@ -4533,6 +4821,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4544,6 +4834,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4556,6 +4847,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1983852698 BoxCollider: m_ObjectHideFlags: 0 @@ -4624,6 +4916,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4635,6 +4929,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4647,6 +4942,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &2006520245 CapsuleCollider: m_ObjectHideFlags: 0 @@ -4716,6 +5012,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4727,6 +5025,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4739,6 +5038,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &2119474652 CapsuleCollider: m_ObjectHideFlags: 0 @@ -4808,6 +5108,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4819,6 +5121,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4831,6 +5134,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &2123234295 BoxCollider: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked.unity index 333114f6566..21d796dc8d3 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -94,11 +94,13 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: b3ff4bc4727d64c4886e4d397960b8d6, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 3b3516c722b4e2346b7677a7de54dbb8, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +172,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -179,6 +185,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -191,6 +198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &26681922 BoxCollider: m_ObjectHideFlags: 0 @@ -225,6 +233,8 @@ GameObject: - component: {fileID: 64132549} - component: {fileID: 64132548} - component: {fileID: 64132550} + - component: {fileID: 64132554} + - component: {fileID: 64132553} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -257,7 +267,6 @@ MonoBehaviour: m_GameObject: {fileID: 64132547} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -266,6 +275,7 @@ MonoBehaviour: TargetHeight: 360 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!20 &64132551 Camera: @@ -317,13 +327,62 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 64132547} - m_LocalRotation: {x: -0.5426103, y: 0.095794484, z: -0.062440075, w: -0.8321651} - m_LocalPosition: {x: 1.45, y: 3.6, z: -1.67} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 563129435} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -2.38, y: 24.98, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &64132553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64132547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!114 &64132554 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 64132547} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &167691301 GameObject: m_ObjectHideFlags: 0 @@ -371,6 +430,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -382,6 +443,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -394,6 +456,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &167691304 CapsuleCollider: m_ObjectHideFlags: 0 @@ -463,6 +526,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -474,6 +539,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -486,6 +552,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &281365731 BoxCollider: m_ObjectHideFlags: 0 @@ -554,6 +621,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -565,6 +634,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -577,6 +647,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &296695530 BoxCollider: m_ObjectHideFlags: 0 @@ -645,6 +716,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -656,6 +729,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -668,6 +742,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &298101722 BoxCollider: m_ObjectHideFlags: 0 @@ -736,6 +811,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -747,6 +824,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -759,6 +837,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &369856835 BoxCollider: m_ObjectHideFlags: 0 @@ -827,6 +906,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -838,6 +919,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -850,6 +932,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &428667561 CapsuleCollider: m_ObjectHideFlags: 0 @@ -919,6 +1002,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -930,6 +1015,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -942,6 +1028,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &452319022 BoxCollider: m_ObjectHideFlags: 0 @@ -1010,6 +1097,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1021,6 +1110,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1033,6 +1123,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &505928751 BoxCollider: m_ObjectHideFlags: 0 @@ -1101,6 +1192,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1112,6 +1205,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1124,6 +1218,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &524424330 BoxCollider: m_ObjectHideFlags: 0 @@ -1145,6 +1240,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 524424327} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &563129434 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 563129435} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &563129435 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 563129434} + m_LocalRotation: {x: 0.541138, y: -0.094940215, z: 0.06165489, w: 0.8332795} + m_LocalPosition: {x: 1.4, y: 3.8, z: -2.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 64132552} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 66, y: -13, z: 0} --- !u!1 &568231087 GameObject: m_ObjectHideFlags: 0 @@ -1192,6 +1318,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1203,6 +1331,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1215,6 +1344,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &568231090 BoxCollider: m_ObjectHideFlags: 0 @@ -1283,6 +1413,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1294,6 +1426,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1306,6 +1439,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &708911050 MeshCollider: m_ObjectHideFlags: 0 @@ -1316,9 +1450,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 &708911051 MeshFilter: @@ -1375,6 +1509,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1386,6 +1522,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1398,6 +1535,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &794026446 BoxCollider: m_ObjectHideFlags: 0 @@ -1466,6 +1604,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1477,6 +1617,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1489,6 +1630,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &800060192 BoxCollider: m_ObjectHideFlags: 0 @@ -1557,6 +1699,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1568,6 +1712,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1580,6 +1725,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &927092476 BoxCollider: m_ObjectHideFlags: 0 @@ -1648,6 +1794,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1659,6 +1807,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1671,6 +1820,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &930364246 CapsuleCollider: m_ObjectHideFlags: 0 @@ -1740,6 +1890,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1751,6 +1903,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1763,6 +1916,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &993488026 BoxCollider: m_ObjectHideFlags: 0 @@ -1809,8 +1963,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1014564735} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 12 m_Range: 10 @@ -1825,6 +1980,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -1832,12 +2005,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 2 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 2 --- !u!4 &1014564737 @@ -1852,7 +2028,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 16, y: 51.21, z: 0} --- !u!1 &1133400470 GameObject: @@ -1901,6 +2077,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1912,6 +2090,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -1924,6 +2103,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1133400473 BoxCollider: m_ObjectHideFlags: 0 @@ -1992,6 +2172,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2003,6 +2185,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2015,6 +2198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1139547678 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2084,6 +2268,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2095,6 +2281,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2107,6 +2294,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1147846335 BoxCollider: m_ObjectHideFlags: 0 @@ -2175,6 +2363,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2186,6 +2376,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2198,6 +2389,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1157142476 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2267,6 +2459,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2278,6 +2472,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2290,6 +2485,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1177688384 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2359,6 +2555,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2370,6 +2568,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2382,6 +2581,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1321805572 BoxCollider: m_ObjectHideFlags: 0 @@ -2450,6 +2650,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2461,6 +2663,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2473,6 +2676,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1327624593 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2542,6 +2746,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2553,6 +2759,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2565,6 +2772,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &1340567911 CapsuleCollider: m_ObjectHideFlags: 0 @@ -2634,6 +2842,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2645,6 +2855,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2657,6 +2868,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1345549253 BoxCollider: m_ObjectHideFlags: 0 @@ -2725,6 +2937,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2736,6 +2950,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2748,6 +2963,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1359757062 BoxCollider: m_ObjectHideFlags: 0 @@ -2816,6 +3032,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2827,6 +3045,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2839,6 +3058,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1378183167 BoxCollider: m_ObjectHideFlags: 0 @@ -2907,6 +3127,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2918,6 +3140,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -2930,6 +3153,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1388229977 BoxCollider: m_ObjectHideFlags: 0 @@ -2998,6 +3222,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3009,6 +3235,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3021,6 +3248,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1389183587 BoxCollider: m_ObjectHideFlags: 0 @@ -3089,6 +3317,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3100,6 +3330,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3112,6 +3343,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1435330148 BoxCollider: m_ObjectHideFlags: 0 @@ -3180,6 +3412,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3191,6 +3425,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3203,6 +3438,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1454960491 BoxCollider: m_ObjectHideFlags: 0 @@ -3271,6 +3507,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3282,6 +3520,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3294,6 +3533,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1527750762 BoxCollider: m_ObjectHideFlags: 0 @@ -3362,6 +3602,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3373,6 +3615,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3385,6 +3628,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1544254619 BoxCollider: m_ObjectHideFlags: 0 @@ -3453,6 +3697,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3464,6 +3710,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3476,6 +3723,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1597136635 BoxCollider: m_ObjectHideFlags: 0 @@ -3544,6 +3792,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3555,6 +3805,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3567,6 +3818,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1654025342 BoxCollider: m_ObjectHideFlags: 0 @@ -3635,6 +3887,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3646,6 +3900,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3658,6 +3913,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1689592831 BoxCollider: m_ObjectHideFlags: 0 @@ -3726,6 +3982,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3737,6 +3995,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3749,6 +4008,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1720948457 BoxCollider: m_ObjectHideFlags: 0 @@ -3817,6 +4077,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3828,6 +4090,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3840,6 +4103,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1738898958 BoxCollider: m_ObjectHideFlags: 0 @@ -3908,6 +4172,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -3919,6 +4185,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -3931,6 +4198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1749854636 BoxCollider: m_ObjectHideFlags: 0 @@ -4029,7 +4297,7 @@ Transform: - {fileID: 568231088} - {fileID: 369856833} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1836967589 GameObject: @@ -4078,6 +4346,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4089,6 +4359,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4101,6 +4372,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1836967592 BoxCollider: m_ObjectHideFlags: 0 @@ -4169,6 +4441,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4180,6 +4454,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4192,6 +4467,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1880253848 BoxCollider: m_ObjectHideFlags: 0 @@ -4260,6 +4536,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4271,6 +4549,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4283,6 +4562,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1899611855 BoxCollider: m_ObjectHideFlags: 0 @@ -4351,6 +4631,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4362,6 +4644,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4374,6 +4657,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1911185333 BoxCollider: m_ObjectHideFlags: 0 @@ -4442,6 +4726,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4453,6 +4739,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4465,6 +4752,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1939386830 BoxCollider: m_ObjectHideFlags: 0 @@ -4533,6 +4821,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4544,6 +4834,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 0.5 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4556,6 +4847,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &1983852698 BoxCollider: m_ObjectHideFlags: 0 @@ -4624,6 +4916,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4635,6 +4929,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4647,6 +4942,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &2006520245 CapsuleCollider: m_ObjectHideFlags: 0 @@ -4716,6 +5012,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4727,6 +5025,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 2 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4739,6 +5038,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!136 &2119474652 CapsuleCollider: m_ObjectHideFlags: 0 @@ -4808,6 +5108,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -4819,6 +5121,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -4831,6 +5134,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!65 &2123234295 BoxCollider: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/008_xr_Lighting_BasicPoint.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/008_xr_Lighting_BasicPoint.unity index 42998876984..b668865881e 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/008_xr_Lighting_BasicPoint.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/008_xr_Lighting_BasicPoint.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -94,11 +94,13 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: 1dcc2e57ed04f431db0930f8b5467829, type: 2} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 935c45c2d36d5b5469af0cd48ced03e8, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -154,6 +158,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &537842493 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 537842494} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &537842494 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 537842493} + m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} + m_LocalPosition: {x: 0, y: 2.66, z: 0.43} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 889296557} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} --- !u!1 &831697935 GameObject: m_ObjectHideFlags: 0 @@ -201,6 +236,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -212,6 +249,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -224,6 +262,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &831697938 SphereCollider: m_ObjectHideFlags: 0 @@ -258,6 +297,8 @@ GameObject: - component: {fileID: 889296554} - component: {fileID: 889296553} - component: {fileID: 889296555} + - component: {fileID: 889296559} + - component: {fileID: 889296558} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -290,7 +331,6 @@ MonoBehaviour: m_GameObject: {fileID: 889296552} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -299,6 +339,7 @@ MonoBehaviour: TargetHeight: 360 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!20 &889296556 Camera: @@ -350,13 +391,62 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 889296552} - m_LocalRotation: {x: 0.17364816, y: 0, z: 0, w: 0.9848078} - m_LocalPosition: {x: 0, y: 2.66, z: 0.43} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 537842494} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &889296558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889296552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!114 &889296559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889296552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1213447629 GameObject: m_ObjectHideFlags: 0 @@ -437,6 +527,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -448,6 +540,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -460,6 +553,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1266012097 MeshCollider: m_ObjectHideFlags: 0 @@ -470,9 +564,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 &1266012098 MeshFilter: @@ -515,6 +609,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -526,6 +622,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -538,6 +635,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1278794866 MeshCollider: m_ObjectHideFlags: 0 @@ -548,9 +646,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 &1278794867 MeshFilter: @@ -621,6 +719,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -632,6 +732,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -644,6 +745,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1513958059 MeshCollider: m_ObjectHideFlags: 0 @@ -654,9 +756,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 &1513958060 MeshFilter: @@ -699,6 +801,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -710,6 +814,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -722,6 +827,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1725603704 MeshCollider: m_ObjectHideFlags: 0 @@ -732,9 +838,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 &1725603705 MeshFilter: @@ -783,8 +889,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2108741017} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 2 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 2 m_Range: 5 @@ -799,6 +906,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -806,12 +931,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &2108741019 @@ -875,6 +1003,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -886,6 +1016,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -898,6 +1029,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2116803505 SphereCollider: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/009_xr_Lighting_BasicSpot.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/009_xr_Lighting_BasicSpot.unity index 3a8f0429a27..dda79c2bcdb 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/009_xr_Lighting_BasicSpot.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/009_xr_Lighting_BasicSpot.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -94,11 +94,13 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: 3c78aee0dc26a49ad8014fc8090bf4a0, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 8ee16a110b3b788488a978a5f868452f, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -168,6 +172,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -179,6 +185,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -191,6 +198,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &831697938 SphereCollider: m_ObjectHideFlags: 0 @@ -225,6 +233,8 @@ GameObject: - component: {fileID: 889296554} - component: {fileID: 889296553} - component: {fileID: 889296555} + - component: {fileID: 889296559} + - component: {fileID: 889296558} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -257,7 +267,6 @@ MonoBehaviour: m_GameObject: {fileID: 889296552} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -266,6 +275,7 @@ MonoBehaviour: TargetHeight: 360 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!20 &889296556 Camera: @@ -317,13 +327,62 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 889296552} - m_LocalRotation: {x: 0.46132845, y: -0, z: -0, w: 0.88722944} - m_LocalPosition: {x: 0, y: 3.95, z: 1.46} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1534702483} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 54.946003, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &889296558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889296552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!114 &889296559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 889296552} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1062213230 GameObject: m_ObjectHideFlags: 0 @@ -349,8 +408,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1062213230} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 0 + m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Intensity: 20 m_Range: 20 @@ -365,6 +425,24 @@ Light: m_Bias: 0.02 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -372,12 +450,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1062213232 @@ -441,6 +522,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -452,6 +535,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -464,6 +548,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1266012097 MeshCollider: m_ObjectHideFlags: 0 @@ -474,9 +559,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 &1266012098 MeshFilter: @@ -519,6 +604,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -530,6 +617,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -542,6 +630,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1278794866 MeshCollider: m_ObjectHideFlags: 0 @@ -552,9 +641,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 &1278794867 MeshFilter: @@ -625,6 +714,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -636,6 +727,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -648,6 +740,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1513958059 MeshCollider: m_ObjectHideFlags: 0 @@ -658,9 +751,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 &1513958060 MeshFilter: @@ -670,6 +763,37 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1513958056} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1534702482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1534702483} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1534702483 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1534702482} + m_LocalRotation: {x: 0.46133056, y: 0, z: 0, w: 0.88722837} + m_LocalPosition: {x: 0, y: 3.95, z: 1.46} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 889296557} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 54.946, y: 0, z: 0} --- !u!1 &1725603702 GameObject: m_ObjectHideFlags: 0 @@ -703,6 +827,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -714,6 +840,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -726,6 +853,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &1725603704 MeshCollider: m_ObjectHideFlags: 0 @@ -736,9 +864,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 &1725603705 MeshFilter: @@ -875,6 +1003,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -886,6 +1016,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -898,6 +1029,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!135 &2116803505 SphereCollider: m_ObjectHideFlags: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/010_xr_Shader_PBRvalidation_Specular.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/010_xr_Shader_PBRvalidation_Specular.unity index 8ee9043eadd..9b36fe2db2e 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/010_xr_Shader_PBRvalidation_Specular.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/010_xr_Shader_PBRvalidation_Specular.unity @@ -43,7 +43,7 @@ RenderSettings: --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -94,11 +94,13 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaDirect: 0.5 m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 112000002, guid: 5453c2be747034b89b85805ee9991704, type: 2} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 5cdc752d58c00354694723bebb9698c1, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +120,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -134,6 +138,8 @@ GameObject: - component: {fileID: 1169043405} - component: {fileID: 1169043404} - component: {fileID: 1169043406} + - component: {fileID: 1169043410} + - component: {fileID: 1169043409} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -166,7 +172,6 @@ MonoBehaviour: m_GameObject: {fileID: 1169043403} m_Enabled: 1 m_EditorHideFlags: 0 - m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 73231aa468d81ea49bc3d914080de185, type: 3} m_Name: m_EditorClassIdentifier: @@ -175,6 +180,7 @@ MonoBehaviour: TargetHeight: 360 PerPixelCorrectnessThreshold: 0.005 AverageCorrectnessThreshold: 0.001 + UseHDR: 0 WaitFrames: 0 --- !u!20 &1169043407 Camera: @@ -226,13 +232,62 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1169043403} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1, y: 0.87, z: -0.85} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 2013896747} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1169043409 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169043403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!114 &1169043410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169043403} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 --- !u!1 &1263726488 GameObject: m_ObjectHideFlags: 0 @@ -265,6 +320,8 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -276,6 +333,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -288,6 +346,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1263726490 MeshFilter: m_ObjectHideFlags: 0 @@ -335,8 +394,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1691998451} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 0.23113108, g: 0.38907954, b: 0.6985294, a: 1} m_Intensity: 2 m_Range: 10 @@ -351,6 +411,24 @@ Light: m_Bias: 0.05 m_NormalBias: 0.4 m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 m_Cookie: {fileID: 0} m_DrawHalo: 0 m_Flare: {fileID: 0} @@ -358,12 +436,15 @@ Light: m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 + m_RenderingLayerMask: 1 m_Lightmapping: 4 m_LightShadowCasterMode: 0 m_AreaSize: {x: 1, y: 1} m_BounceIntensity: 1 m_ColorTemperature: 6570 m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1691998453 @@ -446,3 +527,34 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 71396434e8ff24aa2aed771ad77cec7d, type: 3} +--- !u!1 &2013896746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2013896747} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2013896747 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013896746} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1, y: 0.87, z: -0.85} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1169043408} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/017_xr_Particles_Additive.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/017_xr_Particles_Additive.unity index 5c3f4103bc4..457a6ec5e80 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/017_xr_Particles_Additive.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/017_xr_Particles_Additive.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: 43c6314c85a0b486dbb986c5cb890efb, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 7273e633d78140e4f9fbd023d6235981, + 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 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9744,11 +9748,11 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: ef3b250946b6a4e5c8b49e9e2dc9b830, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9842,6 +9846,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9877,9 +9882,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 &667003648 MeshFilter: @@ -9937,6 +9942,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -9972,9 +9978,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 &941143962 MeshFilter: @@ -9998,6 +10004,37 @@ Transform: m_Father: {fileID: 1934154181} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1168603465 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1168603466} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1168603466 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1168603465} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 3.718, z: 1.64} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1639866362} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1639866357 GameObject: m_ObjectHideFlags: 0 @@ -10105,13 +10142,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639866357} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 3.718, z: 1.64} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1168603466} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1639866363 MonoBehaviour: m_ObjectHideFlags: 0 @@ -10144,7 +10181,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -10156,6 +10192,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/018_xr_Particles_Multiply.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/018_xr_Particles_Multiply.unity index 43b653bb467..fd53cb26b1f 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/018_xr_Particles_Multiply.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/018_xr_Particles_Multiply.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: 112000000, guid: 43c6314c85a0b486dbb986c5cb890efb, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 95ae17c2fd70f10419201247a83a31b5, + 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} @@ -169,6 +172,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -250,11 +254,11 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 5170283df09cc47cfbe2045d6e7d126b, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5028,6 +5032,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1285457701 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1285457702} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1285457702 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285457701} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: -0.29, y: 1.6, z: 1.35} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1639866362} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1295003156 GameObject: m_ObjectHideFlags: 0 @@ -5062,11 +5097,11 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: 2461ac20e11aa4bac94bd17db906f1a2, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -9854,6 +9889,7 @@ GameObject: - component: {fileID: 1639866363} - component: {fileID: 1639866360} - component: {fileID: 1639866364} + - component: {fileID: 1639866359} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -9869,6 +9905,24 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639866357} m_Enabled: 1 +--- !u!114 &1639866359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639866357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 --- !u!114 &1639866360 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9938,13 +9992,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639866357} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: -0.29, y: 1.6, z: 1.35} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1285457702} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1639866363 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9977,7 +10031,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -9989,6 +10042,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/019_xr_Particles_AlphaBlend.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/019_xr_Particles_AlphaBlend.unity index 569933315f6..2080ca80591 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/019_xr_Particles_AlphaBlend.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/019_xr_Particles_AlphaBlend.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: 43c6314c85a0b486dbb986c5cb890efb, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 65994b73565ded345971361eed3a1644, + 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} @@ -151,7 +154,7 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -170,6 +173,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -217,6 +221,37 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!1 &713145872 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 713145873} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &713145873 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 713145872} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 2.39, y: 0.4, z: 0.41} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1639866362} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &1195103815 GameObject: m_ObjectHideFlags: 0 @@ -251,11 +286,11 @@ ParticleSystemRenderer: m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: e59ceddbd3f2846bbb31786ff1c880d9, type: 2} - - {fileID: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -5044,6 +5079,7 @@ GameObject: - component: {fileID: 1639866363} - component: {fileID: 1639866360} - component: {fileID: 1639866364} + - component: {fileID: 1639866365} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -5136,13 +5172,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1639866357} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 2.39, y: 0.4, z: 0.41} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 713145873} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1639866363 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5174,7 +5210,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -5186,6 +5221,25 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 +--- !u!114 &1639866365 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1639866357} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe.unity index 0b6b1225e44..16046361bb0 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe.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: 109f4491c2915489a88b9a0a60d40add, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 0b89c2121edf4c342a8060fe17b19136, + 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} @@ -152,7 +155,7 @@ Transform: m_LocalScale: {x: 2, y: 2, z: 2} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &360074577 MeshRenderer: @@ -169,6 +172,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -216,6 +220,7 @@ GameObject: - component: {fileID: 971756571} - component: {fileID: 971756570} - component: {fileID: 971756573} + - component: {fileID: 971756576} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -274,7 +279,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -286,6 +290,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -339,13 +344,31 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971756569} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -2.74} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1295908847} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &971756576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 --- !u!1 &1160527758 GameObject: m_ObjectHideFlags: 0 @@ -408,7 +431,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1161206970 GameObject: @@ -500,7 +523,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &1207739962 GameObject: @@ -549,6 +572,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -594,8 +618,39 @@ Transform: m_LocalScale: {x: 0.1, y: 10, z: 5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} +--- !u!1 &1295908846 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1295908847} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1295908847 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1295908846} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -3.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 971756575} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1553985753 GameObject: m_ObjectHideFlags: 0 @@ -643,6 +698,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -688,7 +744,7 @@ Transform: m_LocalScale: {x: 0.1, y: 10, z: 5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2115250543 GameObject: @@ -720,7 +776,7 @@ Transform: m_LocalScale: {x: 2, y: 2, z: 2} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &2115250545 MeshRenderer: @@ -737,6 +793,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/LightingData.asset b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/LightingData.asset index e9052c8addf..53f4975bf08 100644 Binary files a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/LightingData.asset and b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/LightingData.asset differ diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/ReflectionProbe-0.exr b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/ReflectionProbe-0.exr index 9b259963118..89534459323 100644 Binary files a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/ReflectionProbe-0.exr and b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/ReflectionProbe-0.exr differ diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/ReflectionProbe-0.exr.meta b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/ReflectionProbe-0.exr.meta index 1a44fd71a64..ca0e1a2ea57 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/ReflectionProbe-0.exr.meta +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/020_xr_Lighting_ReflectionProbe/ReflectionProbe-0.exr.meta @@ -3,7 +3,7 @@ guid: b6d11ce974895499f8e328da445ccb55 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -58,6 +59,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe.unity index 79ea7d38187..05a35a31ece 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe.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: 112000004, guid: 14879fd0358dc4b45ae33993b7166db1, type: 2} - m_UseShadowmask: 0 + m_LightingSettings: {fileID: 4890085278179872738, guid: 05ffe7f13cbda7242b658ab654fb9b14, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -119,9 +120,42 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &260609860 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 260609861} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &260609861 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 260609860} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -2.74} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 971756575} + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &971756569 GameObject: m_ObjectHideFlags: 0 @@ -136,6 +170,7 @@ GameObject: - component: {fileID: 971756571} - component: {fileID: 971756570} - component: {fileID: 971756573} + - component: {fileID: 971756576} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -194,7 +229,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -206,6 +240,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -259,13 +294,31 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 971756569} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -2.74} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 260609861} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &971756576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971756569} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 --- !u!1 &1160527758 GameObject: m_ObjectHideFlags: 0 @@ -328,7 +381,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1161206970 GameObject: @@ -420,7 +473,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 49.172, y: -95.454, z: 0.21200001} --- !u!1 &1295072349 GameObject: @@ -469,6 +522,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -514,7 +568,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1553985753 GameObject: @@ -563,6 +617,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -608,7 +663,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1791333535 GameObject: @@ -640,7 +695,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!23 &1791333537 MeshRenderer: @@ -657,6 +712,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/LightingData.asset b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/LightingData.asset index 0bb72d5b8b8..46f66bea80f 100644 Binary files a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/LightingData.asset and b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/LightingData.asset differ diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-0.exr b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-0.exr index 054a686ffd7..1b5fb9dcb9a 100644 Binary files a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-0.exr and b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-0.exr differ diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-0.exr.meta b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-0.exr.meta index fbbcd0fca3c..9b397ae147c 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-0.exr.meta +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-0.exr.meta @@ -3,7 +3,7 @@ guid: 946123bbeb1275a42b22f19ff6ce05db TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -58,6 +59,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-1.exr.meta b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-1.exr.meta index 2a8ddacbabe..a0c28825beb 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-1.exr.meta +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/021_xr_Realtime_ReflectionProbe/ReflectionProbe-1.exr.meta @@ -3,7 +3,7 @@ guid: 8839981e7a2c10c46a1988d2d113c606 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 10 + serializedVersion: 11 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -23,6 +23,7 @@ TextureImporter: isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 1 @@ -58,6 +59,7 @@ TextureImporter: compressionQualitySet: 0 textureFormatSet: 0 ignorePngGamma: 0 + applyGammaDecoding: 0 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/022_xr_Static_Batching.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/022_xr_Static_Batching.unity index b2a9e1beeb6..81eb5b3af22 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/022_xr_Static_Batching.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/022_xr_Static_Batching.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: 1 + m_LightingSettings: {fileID: 4890085278179872738, guid: 52c8acddc92d1434a90de9f616bc4b33, + 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} @@ -211,8 +214,39 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1 &1263622906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1263622907} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1263622907 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1263622906} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -5.5} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1733217962} + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1600100162 GameObject: m_ObjectHideFlags: 0 @@ -257,7 +291,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1733217959 GameObject: @@ -272,6 +306,7 @@ GameObject: - component: {fileID: 1733217960} - component: {fileID: 1733217963} - component: {fileID: 1733217964} + - component: {fileID: 1733217965} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -337,11 +372,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1733217959} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -5.5} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1263622907} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1733217963 @@ -360,7 +395,6 @@ MonoBehaviour: m_RequiresDepthTextureOption: 2 m_RequiresOpaqueTextureOption: 2 m_CameraType: 0 - m_CameraOutput: 0 m_Cameras: [] m_RendererIndex: -1 m_VolumeLayerMask: @@ -372,6 +406,7 @@ MonoBehaviour: m_AntialiasingQuality: 2 m_StopNaN: 0 m_Dithering: 0 + m_ClearDepth: 1 m_RequiresDepthTexture: 0 m_RequiresColorTexture: 0 m_Version: 2 @@ -394,3 +429,21 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.005 UseHDR: 0 WaitFrames: 5 +--- !u!114 &1733217965 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1733217959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth.unity b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth.unity index a24c9f7ca1a..0bf8d19714b 100644 --- a/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth.unity +++ b/TestProjects/UniversalGfxTestStereo/Assets/Scenes/126_SampleDepth.unity @@ -120,7 +120,7 @@ NavMeshSettings: tileSize: 256 accuratePlacement: 0 maxJobWorkers: 0 - keepTiles: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -217,7 +217,7 @@ Transform: m_LocalScale: {x: 0.55221, y: 0.55221, z: 0.55221} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &963194225 GameObject: @@ -232,6 +232,7 @@ GameObject: - component: {fileID: 963194226} - component: {fileID: 963194229} - component: {fileID: 963194230} + - component: {fileID: 963194231} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -297,11 +298,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} - m_LocalRotation: {x: 0.09924984, y: 0.78285134, z: -0.12939803, w: 0.6004578} - m_LocalPosition: {x: -1.3, y: 0.77313733, z: -11.17} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1050799788} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &963194229 @@ -354,6 +355,55 @@ MonoBehaviour: AverageCorrectnessThreshold: 0.005 UseHDR: 0 WaitFrames: 0 +--- !u!114 &963194231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963194225} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a2a9c34df4095f47b9ca8f975175f5b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Device: 0 + m_PoseSource: 2 + m_PoseProviderComponent: {fileID: 0} + m_TrackingType: 0 + m_UpdateType: 0 + m_UseRelativeTransform: 0 +--- !u!1 &1050799787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1050799788} + m_Layer: 0 + m_Name: CameraTransform + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1050799788 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1050799787} + m_LocalRotation: {x: 0.09924984, y: 0.78285134, z: -0.12939803, w: 0.6004578} + m_LocalPosition: {x: -1.3, y: 0.77313733, z: -11.17} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 963194228} + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1064058074 GameObject: m_ObjectHideFlags: 0 @@ -447,7 +497,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1419008052 GameObject: @@ -542,5 +592,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR.meta b/TestProjects/UniversalGfxTestStereo/Assets/XR.meta new file mode 100644 index 00000000000..4c22e139b4c --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 11e21df0f538f9840a25ba82bcea3f01 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders.meta b/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders.meta new file mode 100644 index 00000000000..cce85ccac12 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d380db8550fd9144e816233d4f9b4584 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders/Mock HMD Loader.asset b/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders/Mock HMD Loader.asset new file mode 100644 index 00000000000..f7b4662c3db --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders/Mock HMD Loader.asset @@ -0,0 +1,14 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0660e8fc444734757ae6f6c40c2d33a0, type: 3} + m_Name: Mock HMD Loader + m_EditorClassIdentifier: diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders/Mock HMD Loader.asset.meta b/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders/Mock HMD Loader.asset.meta new file mode 100644 index 00000000000..ee2d8c4dfc0 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR/Loaders/Mock HMD Loader.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e662e150df113645b22efc8eb96aafd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings.meta b/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings.meta new file mode 100644 index 00000000000..0c951484fd0 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c274293de7902e24c9d82d649fb08f98 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings/Mock HMD Build Settings.asset b/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings/Mock HMD Build Settings.asset new file mode 100644 index 00000000000..0acbf623d4a --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings/Mock HMD Build Settings.asset @@ -0,0 +1,15 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c8bf066bf8a4947a1be502d267edb82f, type: 3} + m_Name: Mock HMD Build Settings + m_EditorClassIdentifier: + renderMode: 1 diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings/Mock HMD Build Settings.asset.meta b/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings/Mock HMD Build Settings.asset.meta new file mode 100644 index 00000000000..22f22553e5c --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR/Settings/Mock HMD Build Settings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d14b5c1cb8ed878458ff67ef9a27ae9a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR/XRGeneralSettings.asset b/TestProjects/UniversalGfxTestStereo/Assets/XR/XRGeneralSettings.asset new file mode 100644 index 00000000000..2294d047b8b --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR/XRGeneralSettings.asset @@ -0,0 +1,48 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7509207170698122913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d236b7d11115f2143951f1e14045df39, type: 3} + m_Name: Standalone Settings + m_EditorClassIdentifier: + m_LoaderManagerInstance: {fileID: 8769950279518285147} + m_InitManagerOnStart: 1 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2dc886499c26824283350fa532d087d, type: 3} + m_Name: XRGeneralSettings + m_EditorClassIdentifier: + Keys: 01000000 + Values: + - {fileID: -7509207170698122913} +--- !u!114 &8769950279518285147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4c3631f5e58749a59194e0cf6baf6d5, type: 3} + m_Name: Standalone Providers + m_EditorClassIdentifier: + m_RequiresSettingsUpdate: 0 + m_AutomaticLoading: 0 + m_AutomaticRunning: 0 + m_Loaders: + - {fileID: 11400000, guid: 6e662e150df113645b22efc8eb96aafd, type: 2} diff --git a/TestProjects/UniversalGfxTestStereo/Assets/XR/XRGeneralSettings.asset.meta b/TestProjects/UniversalGfxTestStereo/Assets/XR/XRGeneralSettings.asset.meta new file mode 100644 index 00000000000..2f1fcc409a4 --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/Assets/XR/XRGeneralSettings.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 82dc1c7729e14374592a84ca219d6b0a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TestProjects/UniversalGfxTestStereo/Packages/manifest.json b/TestProjects/UniversalGfxTestStereo/Packages/manifest.json index 25e8d959a79..f207bca289f 100644 --- a/TestProjects/UniversalGfxTestStereo/Packages/manifest.json +++ b/TestProjects/UniversalGfxTestStereo/Packages/manifest.json @@ -13,6 +13,8 @@ "com.unity.testframework.graphics": "7.2.2-preview", "com.unity.ugui": "1.0.0", "com.unity.xr.legacyinputhelpers": "2.1.2", + "com.unity.xr.mock-hmd": "1.0.1-preview.6", + "com.unity.xr.management": "3.0.5", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/TestProjects/UniversalGfxTestStereo/ProjectSettings/EditorBuildSettings.asset b/TestProjects/UniversalGfxTestStereo/ProjectSettings/EditorBuildSettings.asset index e9e3a206c61..772aadbfc5a 100644 --- a/TestProjects/UniversalGfxTestStereo/ProjectSettings/EditorBuildSettings.asset +++ b/TestProjects/UniversalGfxTestStereo/ProjectSettings/EditorBuildSettings.asset @@ -14,9 +14,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/003_xr_LitShaderMaps.unity guid: e11b892ea1dbc934c9f88172ebd48c4f - - enabled: 1 - path: Assets/Scenes/004_xr_UnlitSprites.unity - guid: b297cee4303f4834b9b1c900996a3edf - enabled: 1 path: Assets/Scenes/005_xr_PBS_EnvironmentBRDF_Spheres.unity guid: e6b6cac1cd594e246834d5cd95fb53fc @@ -26,9 +23,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/007_xr_Lighting_Scene_DirectionalBaked.unity guid: 77e221f332239f943a43c61ecfe67a23 - - enabled: 0 - path: Assets/Scenes/008_xr_Lighting_BasicPoint.unity - guid: 76c689d257cb6184fb8eda097a9b0c52 - enabled: 1 path: Assets/Scenes/009_xr_Lighting_BasicSpot.unity guid: 1c44222c598a7ec47b0baf67e5a7e900 @@ -38,18 +32,6 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/011_xr_CenterLine.unity guid: 4eb297ef901e5c24fa0088510b645913 - - enabled: 0 - path: Assets/Scenes/013_xr_PostFX_Simple.unity - guid: 553df5bb3e439234fb07fc04c0a61198 - - enabled: 0 - path: Assets/Scenes/014_xr_PostFX_Complex_NoAA.unity - guid: 976626cc568ea4e40b8255c49e3d51c3 - - enabled: 0 - path: Assets/Scenes/015_xr_PostFX_FXAA.unity - guid: 87d52919694318342adeb912caaf63a1 - - enabled: 0 - path: Assets/Scenes/016_xr_PostFX_SMAA.unity - guid: d3b0ef4f8a66bc5468349e69cc4d2f9d - enabled: 1 path: Assets/Scenes/017_xr_Particles_Additive.unity guid: 65d99b408a8134214906126ccdea532f @@ -71,4 +53,8 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/126_SampleDepth.unity guid: d66b74ae4e7264d62bdb2c4f56261030 - m_configObjects: {} + m_configObjects: + com.unity.xr.management.loader_settings: {fileID: 11400000, guid: 82dc1c7729e14374592a84ca219d6b0a, + type: 2} + xr.sdk.mock-hmd.settings: {fileID: 11400000, guid: d14b5c1cb8ed878458ff67ef9a27ae9a, + type: 2} diff --git a/TestProjects/UniversalGfxTestStereo/ProjectSettings/ProjectSettings.asset b/TestProjects/UniversalGfxTestStereo/ProjectSettings/ProjectSettings.asset index 461e2041696..f0e0602833f 100644 --- a/TestProjects/UniversalGfxTestStereo/ProjectSettings/ProjectSettings.asset +++ b/TestProjects/UniversalGfxTestStereo/ProjectSettings/ProjectSettings.asset @@ -49,6 +49,8 @@ PlayerSettings: m_StereoRenderingPath: 1 m_ActiveColorSpace: 1 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -103,6 +105,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOneEnableTypeOptimization: 0 xboxOnePresentImmediateThreshold: 0 switchQueueCommandMemory: 0 switchQueueControlMemory: 16384 @@ -110,6 +113,8 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 m_SupportedAspectRatios: @@ -189,22 +194,6 @@ PlayerSettings: uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} - iPhone65inPortraitSplashScreen: {fileID: 0} - iPhone65inLandscapeSplashScreen: {fileID: 0} - iPhone61inPortraitSplashScreen: {fileID: 0} - iPhone61inLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -270,6 +259,9 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 + AndroidMinifyWithR8: 0 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 100 m_BuildTargetIcons: [] @@ -310,9 +302,8 @@ PlayerSettings: m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: - m_BuildTarget: Standalone - m_Enabled: 1 - m_Devices: - - MockHMD + m_Enabled: 0 + m_Devices: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 openGLRequireES32: 0 @@ -332,12 +323,14 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchUseGOLDLinker: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: switchTitleNames_0: @@ -431,6 +424,7 @@ PlayerSettings: switchRatingsInt_9: 0 switchRatingsInt_10: 0 switchRatingsInt_11: 0 + switchRatingsInt_12: 0 switchLocalCommunicationIds_0: switchLocalCommunicationIds_1: switchLocalCommunicationIds_2: @@ -512,6 +506,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 2 ps4Audio3dVirtualSpeakerCount: 14 @@ -547,6 +542,7 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 0 webGLThreadsSupport: 0 webGLDecompressionFallback: 0 @@ -630,6 +626,7 @@ PlayerSettings: XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 XboxOneOverrideIdentityName: + XboxOneOverrideIdentityPublisher: vrEditorSettings: daydream: daydreamIconForeground: {fileID: 0} diff --git a/TestProjects/UniversalGfxTestStereo/ProjectSettings/UnityConnectSettings.asset b/TestProjects/UniversalGfxTestStereo/ProjectSettings/UnityConnectSettings.asset index 23a3d9b71c6..fa0b146579f 100644 --- a/TestProjects/UniversalGfxTestStereo/ProjectSettings/UnityConnectSettings.asset +++ b/TestProjects/UniversalGfxTestStereo/ProjectSettings/UnityConnectSettings.asset @@ -4,7 +4,7 @@ UnityConnectSettings: m_ObjectHideFlags: 0 serializedVersion: 1 - m_Enabled: 1 + m_Enabled: 0 m_TestMode: 0 m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events @@ -21,6 +21,7 @@ UnityConnectSettings: UnityAnalyticsSettings: m_Enabled: 0 m_TestMode: 0 + m_InitializeOnStartup: 1 UnityAdsSettings: m_Enabled: 0 m_InitializeOnStartup: 1 diff --git a/TestProjects/UniversalGfxTestStereo/ProjectSettings/VersionControlSettings.asset b/TestProjects/UniversalGfxTestStereo/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 00000000000..dca288142fc --- /dev/null +++ b/TestProjects/UniversalGfxTestStereo/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/TestProjects/UniversalGfxTestStereo/UserSettings/EditorUserSettings.asset b/TestProjects/UniversalGfxTestStereo/UserSettings/EditorUserSettings.asset index 4681d1d2cf5..c01cab83dc9 100644 --- a/TestProjects/UniversalGfxTestStereo/UserSettings/EditorUserSettings.asset +++ b/TestProjects/UniversalGfxTestStereo/UserSettings/EditorUserSettings.asset @@ -5,6 +5,9 @@ EditorUserSettings: m_ObjectHideFlags: 0 serializedVersion: 4 m_ConfigSettings: + lightmappingDeviceAndPlatform: + value: 53 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0