diff --git a/Assets/Images/Controls/HTC_Controls_Catalog.png b/Assets/Images/Controls/HTC_Controls_Catalog.png index cb4b571..3d46c37 100644 --- a/Assets/Images/Controls/HTC_Controls_Catalog.png +++ b/Assets/Images/Controls/HTC_Controls_Catalog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4bd20f3e8786097ccdbdd70a9d09a061ebbcec9549e6905a9a82e9068c7810a5 -size 318386 +oid sha256:d6dbf0e5e5474271f1fd6ef8479ddbb22378f8cf48ddc9182119f0db364e6bd7 +size 322559 diff --git a/Assets/Images/Controls/HTC_Controls_Catalog.png.meta b/Assets/Images/Controls/HTC_Controls_Catalog.png.meta index 385de02..94614e3 100644 --- a/Assets/Images/Controls/HTC_Controls_Catalog.png.meta +++ b/Assets/Images/Controls/HTC_Controls_Catalog.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 832e255abc5d1d94bad3a345e7f6264e +guid: 9df0243b6fb399244be95a5c72f686da TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Images/Controls/Oculus_Controls_Catalog.png b/Assets/Images/Controls/Oculus_Controls_Catalog.png index a70cc94..9561f95 100644 --- a/Assets/Images/Controls/Oculus_Controls_Catalog.png +++ b/Assets/Images/Controls/Oculus_Controls_Catalog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:66243de858a10a73bf9f89fc1dcfb814eed8a5d938a71384ef170312f129c866 -size 347295 +oid sha256:f5613da3385793736167233f139bbb42252d95af15a4112f58d076f3b2e4e06b +size 351869 diff --git a/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta b/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta index e8cc8ca..b8e9d6a 100644 --- a/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta +++ b/Assets/Images/Controls/Oculus_Controls_Catalog.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f3adb458eb2a4504284313642076de69 +guid: e722dc1453341754dba8e5c24ad17fac TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Scenes/FabLab/FabLab.unity b/Assets/Scenes/FabLab/FabLab.unity index 12beb87..eaa28c6 100644 --- a/Assets/Scenes/FabLab/FabLab.unity +++ b/Assets/Scenes/FabLab/FabLab.unity @@ -2435,7 +2435,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_RootOrder - value: 20 + value: 19 objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_LocalScale.x @@ -5935,21 +5935,21 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 184320054} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: 0.026176924, y: -0, z: -0, w: 0.99965733} + m_LocalPosition: {x: 0, y: 0, z: 196.77962} + m_LocalScale: {x: 14.906314, y: 14.906314, z: 14.906314} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2036324424} - {fileID: 1947605092} + - {fileID: 338421613} m_Father: {fileID: 1989420948} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 9173.794, y: 4724.3096} + m_SizeDelta: {x: 1231, y: 639} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &184320056 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5989,7 +5989,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!223 &184320058 Canvas: m_ObjectHideFlags: 0 @@ -5999,7 +5999,7 @@ Canvas: m_GameObject: {fileID: 184320054} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 0 + m_RenderMode: 2 m_Camera: {fileID: 0} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -6440,7 +6440,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 18 + value: 17 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -6504,7 +6504,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23786 + m_Name: pb_Mesh50010 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -7097,6 +7097,79 @@ Transform: m_Father: {fileID: 45957245} m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &338421612 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 338421613} + - component: {fileID: 338421615} + - component: {fileID: 338421614} + m_Layer: 5 + m_Name: Oculus_Controls + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!224 &338421613 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338421612} + m_LocalRotation: {x: -0.052335896, y: 0, z: 0, w: 0.9986295} + m_LocalPosition: {x: 0, y: 0, z: 3.253} + m_LocalScale: {x: 0.02207732, y: 0.012418493, z: 0.02207732} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 184320055} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: -6, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -615.44, y: -316.6147} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &338421614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338421612} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 2800000, guid: e722dc1453341754dba8e5c24ad17fac, type: 3} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &338421615 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 338421612} + m_CullTransparentMesh: 1 --- !u!1001 &360260901 PrefabInstance: m_ObjectHideFlags: 0 @@ -7381,7 +7454,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_RootOrder - value: 22 + value: 21 objectReference: {fileID: 0} - target: {fileID: 6694482510281237897, guid: f4664e62a3f09ce4894b51aeb60470bd, type: 3} propertyPath: m_LocalScale.x @@ -10638,7 +10711,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24428 + m_Name: pb_Mesh50646 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -10876,7 +10949,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24380 + m_Name: pb_Mesh50598 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -11636,7 +11709,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 21 + value: 20 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -16746,7 +16819,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24514 + m_Name: pb_Mesh50740 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18593,7 +18666,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24020 + m_Name: pb_Mesh50254 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -18757,7 +18830,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23822 + m_Name: pb_Mesh50046 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -19065,7 +19138,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23966 + m_Name: pb_Mesh50200 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -21686,7 +21759,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_RootOrder - value: 23 + value: 22 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: bc2effa48845a644e9d3a70ee743cba2, type: 3} propertyPath: m_LocalScale.x @@ -25961,7 +26034,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -26302,7 +26375,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: d8a039318f27391cdb025c7bd542c092, type: 3} propertyPath: m_LocalPosition.x @@ -28668,7 +28741,7 @@ GameObject: m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 + m_StaticEditorFlags: 2147483647 m_IsActive: 1 --- !u!224 &1947605092 RectTransform: @@ -28677,17 +28750,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1947605091} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.5625, z: 1} + m_LocalRotation: {x: -0.052335896, y: 0, z: 0, w: 0.9986295} + m_LocalPosition: {x: 0, y: 0, z: 3.253} + m_LocalScale: {x: 0.02207732, y: 0.012418493, z: 0.02207732} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 184320055} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -6, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: -615.44, y: -316.6147} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1947605093 @@ -28704,13 +28777,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 832e255abc5d1d94bad3a345e7f6264e, type: 3} + m_Texture: {fileID: 2800000, guid: 9df0243b6fb399244be95a5c72f686da, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -28796,7 +28869,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh23940 + m_Name: pb_Mesh50174 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -29325,6 +29398,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2833408188615038500, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2835658414891243653, guid: ec717aa9a84ac1849bec0aa4f4b89314, type: 3} propertyPath: m_Name value: SmartTv @@ -29479,79 +29556,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 481a02167edfebe44883f5868f8a27f9, type: 3} ---- !u!1 &2036324423 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2036324424} - - component: {fileID: 2036324426} - - component: {fileID: 2036324425} - m_Layer: 5 - m_Name: Oculus_Controls - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2036324424 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036324423} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 0.5625, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 184320055} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2036324425 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036324423} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: f3adb458eb2a4504284313642076de69, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &2036324426 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036324423} - m_CullTransparentMesh: 1 --- !u!1 &2039536872 GameObject: m_ObjectHideFlags: 0 @@ -32840,7 +32844,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh24542 + m_Name: pb_Mesh50776 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2