From fc98d8ae42d6da4970da41238b20b208aebac7d8 Mon Sep 17 00:00:00 2001 From: Angel Lim Date: Fri, 14 Aug 2020 08:57:54 -0700 Subject: [PATCH] Final Commit Summer 2020 --- Assets/Prefabs/WMTS/WMTSBall - MUR SST.prefab | 14 + ...TSBall - VIIRS CorrectedReflectance.prefab | 13 + Assets/Prefabs/WMTS/WMTSPlane.prefab | 15 + Assets/Scenes/icesat-2.unity | 4 +- Assets/Scenes/mrtk.unity | 1241 +++++++++++++---- .../Vertical Profiles/AIRS/AirsRender.cs | 2 +- MSBuildForUnity.Common.props | 4 +- ProjectSettings/EditorBuildSettings.asset | 9 + ProjectSettings/ProjectSettings.asset | 2 +- 9 files changed, 996 insertions(+), 308 deletions(-) diff --git a/Assets/Prefabs/WMTS/WMTSBall - MUR SST.prefab b/Assets/Prefabs/WMTS/WMTSBall - MUR SST.prefab index 6f7f1cc9..c9ebe7d8 100644 --- a/Assets/Prefabs/WMTS/WMTSBall - MUR SST.prefab +++ b/Assets/Prefabs/WMTS/WMTSBall - MUR SST.prefab @@ -18,6 +18,7 @@ GameObject: - component: {fileID: 2410911445152304941} - component: {fileID: 2370013573791862113} - component: {fileID: 2370013573791862046} + - component: {fileID: 1690433617625567694} m_Layer: 8 m_Name: WMTSBall - MUR SST m_TagString: Untagged @@ -183,6 +184,19 @@ Rigidbody: m_Constraints: 0 m_CollisionDetection: 0 --- !u!135 &2370013573791862046 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2370620339487688075} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!135 &1690433617625567694 SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Prefabs/WMTS/WMTSBall - VIIRS CorrectedReflectance.prefab b/Assets/Prefabs/WMTS/WMTSBall - VIIRS CorrectedReflectance.prefab index dc72d689..dfb32317 100644 --- a/Assets/Prefabs/WMTS/WMTSBall - VIIRS CorrectedReflectance.prefab +++ b/Assets/Prefabs/WMTS/WMTSBall - VIIRS CorrectedReflectance.prefab @@ -16,6 +16,19 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!135 &1879644238586978410 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8034128907031867231} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} --- !u!1001 &8033064692087384013 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/WMTS/WMTSPlane.prefab b/Assets/Prefabs/WMTS/WMTSPlane.prefab index ba24f776..a026ebdc 100644 --- a/Assets/Prefabs/WMTS/WMTSPlane.prefab +++ b/Assets/Prefabs/WMTS/WMTSPlane.prefab @@ -5611,6 +5611,7 @@ GameObject: - component: {fileID: 2228875225448288658} - component: {fileID: 641791970361293050} - component: {fileID: 8461938103945633730} + - component: {fileID: 3967420125789132631} m_Layer: 0 m_Name: WMTSPlane m_TagString: Untagged @@ -5666,6 +5667,20 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!64 &3967420125789132631 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8461938103945633784} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Convex: 0 + m_CookingOptions: 14 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &8520839879056564476 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/icesat-2.unity b/Assets/Scenes/icesat-2.unity index 08381af2..fce77880 100644 --- a/Assets/Scenes/icesat-2.unity +++ b/Assets/Scenes/icesat-2.unity @@ -209,7 +209,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: 50, y: -30, z: 0} --- !u!1 &947101869 GameObject: @@ -344,7 +344,7 @@ PrefabInstance: - target: {fileID: 2666767512476531530, guid: 5615ba4645e002e43aa93ece5d5951b2, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 2666767512476531530, guid: 5615ba4645e002e43aa93ece5d5951b2, type: 3} diff --git a/Assets/Scenes/mrtk.unity b/Assets/Scenes/mrtk.unity index 21d16842..3018498f 100644 --- a/Assets/Scenes/mrtk.unity +++ b/Assets/Scenes/mrtk.unity @@ -120,6 +120,92 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &3837725 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3837726} + - component: {fileID: 3837727} + m_Layer: 0 + m_Name: WindowsMixedRealityDeviceManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3837726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3837725} + 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: 2087654175} + m_RootOrder: 25 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3837727 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3837725} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &33643361 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 33643362} + - component: {fileID: 33643363} + m_Layer: 0 + m_Name: MixedRealityInputSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &33643362 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33643361} + 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: 2087654175} + m_RootOrder: 16 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &33643363 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 33643361} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &69293316 GameObject: m_ObjectHideFlags: 0 @@ -249,13 +335,13 @@ MonoBehaviour: m_margin: {x: 0, y: 1.1615484, z: 0.9536365, w: 1.6841211} m_textInfo: textComponent: {fileID: 69293318} - characterCount: 0 + characterCount: 6 spriteCount: 0 spaceCount: 0 - wordCount: 0 + wordCount: 1 linkCount: 0 - lineCount: 0 - pageCount: 0 + lineCount: 1 + pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 @@ -376,7 +462,7 @@ PrefabInstance: - target: {fileID: 3126786010476584173, guid: 4f44c0d070528944c9bff425c6932763, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 3126786010476584173, guid: 4f44c0d070528944c9bff425c6932763, type: 3} @@ -536,7 +622,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 69314034} m_PrefabAsset: {fileID: 0} ---- !u!1 &93057652 +--- !u!1 &141995883 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -544,42 +630,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 93057653} - - component: {fileID: 93057654} + - component: {fileID: 141995884} + - component: {fileID: 141995885} m_Layer: 0 - m_Name: UnityTouchDeviceManager + m_Name: InputPlaybackService m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &93057653 +--- !u!4 &141995884 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93057652} + m_GameObject: {fileID: 141995883} 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: 2087654175} - m_RootOrder: 11 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &93057654 +--- !u!114 &141995885 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 93057652} + m_GameObject: {fileID: 141995883} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &194307459 +--- !u!1 &225023867 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -587,42 +673,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 194307460} - - component: {fileID: 194307461} + - component: {fileID: 225023868} + - component: {fileID: 225023869} m_Layer: 0 - m_Name: MixedRealityCameraSystem + m_Name: MixedRealityDiagnosticsSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &194307460 +--- !u!4 &225023868 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194307459} + m_GameObject: {fileID: 225023867} 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: 2087654175} - m_RootOrder: 6 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &194307461 +--- !u!114 &225023869 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 194307459} + m_GameObject: {fileID: 225023867} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &213593168 +--- !u!1 &254196973 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -630,36 +716,79 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 213593169} - - component: {fileID: 213593170} + - component: {fileID: 254196974} + - component: {fileID: 254196975} m_Layer: 0 - m_Name: MixedRealityInputSystem + m_Name: HandJointService m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &213593169 +--- !u!4 &254196974 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 213593168} + m_GameObject: {fileID: 254196973} 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: 2087654175} - m_RootOrder: 8 + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &254196975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 254196973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &270473519 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 270473520} + - component: {fileID: 270473521} + m_Layer: 0 + m_Name: DefaultRaycastProvider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &270473520 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 270473519} + 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: 2087654175} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &213593170 +--- !u!114 &270473521 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 213593168} + m_GameObject: {fileID: 270473519} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} @@ -1006,7 +1135,7 @@ PrefabInstance: - target: {fileID: 3126786010476584173, guid: 4f44c0d070528944c9bff425c6932763, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3126786010476584173, guid: 4f44c0d070528944c9bff425c6932763, type: 3} @@ -1206,7 +1335,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 325995419} m_PrefabAsset: {fileID: 0} ---- !u!1 &434527803 +--- !u!1 &336690761 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1214,36 +1343,79 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 434527804} - - component: {fileID: 434527805} + - component: {fileID: 336690762} + - component: {fileID: 336690763} m_Layer: 0 - m_Name: UnityJoystickManager + m_Name: InputSimulationService m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &434527804 +--- !u!4 &336690762 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 434527803} + m_GameObject: {fileID: 336690761} 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: 2087654175} - m_RootOrder: 10 + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &336690763 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336690761} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &409808557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 409808558} + - component: {fileID: 409808559} + m_Layer: 0 + m_Name: MixedRealityCameraSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &409808558 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 409808557} + 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: 2087654175} + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &434527805 +--- !u!114 &409808559 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 434527803} + m_GameObject: {fileID: 409808557} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} @@ -1280,7 +1452,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 181cd563a8349c34ea8978b0bc8d9c7e, type: 3} m_Name: m_EditorClassIdentifier: - hostTransform: {fileID: 0} + hostTransform: {fileID: 569434840} manipulationType: 3 twoHandedManipulationType: 7 allowFarManipulation: 1 @@ -1391,7 +1563,7 @@ Transform: type: 3} m_PrefabInstance: {fileID: 755088088} m_PrefabAsset: {fileID: 0} ---- !u!1 &691517827 +--- !u!1 &650738211 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1399,36 +1571,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 691517828} - - component: {fileID: 691517829} + - component: {fileID: 650738212} + - component: {fileID: 650738213} m_Layer: 0 - m_Name: WindowsSpeechInputProvider + m_Name: MixedRealityInputSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &691517828 +--- !u!4 &650738212 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 691517827} + m_GameObject: {fileID: 650738211} 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: 2087654175} - m_RootOrder: 13 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &691517829 +--- !u!114 &650738213 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 691517827} + m_GameObject: {fileID: 650738211} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} @@ -1459,7 +1631,7 @@ PrefabInstance: - target: {fileID: 2666767512476531530, guid: 5615ba4645e002e43aa93ece5d5951b2, type: 3} propertyPath: m_LocalPosition.z - value: 6.5849733 + value: 6.796 objectReference: {fileID: 0} - target: {fileID: 2666767512476531530, guid: 5615ba4645e002e43aa93ece5d5951b2, type: 3} @@ -1521,6 +1693,49 @@ PrefabInstance: - {fileID: 5540556351233475748, guid: 5615ba4645e002e43aa93ece5d5951b2, type: 3} - {fileID: 7665917239661645603, guid: 5615ba4645e002e43aa93ece5d5951b2, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 5615ba4645e002e43aa93ece5d5951b2, type: 3} +--- !u!1 &777185141 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 777185142} + - component: {fileID: 777185143} + m_Layer: 0 + m_Name: InputSimulationService + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &777185142 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777185141} + 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: 2087654175} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &777185143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 777185141} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!4 &818778181 stripped Transform: m_CorrespondingSourceObject: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237, @@ -1539,7 +1754,50 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &915423549 +--- !u!1 &847278708 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 847278709} + - component: {fileID: 847278710} + m_Layer: 0 + m_Name: InputRecordingService + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &847278709 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 847278708} + 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: 2087654175} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &847278710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 847278708} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &871395430 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1547,8 +1805,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 915423550} - - component: {fileID: 915423551} + - component: {fileID: 871395431} + - component: {fileID: 871395432} m_Layer: 0 m_Name: HandJointService m_TagString: Untagged @@ -1556,33 +1814,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &915423550 +--- !u!4 &871395431 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915423549} + m_GameObject: {fileID: 871395430} 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: 2087654175} - m_RootOrder: 2 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &915423551 +--- !u!114 &871395432 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915423549} + m_GameObject: {fileID: 871395430} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &954877905 +--- !u!1 &933854486 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1590,36 +1848,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 954877906} - - component: {fileID: 954877907} + - component: {fileID: 933854487} + - component: {fileID: 933854488} m_Layer: 0 - m_Name: InputPlaybackService + m_Name: FocusProvider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &954877906 +--- !u!4 &933854487 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954877905} + m_GameObject: {fileID: 933854486} 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: 2087654175} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &954877907 +--- !u!114 &933854488 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 954877905} + m_GameObject: {fileID: 933854486} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} @@ -1637,6 +1895,7 @@ GameObject: - component: {fileID: 966775705} - component: {fileID: 966775704} - component: {fileID: 966775703} + - component: {fileID: 966775706} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -1724,7 +1983,30 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!1 &981142921 +--- !u!114 &966775706 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966775701} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bf98dd1206224111a38765365e98e207, type: 3} + m_Name: + m_EditorClassIdentifier: + lockCursorWhenFocusLocked: 1 + setCursorInvisibleWhenFocusLocked: 0 + maxGazeCollisionDistance: 10 + raycastLayerMasks: + - serializedVersion: 2 + m_Bits: 4294967291 + stabilizer: + storedStabilitySamples: 60 + gazeTransform: {fileID: 0} + minHeadVelocityThreshold: 0.5 + maxHeadVelocityThreshold: 2 +--- !u!1 &969067786 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1732,21 +2014,64 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 981142922} + - component: {fileID: 969067787} + - component: {fileID: 969067788} m_Layer: 0 - m_Name: MixedRealityPlayspace + m_Name: WindowsMixedRealityEyeGazeDataProvider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &981142922 +--- !u!4 &969067787 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 981142921} + m_GameObject: {fileID: 969067786} + 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: 2087654175} + m_RootOrder: 26 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &969067788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 969067786} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &981142921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 981142922} + m_Layer: 0 + m_Name: MixedRealityPlayspace + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &981142922 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 981142921} 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} @@ -1755,6 +2080,49 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1046342184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1046342185} + - component: {fileID: 1046342186} + m_Layer: 0 + m_Name: WindowsSpeechInputProvider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1046342185 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046342184} + 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: 2087654175} + m_RootOrder: 29 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1046342186 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046342184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1111882231 GameObject: m_ObjectHideFlags: 0 @@ -1777,7 +2145,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1111882232 Transform: m_ObjectHideFlags: 0 @@ -1969,61 +2337,276 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1111882231} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 984a6c5221e64b247a4f2bab25cdfdcb, type: 3} - m_Name: - m_EditorClassIdentifier: - OnRecordingStarted: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_MethodName: set_material - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 2100000, guid: 635a27f13b7b26b4483bc1283d04803e, - type: 2} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null - OnRecordingStopped: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 0} - m_MethodName: set_material - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 2100000, guid: 38a587e9218b3284485088c9925af61f, - type: 2} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, - Culture=neutral, PublicKeyToken=null ---- !u!114 &1111882239 + m_GameObject: {fileID: 1111882231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 984a6c5221e64b247a4f2bab25cdfdcb, type: 3} + m_Name: + m_EditorClassIdentifier: + OnRecordingStarted: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_MethodName: set_material + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 635a27f13b7b26b4483bc1283d04803e, + type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + OnRecordingStopped: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_MethodName: set_material + m_Mode: 2 + m_Arguments: + m_ObjectArgument: {fileID: 2100000, guid: 38a587e9218b3284485088c9925af61f, + type: 2} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Material, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1111882239 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1111882231} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 210487fc9a02cd049bdd702b7cb8b977, type: 3} + m_Name: + m_EditorClassIdentifier: + isHandMeshVisible: 1 + isHandJointVisible: 1 +--- !u!1 &1128110787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1128110788} + - component: {fileID: 1128110789} + m_Layer: 0 + m_Name: UnityJoystickManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1128110788 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128110787} + 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: 2087654175} + m_RootOrder: 19 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1128110789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1128110787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1151214206 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1151214207} + - component: {fileID: 1151214208} + m_Layer: 0 + m_Name: WindowsDictationInputProvider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1151214207 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151214206} + 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: 2087654175} + m_RootOrder: 23 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1151214208 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1151214206} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1160257964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1160257965} + - component: {fileID: 1160257966} + m_Layer: 0 + m_Name: WindowsDictationInputProvider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1160257965 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1160257964} + 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: 2087654175} + m_RootOrder: 22 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1160257966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1160257964} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1246339022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1246339023} + - component: {fileID: 1246339024} + m_Layer: 0 + m_Name: FocusProvider + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1246339023 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246339022} + 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: 2087654175} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1246339024 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246339022} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1368224622 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1368224623} + - component: {fileID: 1368224624} + m_Layer: 0 + m_Name: MixedRealityDiagnosticsSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1368224623 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1368224622} + 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: 2087654175} + m_RootOrder: 15 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1368224624 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1111882231} + m_GameObject: {fileID: 1368224622} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 210487fc9a02cd049bdd702b7cb8b977, type: 3} + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: - isHandMeshVisible: 1 - isHandJointVisible: 1 ---- !u!1 &1154321785 +--- !u!1 &1376116256 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2031,126 +2614,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1154321786} - - component: {fileID: 1154321787} + - component: {fileID: 1376116257} + - component: {fileID: 1376116258} m_Layer: 0 - m_Name: MixedRealityDiagnosticsSystem + m_Name: InputRecordingService m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1154321786 +--- !u!4 &1376116257 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1154321785} + m_GameObject: {fileID: 1376116256} 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: 2087654175} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1154321787 +--- !u!114 &1376116258 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1154321785} + m_GameObject: {fileID: 1376116256} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1197399234 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8503270333741133355} - m_Modifications: - - target: {fileID: 7307063430618434862, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_Name - value: TimeSlider - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.0378 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.0054122 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.0031693 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalRotation.x - value: 0.18788701 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.98219067 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 21.659 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalScale.x - value: 0.64754075 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalScale.y - value: 0.47703868 - objectReference: {fileID: 0} - - target: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - propertyPath: m_LocalScale.z - value: 0.3777326 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1093263a89abe47499cccf7dcb08effb, type: 3} ---- !u!1 &1360053426 +--- !u!1 &1468866583 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2158,47 +2657,41 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1360053427} - - component: {fileID: 1360053428} + - component: {fileID: 1468866584} + - component: {fileID: 1468866585} m_Layer: 0 - m_Name: InputSimulationService + m_Name: WindowsSpeechInputProvider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1360053427 +--- !u!4 &1468866584 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1360053426} + m_GameObject: {fileID: 1468866583} 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: 2087654175} - m_RootOrder: 5 + m_RootOrder: 28 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1360053428 +--- !u!114 &1468866585 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1360053426} + m_GameObject: {fileID: 1468866583} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!4 &1364417953 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7307063430618434851, guid: 1093263a89abe47499cccf7dcb08effb, - type: 3} - m_PrefabInstance: {fileID: 1197399234} - m_PrefabAsset: {fileID: 0} --- !u!1 &1481613231 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7988634196090784245, guid: 9215a7c858170d74fb2257375d5feaf1, @@ -2341,7 +2834,7 @@ MeshRenderer: type: 3} m_PrefabInstance: {fileID: 5064501109661598706} m_PrefabAsset: {fileID: 0} ---- !u!1 &1635972269 +--- !u!1 &1561394093 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2349,22 +2842,22 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1635972270} - - component: {fileID: 1635972271} + - component: {fileID: 1561394094} + - component: {fileID: 1561394095} m_Layer: 0 - m_Name: WindowsDictationInputProvider + m_Name: MixedRealityCameraSystem m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1635972270 +--- !u!4 &1561394094 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1635972269} + m_GameObject: {fileID: 1561394093} 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} @@ -2372,19 +2865,19 @@ Transform: m_Father: {fileID: 2087654175} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1635972271 +--- !u!114 &1561394095 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1635972269} + m_GameObject: {fileID: 1561394093} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1742449872 +--- !u!1 &1600540208 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2392,42 +2885,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1742449873} - - component: {fileID: 1742449874} + - component: {fileID: 1600540209} + - component: {fileID: 1600540210} m_Layer: 0 - m_Name: InputRecordingService + m_Name: WindowsMixedRealityEyeGazeDataProvider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1742449873 +--- !u!4 &1600540209 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742449872} + m_GameObject: {fileID: 1600540208} 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: 2087654175} - m_RootOrder: 4 + m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1742449874 +--- !u!114 &1600540210 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742449872} + m_GameObject: {fileID: 1600540208} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1918243505 +--- !u!1 &1665879531 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2435,42 +2928,171 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1918243506} - - component: {fileID: 1918243507} + - component: {fileID: 1665879532} + - component: {fileID: 1665879533} m_Layer: 0 - m_Name: FocusProvider + m_Name: UnityTouchDeviceManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1918243506 +--- !u!4 &1665879532 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918243505} + m_GameObject: {fileID: 1665879531} 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: 2087654175} - m_RootOrder: 1 + m_RootOrder: 20 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1665879533 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1665879531} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1686105965 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1686105966} + - component: {fileID: 1686105967} + m_Layer: 0 + m_Name: WindowsMixedRealityDeviceManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1686105966 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686105965} + 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: 2087654175} + m_RootOrder: 24 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1686105967 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1686105965} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1704899677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1704899678} + - component: {fileID: 1704899679} + m_Layer: 0 + m_Name: UnityJoystickManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1704899678 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1704899677} + 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: 2087654175} + m_RootOrder: 18 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1704899679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1704899677} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1867029451 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1867029452} + - component: {fileID: 1867029453} + m_Layer: 0 + m_Name: InputPlaybackService + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1867029452 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1867029451} + 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: 2087654175} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1918243507 +--- !u!114 &1867029453 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1918243505} + m_GameObject: {fileID: 1867029451} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1951686890 +--- !u!1 &2011477465 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2478,8 +3100,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1951686891} - - component: {fileID: 1951686892} + - component: {fileID: 2011477466} + - component: {fileID: 2011477467} m_Layer: 0 m_Name: DefaultRaycastProvider m_TagString: Untagged @@ -2487,33 +3109,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1951686891 +--- !u!4 &2011477466 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1951686890} + m_GameObject: {fileID: 2011477465} 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: 2087654175} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1951686892 +--- !u!114 &2011477467 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1951686890} + m_GameObject: {fileID: 2011477465} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &2007457565 +--- !u!1 &2015021838 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2521,36 +3143,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2007457566} - - component: {fileID: 2007457567} + - component: {fileID: 2015021839} + - component: {fileID: 2015021840} m_Layer: 0 - m_Name: OpenVRDeviceManager + m_Name: UnityTouchDeviceManager m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2007457566 +--- !u!4 &2015021839 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2007457565} + m_GameObject: {fileID: 2015021838} 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: 2087654175} - m_RootOrder: 9 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2007457567 +--- !u!114 &2015021840 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2007457565} + m_GameObject: {fileID: 2015021838} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 09c04dafcb77c1e4195a36bd131cbdec, type: 3} @@ -2597,20 +3219,36 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1951686891} - - {fileID: 1918243506} - - {fileID: 915423550} - - {fileID: 954877906} - - {fileID: 1742449873} - - {fileID: 1360053427} - - {fileID: 194307460} - - {fileID: 1154321786} - - {fileID: 213593169} - - {fileID: 2007457566} - - {fileID: 434527804} - - {fileID: 93057653} - - {fileID: 1635972270} - - {fileID: 691517828} + - {fileID: 270473520} + - {fileID: 2011477466} + - {fileID: 933854487} + - {fileID: 1246339023} + - {fileID: 254196974} + - {fileID: 871395431} + - {fileID: 1867029452} + - {fileID: 141995884} + - {fileID: 847278709} + - {fileID: 1376116257} + - {fileID: 777185142} + - {fileID: 336690762} + - {fileID: 1561394094} + - {fileID: 409808558} + - {fileID: 225023868} + - {fileID: 1368224623} + - {fileID: 33643362} + - {fileID: 650738212} + - {fileID: 1704899678} + - {fileID: 1128110788} + - {fileID: 1665879532} + - {fileID: 2015021839} + - {fileID: 1160257965} + - {fileID: 1151214207} + - {fileID: 1686105966} + - {fileID: 3837726} + - {fileID: 969067787} + - {fileID: 1600540209} + - {fileID: 1468866584} + - {fileID: 1046342185} m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3232,7 +3870,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3097012541444092120} m_LocalRotation: {x: 0.000003144145, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.082, y: 0.025929736, z: -0.003718054} + m_LocalPosition: {x: -0.0413, y: -0.0263, z: -0.0009} m_LocalScale: {x: 0.3576019, y: 0.86840856, z: 0.86840856} m_Children: - {fileID: 3097012540737903522} @@ -3240,7 +3878,7 @@ Transform: - {fileID: 997059590547041362} - {fileID: 1004178547967374670} m_Father: {fileID: 8503270333741133355} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 21.659, y: 0, z: 0} --- !u!23 &3097012539848973426 MeshRenderer: @@ -3980,13 +4618,13 @@ MonoBehaviour: m_margin: {x: 0, y: 1.1615484, z: 0.9536365, w: 1.6841211} m_textInfo: textComponent: {fileID: 5057653356107903709} - characterCount: 0 + characterCount: 28 spriteCount: 0 - spaceCount: 0 - wordCount: 0 + spaceCount: 5 + wordCount: 6 linkCount: 0 - lineCount: 0 - pageCount: 0 + lineCount: 1 + pageCount: 1 materialCount: 1 m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 @@ -4023,12 +4661,12 @@ PrefabInstance: - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.0065 objectReference: {fileID: 0} - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1, type: 3} propertyPath: m_LocalPosition.z - value: 0.008 + value: 0.0054 objectReference: {fileID: 0} - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1, type: 3} @@ -4078,7 +4716,7 @@ PrefabInstance: - target: {fileID: 586303850521236049, guid: 9215a7c858170d74fb2257375d5feaf1, type: 3} propertyPath: m_LocalScale.y - value: 1 + value: 0.79231 objectReference: {fileID: 0} - target: {fileID: 3958481853798167113, guid: 9215a7c858170d74fb2257375d5feaf1, type: 3} @@ -4173,7 +4811,7 @@ MonoBehaviour: states: {fileID: 11400000, guid: e51893c8eb7938e4ba43985af43c0f72, type: 2} InputActionId: 0 isGlobal: 0 - Dimensions: 1 + Dimensions: 2 dimensionIndex: 0 startDimensionIndex: 0 CanSelect: 0 @@ -4597,17 +5235,17 @@ PrefabInstance: - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237, type: 3} propertyPath: m_LocalPosition.x - value: 0.1063 + value: 0.1161 objectReference: {fileID: 0} - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237, type: 3} propertyPath: m_LocalPosition.y - value: -0.0415 + value: -0.0267 objectReference: {fileID: 0} - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237, type: 3} propertyPath: m_LocalPosition.z - value: -0.0066 + value: -0.0034 objectReference: {fileID: 0} - target: {fileID: 6742094790733259646, guid: 64790b91b91094d49942373c4e83c237, type: 3} @@ -4811,7 +5449,7 @@ PrefabInstance: - target: {fileID: 4238929520169732924, guid: 64790b91b91094d49942373c4e83c237, type: 3} propertyPath: startDimensionIndex - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2521141002669455045, guid: 64790b91b91094d49942373c4e83c237, type: 3} @@ -4926,7 +5564,6 @@ Transform: - {fileID: 2088983248} - {fileID: 13635056107875497} - {fileID: 818778181} - - {fileID: 1364417953} - {fileID: 325995420} - {fileID: 69314035} - {fileID: 3097012539817227833} diff --git a/Assets/Scripts/Vertical Profiles/AIRS/AirsRender.cs b/Assets/Scripts/Vertical Profiles/AIRS/AirsRender.cs index a3e48746..cff45bed 100644 --- a/Assets/Scripts/Vertical Profiles/AIRS/AirsRender.cs +++ b/Assets/Scripts/Vertical Profiles/AIRS/AirsRender.cs @@ -26,7 +26,7 @@ void Awake() float sphereRadius = GetComponent().radius; float actualRadius = 3948.8F; - float elevationScale = .05F; + float elevationScale = .20F; ColorPoints(airsRenderer, colorValue); Vector3 airsCords = Coordinates.LatLongToXYZ(airsData.x[i], airsData.y[i], airsData.z[i], actualRadius, sphereRadius, elevationScale); diff --git a/MSBuildForUnity.Common.props b/MSBuildForUnity.Common.props index 6f6ead91..d3730a52 100644 --- a/MSBuildForUnity.Common.props +++ b/MSBuildForUnity.Common.props @@ -18,8 +18,8 @@ $(UnityProjectAssetsPath)\Dependencies - WindowsStandalone64 - netstandard2.0 + WSA + net46 2019 2 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 07df714c..3220a933 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -17,4 +17,13 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/wmts.unity guid: 06eb59daf9b258648947e4f48ac8c8fc + - enabled: 1 + path: Assets/Scenes/airs.unity + guid: 1a1e52b4bb65b8e4890fdefb613c5c37 + - enabled: 1 + path: Assets/Scenes/calipso.unity + guid: ce4b3beb5f7ccae4988578ad227ad5af + - enabled: 1 + path: Assets/Scenes/icesat-2.unity + guid: 8102caadc15873946afceb5ab3952fe3 m_configObjects: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8ecf99fe..149f25cf 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -120,7 +120,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0 + bundleVersion: 2.0 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0