Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d8a4af4
Moving stereo Universal RP graphics tests from LegacyXR to XRSDK.
DennisDeRykeUnity Jan 14, 2020
208fd8f
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
DennisDeRykeUnity Jan 14, 2020
f0658ba
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
DennisDeRykeUnity Feb 7, 2020
b39e242
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
DennisDeRykeUnity Feb 7, 2020
44c1436
Merge branch 'urp_mockhmd_dennisd' of https://github.com/Unity-Techno…
DennisDeRykeUnity Feb 24, 2020
c9da1bf
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
DennisDeRykeUnity Mar 4, 2020
98dff14
Merge branch 'urp_mockhmd_dennisd' of https://github.com/Unity-Techno…
DennisDeRykeUnity Mar 4, 2020
908a11e
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
DennisDeRykeUnity Mar 20, 2020
7b7a00b
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
DennisDeRykeUnity Mar 23, 2020
bb0cf26
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
DennisDeRykeUnity Apr 2, 2020
653656f
Merge branch 'master' of https://github.com/Unity-Technologies/Script…
DennisDeRykeUnity Apr 2, 2020
34b80e9
Updated ShaderGraphUniversalStereo tests from LegacyXR (aka BuiltIn X…
DennisDeRykeUnity Apr 3, 2020
56a0688
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
DennisDeRykeUnity Apr 14, 2020
42eaec1
Updating UniversalGfxTestStereo from LegacyXR to XRSDK.
DennisDeRykeUnity Apr 15, 2020
287d877
Toggled off LegacyXR in ProjectSettings, updated reference image path…
DennisDeRykeUnity Apr 16, 2020
0d31d59
Merge branch 'master' of https://github.com/Unity-Technologies/Graphi…
DennisDeRykeUnity Apr 21, 2020
ee71b1f
Merge branch 'master' into urp_mockhmd_dennisd
DennisDeRykeUnity Apr 22, 2020
c087ff2
Updating reference images for XRSDK.
DennisDeRykeUnity Apr 23, 2020
0ebfcfe
004_xr_UnlitSprites passes on Trunk but failed on Unity 2020.1 so I a…
DennisDeRykeUnity Apr 27, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RenderSettings:
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 11
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
Expand Down Expand Up @@ -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
Expand All @@ -118,6 +119,8 @@ NavMeshSettings:
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -286,7 +292,6 @@ MonoBehaviour:
m_RequiresDepthTextureOption: 2
m_RequiresOpaqueTextureOption: 2
m_CameraType: 0
m_CameraOutput: 0
m_Cameras: []
m_RendererIndex: -1
m_VolumeLayerMask:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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}
Loading