From 99ebbe7f32d531bde2ff3880fdf609c479f82553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 14:06:15 +0100 Subject: [PATCH 01/11] Fix XRTK.Editor.Rendering namespace --- .../Editor/Utilities/Rendering/ClippingBoxInspector.cs | 2 +- .../Editor/Utilities/Rendering/ClippingPlaneInspector.cs | 2 +- .../Editor/Utilities/Rendering/ClippingSphereInspector.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingBoxInspector.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingBoxInspector.cs index f878a4d5b..059bb15ab 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingBoxInspector.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingBoxInspector.cs @@ -5,7 +5,7 @@ using UnityEngine; using XRTK.Utilities.Rendering; -namespace XRTK.Editor +namespace XRTK.Editor.Rendering { [CustomEditor(typeof(ClippingBox))] public class ClippingBoxEditor : UnityEditor.Editor diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingPlaneInspector.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingPlaneInspector.cs index e8e64a95d..f24f1d342 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingPlaneInspector.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingPlaneInspector.cs @@ -5,7 +5,7 @@ using UnityEngine; using XRTK.Utilities.Rendering; -namespace XRTK.Editor +namespace XRTK.Editor.Rendering { [CustomEditor(typeof(ClippingPlane))] public class ClippingPlaneEditor : UnityEditor.Editor diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingSphereInspector.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingSphereInspector.cs index 377353cf9..f823eaaa1 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingSphereInspector.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/Rendering/ClippingSphereInspector.cs @@ -5,7 +5,7 @@ using UnityEngine; using XRTK.Utilities.Rendering; -namespace XRTK.Editor +namespace XRTK.Editor.Rendering { [CustomEditor(typeof(ClippingSphere))] public class ClippingSphereEditor : UnityEditor.Editor From 472b354528814cd51b6faa2c7ce7c29bb0727825 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 14:06:41 +0100 Subject: [PATCH 02/11] Move USB utilities to editor assembly --- .../com.xrtk.core/Editor/Utilities/USB.meta | 10 +++++ .../Editor/Utilities/USB/USBDeviceInfo.cs | 30 ++++++++++++++ .../Utilities/USB/USBDeviceInfo.cs.meta | 11 +++++ .../Editor/Utilities/USB/USBDeviceListener.cs | 40 +++++++++++++++++++ .../Utilities/USB/USBDeviceListener.cs.meta | 11 +++++ 5 files changed, 102 insertions(+) create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB.meta create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceInfo.cs create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceInfo.cs.meta create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceListener.cs create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceListener.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB.meta new file mode 100644 index 000000000..c835cb7b6 --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a20ad0205f5066441981c29f990ddb2b +folderAsset: yes +timeCreated: 1512167852 +licenseType: Pro +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceInfo.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceInfo.cs new file mode 100644 index 000000000..10d4248aa --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceInfo.cs @@ -0,0 +1,30 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System; + +namespace XRTK.Editor.Utilities.USB +{ + [Serializable] + public class USBDeviceInfo + { + public USBDeviceInfo(int vendorId, string udid, int productId, string name, int revision) + { + VendorId = vendorId; + Udid = udid; + ProductId = productId; + Name = name; + Revision = revision; + } + + public int VendorId { get; private set; } + + public string Udid { get; private set; } + + public int ProductId { get; private set; } + + public string Name { get; private set; } + + public int Revision { get; private set; } + } +} \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceInfo.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceInfo.cs.meta new file mode 100644 index 000000000..6d8a4b756 --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceInfo.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 24d9956f452444098b553cb1ec5e56a0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceListener.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceListener.cs new file mode 100644 index 000000000..ce1f58e5d --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceListener.cs @@ -0,0 +1,40 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System.Collections.Generic; +using UnityEditor; +using UnityEditor.Hardware; + +namespace XRTK.Editor.Utilities.USB +{ + [InitializeOnLoad] + public class USBDeviceListener + { + public static USBDeviceInfo[] USBDevices; + + public delegate void OnUsbDevicesChanged(UsbDevice[] usbDevices); + + public static event OnUsbDevicesChanged UsbDevicesChanged; + + private static readonly List USBDevicesList = new List(0); + + static USBDeviceListener() + { + UnityEditor.Hardware.Usb.DevicesChanged += NotifyUsbDevicesChanged; + } + + private static void NotifyUsbDevicesChanged(UsbDevice[] devices) + { + UsbDevicesChanged?.Invoke(devices); + + USBDevicesList.Clear(); + + foreach (UsbDevice device in devices) + { + USBDevicesList.Add(new USBDeviceInfo(device.vendorId, device.udid, device.productId, device.name, device.revision)); + } + + USBDevices = USBDevicesList.ToArray(); + } + } +} \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceListener.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceListener.cs.meta new file mode 100644 index 000000000..bbce71cf8 --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/USB/USBDeviceListener.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8015cc9cfc3242bd9c60bc1e83e29332 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: From 7d681669922a92a84c3231cc473256af218c0ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 14:07:13 +0100 Subject: [PATCH 03/11] Remove USB utilities from Runtime assembly hierarchy --- .../Runtime/Utilities/Editor/USB.meta | 10 ----- .../Utilities/Editor/USB/USBDeviceInfo.cs | 30 -------------- .../Editor/USB/USBDeviceInfo.cs.meta | 11 ----- .../Utilities/Editor/USB/USBDeviceListener.cs | 40 ------------------- .../Editor/USB/USBDeviceListener.cs.meta | 11 ----- 5 files changed, 102 deletions(-) delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB.meta delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceInfo.cs delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceInfo.cs.meta delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceListener.cs delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceListener.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB.meta b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB.meta deleted file mode 100644 index 4e52e3911..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB.meta +++ /dev/null @@ -1,10 +0,0 @@ -fileFormatVersion: 2 -guid: 3895a4876c5a4017b461747c20f4ab51 -folderAsset: yes -timeCreated: 1512167852 -licenseType: Pro -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceInfo.cs b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceInfo.cs deleted file mode 100644 index b974d4a24..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceInfo.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using System; - -namespace XRTK.Utilities.Editor.Usb -{ - [Serializable] - public class USBDeviceInfo - { - public USBDeviceInfo(int vendorId, string udid, int productId, string name, int revision) - { - VendorId = vendorId; - Udid = udid; - ProductId = productId; - Name = name; - Revision = revision; - } - - public int VendorId { get; private set; } - - public string Udid { get; private set; } - - public int ProductId { get; private set; } - - public string Name { get; private set; } - - public int Revision { get; private set; } - } -} \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceInfo.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceInfo.cs.meta deleted file mode 100644 index 6d8a4b756..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceInfo.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 24d9956f452444098b553cb1ec5e56a0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceListener.cs b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceListener.cs deleted file mode 100644 index 40cfd6618..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceListener.cs +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See LICENSE in the project root for license information. - -using System.Collections.Generic; -using UnityEditor; -using UnityEditor.Hardware; - -namespace XRTK.Utilities.Editor.Usb -{ - [InitializeOnLoad] - public class USBDeviceListener - { - public static USBDeviceInfo[] USBDevices; - - public delegate void OnUsbDevicesChanged(UsbDevice[] usbDevices); - - public static event OnUsbDevicesChanged UsbDevicesChanged; - - private static readonly List USBDevicesList = new List(0); - - static USBDeviceListener() - { - UnityEditor.Hardware.Usb.DevicesChanged += NotifyUsbDevicesChanged; - } - - private static void NotifyUsbDevicesChanged(UsbDevice[] devices) - { - UsbDevicesChanged?.Invoke(devices); - - USBDevicesList.Clear(); - - foreach (UsbDevice device in devices) - { - USBDevicesList.Add(new USBDeviceInfo(device.vendorId, device.udid, device.productId, device.name, device.revision)); - } - - USBDevices = USBDevicesList.ToArray(); - } - } -} \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceListener.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceListener.cs.meta deleted file mode 100644 index bbce71cf8..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/USB/USBDeviceListener.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8015cc9cfc3242bd9c60bc1e83e29332 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} - userData: - assetBundleName: - assetBundleVariant: From 207dff0395f456396b81361d424510746c2bf996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 14:09:28 +0100 Subject: [PATCH 04/11] Remove editor utilities from Runtime assembly and move to editor assembly --- .../Editor/Utilities/ChannelPackerWindow.cs | 2 +- .../Utilities/ControllerMappingUtilities.cs | 161 ++++++++++++++++++ .../ControllerMappingUtilities.cs.meta | 11 ++ .../Utilities}/CorePathFinder.cs | 2 +- .../Utilities}/CorePathFinder.cs.meta | 0 .../Utilities}/EditorAssemblyReloadManager.cs | 2 +- .../EditorAssemblyReloadManager.cs.meta | 0 .../Utilities}/EditorPreferences.cs | 2 +- .../Utilities}/EditorPreferences.cs.meta | 0 .../Editor/Utilities/HoverLightInspector.cs | 2 +- .../Editor => Editor/Utilities}/IconEditor.cs | 2 +- .../Utilities}/IconEditor.cs.meta | 0 .../Utilities}/InputManagerAxis.cs | 2 +- .../Utilities}/InputManagerAxis.cs.meta | 0 .../Utilities}/InputManagerAxisType.cs | 2 +- .../Utilities}/InputManagerAxisType.cs.meta | 0 .../Utilities}/InputMappingAxisUtility.cs | 2 +- .../InputMappingAxisUtility.cs.meta | 0 .../Utilities}/MixedRealityEditorSettings.cs | 2 +- .../MixedRealityEditorSettings.cs.meta | 0 .../Utilities}/PathFinderUtility.cs | 2 +- .../Utilities}/PathFinderUtility.cs.meta | 0 .../Utilities}/SceneHelpers.cs | 2 +- .../Utilities}/SceneHelpers.cs.meta | 0 .../Runtime/Utilities/Editor.meta | 8 - .../Editor/XRTK.Utilities.Editor.asmdef | 15 -- .../Editor/XRTK.Utilities.Editor.asmdef.meta | 7 - 27 files changed, 184 insertions(+), 42 deletions(-) create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ControllerMappingUtilities.cs create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ControllerMappingUtilities.cs.meta rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/CorePathFinder.cs (94%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/CorePathFinder.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/EditorAssemblyReloadManager.cs (98%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/EditorAssemblyReloadManager.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/EditorPreferences.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/EditorPreferences.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/IconEditor.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/IconEditor.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/InputManagerAxis.cs (96%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/InputManagerAxis.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/InputManagerAxisType.cs (92%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/InputManagerAxisType.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/InputMappingAxisUtility.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/InputMappingAxisUtility.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/MixedRealityEditorSettings.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/MixedRealityEditorSettings.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/PathFinderUtility.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/PathFinderUtility.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/SceneHelpers.cs (96%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities/Editor => Editor/Utilities}/SceneHelpers.cs.meta (100%) delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor.meta delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/XRTK.Utilities.Editor.asmdef delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/XRTK.Utilities.Editor.asmdef.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ChannelPackerWindow.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ChannelPackerWindow.cs index 4e60c4891..5bf37da4d 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ChannelPackerWindow.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ChannelPackerWindow.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEngine; -namespace XRTK.Editor +namespace XRTK.Editor.Utilities { public class ChannelPackerWindow : EditorWindow { diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ControllerMappingUtilities.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ControllerMappingUtilities.cs new file mode 100644 index 000000000..83979f5ca --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ControllerMappingUtilities.cs @@ -0,0 +1,161 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using System; +using System.Collections.Generic; +using UnityEditor; +using UnityEngine; +using XRTK.Definitions.Controllers; +using XRTK.Definitions.Devices; +using XRTK.Definitions.Utilities; + +namespace XRTK.Editor.Utilities +{ + /// + /// Helper utility for managing controller mappings in the editor. + /// + public static class ControllerMappingUtilities + { + #region InputAxisConfig + + // Default value for the dead zone. This should match the default used by Unity for the pre-created Horizontal and Vertical axes. + private const float DEFAULT_DEAD_ZONE = 0.19f; + + /// + /// Get the InputManagerAxis data needed to configure the Input Mappings for a controller + /// + /// + public static InputManagerAxis[] UnityInputManagerAxes => new[] + { + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_1, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 1 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_2, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 2 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_3, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 3 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_4, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 4 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_5, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 5 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_6, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 6 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_7, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 7 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_8, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 8 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_9, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 9 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_10, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 10 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_11, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 11 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_12, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 12 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_13, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 13 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_14, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 14 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_15, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 15 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_16, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 16 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_17, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 17 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_18, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 18 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_19, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 19 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_20, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 20 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_21, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 21 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_22, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 22 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_23, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 23 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_24, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 24 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_25, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 25 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_26, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 26 }, + new InputManagerAxis { Name = ControllerMappingLibrary.AXIS_27, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 27 } + }; + + #endregion InputAxisConfig + + #region Controller Texture Loading + + private static readonly Dictionary, Texture2D> CachedTextures = new Dictionary, Texture2D>(); + + /// + /// Gets a texture based on the . + /// + /// + /// The texture for the controller profile, if none found then a generic texture is returned. + /// + /// The file name should be formatted as:XRTK/StandardAssets/Textures/{ControllerTypeName}_{handedness}_{theme}_{scaled}.png + /// scaled suffix is optional. + /// + public static Texture2D GetControllerTexture(MixedRealityControllerMappingProfile mappingProfile) + { + return GetControllerTextureCached(mappingProfile); + } + + /// + /// Gets a texture based on the . + /// + /// + /// The scaled texture for the controller profile, if none found then a generic texture is returned. + /// + /// The file name should be formatted as:XRTK/StandardAssets/Textures/{ControllerName}_{handedness}_{theme}_{scaled}.png + /// + public static Texture2D GetControllerTextureScaled(MixedRealityControllerMappingProfile mappingProfile) + { + return GetControllerTextureCached(mappingProfile, true); + } + + private static Texture2D GetControllerTextureCached(MixedRealityControllerMappingProfile mappingProfile, bool scaled = false) + { + var key = new Tuple(mappingProfile.ControllerType.Type, mappingProfile.Handedness, scaled); + + if (CachedTextures.TryGetValue(key, out var texture)) + { + return texture; + } + + texture = GetControllerTextureInternal(mappingProfile, scaled); + CachedTextures.Add(key, texture); + return texture; + } + + private static readonly string RootTexturePath = $"{PathFinderUtility.XRTK_Core_RelativeFolderPath}/Runtime/StandardAssets/Textures/"; + + private static Texture2D GetControllerTextureInternal(MixedRealityControllerMappingProfile mappingProfile, bool scaled) + { + Texture2D texture = null; + + if (mappingProfile != null && + mappingProfile.ControllerType.Type != null) + { + var controllerName = mappingProfile.ControllerType.Type.Name.Replace("OpenVR", string.Empty); + controllerName = controllerName.Replace("Simulated", string.Empty); + texture = GetControllerTextureInternal($"{RootTexturePath}{controllerName}", mappingProfile.Handedness, scaled); + + if (texture != null) + { + return texture; + } + + texture = GetControllerTextureInternal($"{RootTexturePath}{controllerName}", Handedness.None, scaled); + } + + if (texture == null) + { + texture = GetControllerTextureInternal($"{RootTexturePath}Generic_controller", mappingProfile.Handedness, scaled); + } + + if (texture == null) + { + texture = GetControllerTextureInternal($"{RootTexturePath}Generic_controller", Handedness.Right, scaled); + } + + return texture; + } + + private static Texture2D GetControllerTextureInternal(string fullTexturePath, Handedness handedness, bool scaled) + { + var handednessSuffix = string.Empty; + + switch (handedness) + { + case Handedness.Left: + handednessSuffix = "_left"; + break; + case Handedness.Right: + handednessSuffix = "_right"; + break; + } + + var themeSuffix = EditorGUIUtility.isProSkin ? "_white" : "_black"; + + return (Texture2D)AssetDatabase.LoadAssetAtPath($"{fullTexturePath}{handednessSuffix}{themeSuffix}{(scaled ? "_scaled" : string.Empty)}.png", typeof(Texture2D)); + } + + #endregion Controller Texture Loading + } +} \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ControllerMappingUtilities.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ControllerMappingUtilities.cs.meta new file mode 100644 index 000000000..d7e47956a --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/ControllerMappingUtilities.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6a2eecd9c5c334e498738b2794900c9e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/CorePathFinder.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs similarity index 94% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/CorePathFinder.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs index 1622d8ab4..79bfb7308 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/CorePathFinder.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs @@ -3,7 +3,7 @@ using UnityEngine; -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { /// /// Dummy scriptable object used to find the relative path to com.xrtk.core. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/CorePathFinder.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/CorePathFinder.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorAssemblyReloadManager.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorAssemblyReloadManager.cs similarity index 98% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorAssemblyReloadManager.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorAssemblyReloadManager.cs index ff226d832..68d312e87 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorAssemblyReloadManager.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorAssemblyReloadManager.cs @@ -4,7 +4,7 @@ using UnityEditor; using UnityEngine; -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { public static class EditorAssemblyReloadManager { diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorAssemblyReloadManager.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorAssemblyReloadManager.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorAssemblyReloadManager.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorAssemblyReloadManager.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorPreferences.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorPreferences.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorPreferences.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorPreferences.cs index 07929ab37..92552925f 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorPreferences.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorPreferences.cs @@ -4,7 +4,7 @@ using UnityEditor; using UnityEngine; -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { /// /// Convenience class for setting Editor Preferences with as key prefix. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorPreferences.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorPreferences.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/EditorPreferences.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/EditorPreferences.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/HoverLightInspector.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/HoverLightInspector.cs index 763579f87..5b302a0ce 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/HoverLightInspector.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/HoverLightInspector.cs @@ -5,7 +5,7 @@ using UnityEngine; using XRTK.Utilities; -namespace XRTK.Editor +namespace XRTK.Editor.Utilities { [CustomEditor(typeof(HoverLight))] public class HoverLightInspector : UnityEditor.Editor diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/IconEditor.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/IconEditor.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/IconEditor.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/IconEditor.cs index 2e6fee787..52a1fb457 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/IconEditor.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/IconEditor.cs @@ -5,7 +5,7 @@ using UnityEditor; using UnityEngine; -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { [CanEditMultipleObjects] [CustomEditor(typeof(DefaultAsset))] diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/IconEditor.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/IconEditor.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/IconEditor.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/IconEditor.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxis.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxis.cs similarity index 96% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxis.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxis.cs index e1cf994a6..d4f09a0bf 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxis.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxis.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { /// /// Used to define an entire InputManagerAxis, with each variable defined by the same term the Inspector shows. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxis.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxis.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxis.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxis.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxisType.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxisType.cs similarity index 92% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxisType.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxisType.cs index 83bef4e0b..aa4a086b3 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxisType.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxisType.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { /// /// Used to map AxisType from a useful name to the int value the InputManager wants. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxisType.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxisType.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputManagerAxisType.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputManagerAxisType.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputMappingAxisUtility.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputMappingAxisUtility.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs index 4ebde84ba..ca5429cbc 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputMappingAxisUtility.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using UnityEditor; -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { /// /// Utility class for Unity's Input Manager Mappings. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputMappingAxisUtility.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/InputMappingAxisUtility.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/MixedRealityEditorSettings.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityEditorSettings.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/MixedRealityEditorSettings.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityEditorSettings.cs index 5437cb07e..3251ad842 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/MixedRealityEditorSettings.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityEditorSettings.cs @@ -5,7 +5,7 @@ using UnityEditor.Build; using UnityEngine; -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { /// /// Sets Force Text Serialization and visible meta files in all projects that use the Mixed Reality Toolkit. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/MixedRealityEditorSettings.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityEditorSettings.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/MixedRealityEditorSettings.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityEditorSettings.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/PathFinderUtility.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/PathFinderUtility.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs index 8211efe82..49139e0ee 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/PathFinderUtility.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs @@ -8,7 +8,7 @@ using UnityEditor; using UnityEngine; -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { /// /// Interface to implement on a to make it easier to find relative/absolute folder paths using the . diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/PathFinderUtility.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/PathFinderUtility.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/SceneHelpers.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SceneHelpers.cs similarity index 96% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/SceneHelpers.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SceneHelpers.cs index abfd54984..78964b856 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/SceneHelpers.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SceneHelpers.cs @@ -4,7 +4,7 @@ using UnityEditor; using UnityEngine; -namespace XRTK.Utilities.Editor +namespace XRTK.Editor.Utilities { public class SceneHelpers { diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/SceneHelpers.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SceneHelpers.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/SceneHelpers.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/SceneHelpers.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor.meta b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor.meta deleted file mode 100644 index 132c7a281..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d7d49b13f9d14d18906e3462afacee38 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/XRTK.Utilities.Editor.asmdef b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/XRTK.Utilities.Editor.asmdef deleted file mode 100644 index 8de7e2634..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/XRTK.Utilities.Editor.asmdef +++ /dev/null @@ -1,15 +0,0 @@ -{ - "name": "XRTK.Utilities.Editor", - "references": [], - "optionalUnityReferences": [], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [] -} \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/XRTK.Utilities.Editor.asmdef.meta b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/XRTK.Utilities.Editor.asmdef.meta deleted file mode 100644 index 6f816b2de..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/Editor/XRTK.Utilities.Editor.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 395bd8dd25074437ba735310022f8f0a -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From f7d11dc763d2a9e623da1960c505cda76d7db0b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 14:09:42 +0100 Subject: [PATCH 05/11] Remove redundanct license file in Tests folder --- .../Packages/com.xrtk.core/Tests/License.txt | 22 ------------------- .../com.xrtk.core/Tests/License.txt.meta | 7 ------ 2 files changed, 29 deletions(-) delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Tests/License.txt delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Tests/License.txt.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Tests/License.txt b/XRTK-Core/Packages/com.xrtk.core/Tests/License.txt deleted file mode 100644 index da4536bf5..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Tests/License.txt +++ /dev/null @@ -1,22 +0,0 @@ -MIT License - -Copyright (c) 2018 Microsoft Corporation -Copyright (c) 2019 XRTK - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Tests/License.txt.meta b/XRTK-Core/Packages/com.xrtk.core/Tests/License.txt.meta deleted file mode 100644 index 86bc1a35b..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Tests/License.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: f4d64efca19e46218bcf41910f786bb9 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 493090d9afa1bd743020b9b59afb306f4f658b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 14:26:07 +0100 Subject: [PATCH 06/11] Move check for axis mappings to editor utility --- .../Editor/ControllerPopupWindow.cs | 1 - .../EditorActiveProfileChangeHandler.cs | 38 +++++ .../EditorActiveProfileChangeHandler.cs.meta | 11 ++ .../Devices/ControllerMappingLibrary.cs | 160 ------------------ .../Runtime/Services/MixedRealityToolkit.cs | 11 -- 5 files changed, 49 insertions(+), 172 deletions(-) create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs create mode 100644 XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs index de48bf391..0c9c81c7c 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs @@ -17,7 +17,6 @@ using XRTK.Interfaces.Providers.Controllers.Hands; using XRTK.Providers.Controllers.OpenVR; using XRTK.Providers.Controllers.UnityInput; -using XRTK.Utilities.Editor; namespace XRTK.Editor { diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs new file mode 100644 index 000000000..940f6fe7c --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs @@ -0,0 +1,38 @@ +// Copyright (c) XRTK. All rights reserved. +// Licensed under the MIT License. See LICENSE in the project root for license information. + +using UnityEditor; +using UnityEngine; +using XRTK.Extensions; +using XRTK.Services; + +namespace XRTK.Editor +{ + [InitializeOnLoad] + public static class EditorActiveProfileChangeHandler + { + static EditorActiveProfileChangeHandler() + { + EditorApplication.hierarchyChanged += EditorApplication_hierarchyChanged; + } + + private static void EditorApplication_hierarchyChanged() + { + Debug.Log("CHANGED"); + if (!MixedRealityToolkit.Instance.IsNull()) + { + if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled) + { + Debug.Log("INPUT SYSTEM ENABLED"); + // Make sure unity axis mappings are set. + Utilities.InputMappingAxisUtility.CheckUnityInputManagerMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes); + } + else + { + Debug.Log("INPUT SYSTEM DISABLED"); + Utilities.InputMappingAxisUtility.RemoveMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes); + } + } + } + } +} \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs.meta new file mode 100644 index 000000000..423000687 --- /dev/null +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8ec88c84f33b42348a2144a0d3380f25 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {fileID: 2800000, guid: 8ac5213854cf4dbabd140decf8df1946, type: 3} + userData: + assetBundleName: + assetBundleVariant: diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Definitions/Devices/ControllerMappingLibrary.cs b/XRTK-Core/Packages/com.xrtk.core/Runtime/Definitions/Devices/ControllerMappingLibrary.cs index b5fcbf830..0e69f1751 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Definitions/Devices/ControllerMappingLibrary.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Runtime/Definitions/Devices/ControllerMappingLibrary.cs @@ -1,16 +1,6 @@ // Copyright (c) XRTK. All rights reserved. // Licensed under the MIT License. See LICENSE in the project root for license information. -#if UNITY_EDITOR -using System; -using System.Collections.Generic; -using UnityEditor; -using UnityEngine; -using XRTK.Definitions.Controllers; -using XRTK.Definitions.Utilities; -using XRTK.Utilities.Editor; -#endif - namespace XRTK.Definitions.Devices { /// @@ -18,8 +8,6 @@ namespace XRTK.Definitions.Devices /// public static class ControllerMappingLibrary { - #region Constants - /// /// Built in mouse x input axis /// @@ -211,153 +199,5 @@ public static class ControllerMappingLibrary /// Valve Knuckles Controller: Right Controller Pinky Finger Cap Sensor /// public const string AXIS_27 = "AXIS_27"; - - #endregion Constants - -#if UNITY_EDITOR - - #region InputAxisConfig - - // Default value for the dead zone. This should match the default used by Unity for the pre-created Horizontal and Vertical axes. - private const float DEFAULT_DEAD_ZONE = 0.19f; - - /// - /// Get the InputManagerAxis data needed to configure the Input Mappings for a controller - /// - /// - public static InputManagerAxis[] UnityInputManagerAxes => new[] - { - new InputManagerAxis { Name = AXIS_1, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 1 }, - new InputManagerAxis { Name = AXIS_2, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 2 }, - new InputManagerAxis { Name = AXIS_3, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 3 }, - new InputManagerAxis { Name = AXIS_4, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 4 }, - new InputManagerAxis { Name = AXIS_5, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 5 }, - new InputManagerAxis { Name = AXIS_6, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 6 }, - new InputManagerAxis { Name = AXIS_7, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 7 }, - new InputManagerAxis { Name = AXIS_8, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 8 }, - new InputManagerAxis { Name = AXIS_9, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 9 }, - new InputManagerAxis { Name = AXIS_10, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 10 }, - new InputManagerAxis { Name = AXIS_11, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 11 }, - new InputManagerAxis { Name = AXIS_12, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 12 }, - new InputManagerAxis { Name = AXIS_13, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 13 }, - new InputManagerAxis { Name = AXIS_14, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 14 }, - new InputManagerAxis { Name = AXIS_15, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 15 }, - new InputManagerAxis { Name = AXIS_16, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 16 }, - new InputManagerAxis { Name = AXIS_17, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 17 }, - new InputManagerAxis { Name = AXIS_18, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 18 }, - new InputManagerAxis { Name = AXIS_19, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 19 }, - new InputManagerAxis { Name = AXIS_20, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 20 }, - new InputManagerAxis { Name = AXIS_21, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 21 }, - new InputManagerAxis { Name = AXIS_22, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 22 }, - new InputManagerAxis { Name = AXIS_23, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 23 }, - new InputManagerAxis { Name = AXIS_24, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 24 }, - new InputManagerAxis { Name = AXIS_25, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 25 }, - new InputManagerAxis { Name = AXIS_26, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 26 }, - new InputManagerAxis { Name = AXIS_27, Dead = DEFAULT_DEAD_ZONE, Sensitivity = 1, Invert = false, Type = InputManagerAxisType.JoystickAxis, Axis = 27 } - }; - - #endregion InputAxisConfig - - #region Controller Texture Loading - - private static readonly Dictionary, Texture2D> CachedTextures = new Dictionary, Texture2D>(); - - /// - /// Gets a texture based on the . - /// - /// - /// The texture for the controller profile, if none found then a generic texture is returned. - /// - /// The file name should be formatted as:XRTK/StandardAssets/Textures/{ControllerTypeName}_{handedness}_{theme}_{scaled}.png - /// scaled suffix is optional. - /// - public static Texture2D GetControllerTexture(MixedRealityControllerMappingProfile mappingProfile) - { - return GetControllerTextureCached(mappingProfile); - } - - /// - /// Gets a texture based on the . - /// - /// - /// The scaled texture for the controller profile, if none found then a generic texture is returned. - /// - /// The file name should be formatted as:XRTK/StandardAssets/Textures/{ControllerName}_{handedness}_{theme}_{scaled}.png - /// - public static Texture2D GetControllerTextureScaled(MixedRealityControllerMappingProfile mappingProfile) - { - return GetControllerTextureCached(mappingProfile, true); - } - - private static Texture2D GetControllerTextureCached(MixedRealityControllerMappingProfile mappingProfile, bool scaled = false) - { - var key = new Tuple(mappingProfile.ControllerType.Type, mappingProfile.Handedness, scaled); - - if (CachedTextures.TryGetValue(key, out var texture)) - { - return texture; - } - - texture = GetControllerTextureInternal(mappingProfile, scaled); - CachedTextures.Add(key, texture); - return texture; - } - - private static readonly string RootTexturePath = $"{PathFinderUtility.XRTK_Core_RelativeFolderPath}/Runtime/StandardAssets/Textures/"; - - private static Texture2D GetControllerTextureInternal(MixedRealityControllerMappingProfile mappingProfile, bool scaled) - { - Texture2D texture = null; - - if (mappingProfile != null && - mappingProfile.ControllerType.Type != null) - { - var controllerName = mappingProfile.ControllerType.Type.Name.Replace("OpenVR", string.Empty); - controllerName = controllerName.Replace("Simulated", string.Empty); - texture = GetControllerTextureInternal($"{RootTexturePath}{controllerName}", mappingProfile.Handedness, scaled); - - if (texture != null) - { - return texture; - } - - texture = GetControllerTextureInternal($"{RootTexturePath}{controllerName}", Handedness.None, scaled); - } - - if (texture == null) - { - texture = GetControllerTextureInternal($"{RootTexturePath}Generic_controller", mappingProfile.Handedness, scaled); - } - - if (texture == null) - { - texture = GetControllerTextureInternal($"{RootTexturePath}Generic_controller", Handedness.Right, scaled); - } - - return texture; - } - - private static Texture2D GetControllerTextureInternal(string fullTexturePath, Handedness handedness, bool scaled) - { - var handednessSuffix = string.Empty; - - switch (handedness) - { - case Handedness.Left: - handednessSuffix = "_left"; - break; - case Handedness.Right: - handednessSuffix = "_right"; - break; - } - - var themeSuffix = EditorGUIUtility.isProSkin ? "_white" : "_black"; - - return (Texture2D)AssetDatabase.LoadAssetAtPath($"{fullTexturePath}{handednessSuffix}{themeSuffix}{(scaled ? "_scaled" : string.Empty)}.png", typeof(Texture2D)); - } - - #endregion Controller Texture Loading - -#endif // UNITY_EDITOR } } \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Services/MixedRealityToolkit.cs b/XRTK-Core/Packages/com.xrtk.core/Runtime/Services/MixedRealityToolkit.cs index 76b72b3da..66a966f36 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Services/MixedRealityToolkit.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Runtime/Services/MixedRealityToolkit.cs @@ -423,11 +423,6 @@ private void InitializeServiceLocator() if (ActiveProfile.IsInputSystemEnabled) { -#if UNITY_EDITOR - // Make sure unity axis mappings are set. - Utilities.Editor.InputMappingAxisUtility.CheckUnityInputManagerMappings(Definitions.Devices.ControllerMappingLibrary.UnityInputManagerAxes); -#endif - if (TryCreateAndRegisterService(ActiveProfile.InputSystemType, out var service, ActiveProfile.InputSystemProfile) && InputSystem != null) { if (TryCreateAndRegisterService(ActiveProfile.InputSystemProfile.FocusProviderType, out _)) @@ -445,12 +440,6 @@ private void InitializeServiceLocator() Debug.LogError("Failed to start the Input System!"); } } - else - { -#if UNITY_EDITOR - Utilities.Editor.InputMappingAxisUtility.RemoveMappings(Definitions.Devices.ControllerMappingLibrary.UnityInputManagerAxes); -#endif - } if (ActiveProfile.IsBoundarySystemEnabled) { From cc3ce00575cb70439e0f362356368dce7aa925d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 15:01:00 +0100 Subject: [PATCH 07/11] Move build tools to editor assembly --- .../Utilities => Editor}/BuildAndDeploy.meta | 0 .../BuildAndDeploy/BuildDeployPreferences.cs | 2 +- .../BuildDeployPreferences.cs.meta | 0 .../BuildAndDeploy/BuildDeployWindow.cs | 2 +- .../BuildAndDeploy/BuildDeployWindow.cs.meta | 0 .../BuildAndDeploy/BuildInfo.cs | 2 +- .../BuildAndDeploy/BuildInfo.cs.meta | 0 .../BuildAndDeploy/BuildInfoExtensions.cs | 2 +- .../BuildAndDeploy/BuildInfoExtensions.cs.meta | 0 .../BuildAndDeploy/IBuildInfo.cs | 2 +- .../BuildAndDeploy/IBuildInfo.cs.meta | 0 .../BuildAndDeploy/LuminPlayerBuildTools.cs | 2 +- .../LuminPlayerBuildTools.cs.meta | 0 .../BuildAndDeploy/MixedRealityAppIcon.cs | 2 +- .../BuildAndDeploy/MixedRealityAppIcon.cs.meta | 0 .../BuildAndDeploy/UnityPlayerBuildTools.cs | 2 +- .../UnityPlayerBuildTools.cs.meta | 0 .../BuildAndDeploy/UwpAppxBuildTools.cs | 2 +- .../BuildAndDeploy/UwpAppxBuildTools.cs.meta | 0 .../UwpBuildDeployPreferences.cs | 2 +- .../UwpBuildDeployPreferences.cs.meta | 0 .../BuildAndDeploy/UwpBuildInfo.cs | 2 +- .../BuildAndDeploy/UwpBuildInfo.cs.meta | 0 .../BuildAndDeploy/UwpPlayerBuildTools.cs | 3 +-- .../BuildAndDeploy/UwpPlayerBuildTools.cs.meta | 0 .../BuildAndDeploy/XRTK.Utilities.Build.asmdef | 18 ------------------ .../XRTK.Utilities.Build.asmdef.meta | 7 ------- 27 files changed, 12 insertions(+), 38 deletions(-) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/BuildDeployPreferences.cs (98%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/BuildDeployPreferences.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/BuildDeployWindow.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/BuildDeployWindow.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/BuildInfo.cs (98%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/BuildInfo.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/BuildInfoExtensions.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/BuildInfoExtensions.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/IBuildInfo.cs (98%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/IBuildInfo.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/LuminPlayerBuildTools.cs (98%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/LuminPlayerBuildTools.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/MixedRealityAppIcon.cs (87%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/MixedRealityAppIcon.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UnityPlayerBuildTools.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UnityPlayerBuildTools.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UwpAppxBuildTools.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UwpAppxBuildTools.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UwpBuildDeployPreferences.cs (99%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UwpBuildDeployPreferences.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UwpBuildInfo.cs (95%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UwpBuildInfo.cs.meta (100%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UwpPlayerBuildTools.cs (98%) rename XRTK-Core/Packages/com.xrtk.core/{Runtime/Utilities => Editor}/BuildAndDeploy/UwpPlayerBuildTools.cs.meta (100%) delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/XRTK.Utilities.Build.asmdef delete mode 100644 XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/XRTK.Utilities.Build.asmdef.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployPreferences.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs similarity index 98% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployPreferences.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs index 0b8d5733a..a29514261 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployPreferences.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs @@ -7,7 +7,7 @@ using UnityEngine; using XRTK.Utilities.Editor; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { /// /// Build and Deploy Specific Editor Preferences for the Build and Deploy Window. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployPreferences.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployPreferences.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployWindow.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployWindow.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs index 608d80a4f..7c3e372b4 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployWindow.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs @@ -20,7 +20,7 @@ using Debug = UnityEngine.Debug; using FileInfo = System.IO.FileInfo; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { /// /// Build window - supports SLN creation, APPX from SLN, Deploy on device, and misc helper utilities associated with the build/deploy/test iteration loop diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployWindow.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildDeployWindow.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfo.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfo.cs similarity index 98% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfo.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfo.cs index 2458cd93b..bc9672163 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfo.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfo.cs @@ -5,7 +5,7 @@ using UnityEditor.Build.Reporting; using UnityEngine; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { public class BuildInfo : IBuildInfo { diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfo.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfo.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfo.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfo.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfoExtensions.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfoExtensions.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfoExtensions.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfoExtensions.cs index 5ee8067b4..7e4f2077d 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfoExtensions.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfoExtensions.cs @@ -2,7 +2,7 @@ using System.Linq; using UnityEditor; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { public static class BuildInfoExtensions { diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfoExtensions.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfoExtensions.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/BuildInfoExtensions.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildInfoExtensions.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/IBuildInfo.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/IBuildInfo.cs similarity index 98% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/IBuildInfo.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/IBuildInfo.cs index c995b2e2f..a5a569461 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/IBuildInfo.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/IBuildInfo.cs @@ -4,7 +4,7 @@ using UnityEditor.Build.Reporting; using UnityEngine; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { /// /// The Build Info defines common properties for a build. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/IBuildInfo.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/IBuildInfo.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/IBuildInfo.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/IBuildInfo.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/LuminPlayerBuildTools.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/LuminPlayerBuildTools.cs similarity index 98% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/LuminPlayerBuildTools.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/LuminPlayerBuildTools.cs index 3454cebf2..521f55f74 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/LuminPlayerBuildTools.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/LuminPlayerBuildTools.cs @@ -8,7 +8,7 @@ using XRTK.Extensions; using Debug = UnityEngine.Debug; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { /// /// Class containing various utility methods to build a lumin mpk installer from a Unity project. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/LuminPlayerBuildTools.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/LuminPlayerBuildTools.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/LuminPlayerBuildTools.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/LuminPlayerBuildTools.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/MixedRealityAppIcon.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/MixedRealityAppIcon.cs similarity index 87% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/MixedRealityAppIcon.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/MixedRealityAppIcon.cs index f55208ed6..11353921e 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/MixedRealityAppIcon.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/MixedRealityAppIcon.cs @@ -1,6 +1,6 @@ using System; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { /// /// Build profile for saving 3d app icon's path in the build settings. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/MixedRealityAppIcon.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/MixedRealityAppIcon.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/MixedRealityAppIcon.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/MixedRealityAppIcon.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs index be6abbc66..73f3ccb70 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs @@ -16,7 +16,7 @@ using XRTK.Utilities.Editor; using Debug = UnityEngine.Debug; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { /// /// Cross platform player build tools diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UnityPlayerBuildTools.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs index 4f9173ae8..911fde20e 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs @@ -15,7 +15,7 @@ using XRTK.Utilities.Editor; using Debug = UnityEngine.Debug; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { public static class UwpAppxBuildTools { diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpAppxBuildTools.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildDeployPreferences.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs similarity index 99% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildDeployPreferences.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs index 234c0b201..fb49d3080 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildDeployPreferences.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs @@ -4,7 +4,7 @@ using XRTK.Utilities.Editor; using XRTK.Utilities.WindowsDevicePortal.DataStructures; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { public static class UwpBuildDeployPreferences { diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildDeployPreferences.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildDeployPreferences.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildInfo.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildInfo.cs similarity index 95% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildInfo.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildInfo.cs index c2fd3dbd1..bac5f054b 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildInfo.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildInfo.cs @@ -3,7 +3,7 @@ using UnityEditor; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { public class UwpBuildInfo : BuildInfo { diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildInfo.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildInfo.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpBuildInfo.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildInfo.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpPlayerBuildTools.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs similarity index 98% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpPlayerBuildTools.cs rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs index 2e91b9c93..f2b4e71d4 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpPlayerBuildTools.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs @@ -7,9 +7,8 @@ using System.Threading.Tasks; using UnityEditor; using UnityEditor.Build.Reporting; -using XRTK.Utilities.Editor; -namespace XRTK.Utilities.Build +namespace XRTK.Editor.BuildAndDeploy { /// /// Class containing various utility methods to build a WSA solution from a Unity project. diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpPlayerBuildTools.cs.meta b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs.meta similarity index 100% rename from XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/UwpPlayerBuildTools.cs.meta rename to XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs.meta diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/XRTK.Utilities.Build.asmdef b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/XRTK.Utilities.Build.asmdef deleted file mode 100644 index d0f8d9bbf..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/XRTK.Utilities.Build.asmdef +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "XRTK.Utilities.Build", - "references": [ - "GUID:f3241d040533491e8a1e2714b27c3111", - "GUID:395bd8dd25074437ba735310022f8f0a" - ], - "optionalUnityReferences": [], - "includePlatforms": [ - "Editor" - ], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [] -} \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/XRTK.Utilities.Build.asmdef.meta b/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/XRTK.Utilities.Build.asmdef.meta deleted file mode 100644 index e087971a2..000000000 --- a/XRTK-Core/Packages/com.xrtk.core/Runtime/Utilities/BuildAndDeploy/XRTK.Utilities.Build.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: b6de896d71a648ec9fa913e154ba8b46 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From 4d3798ee0dbf6b8e4932fb880882644c3156a401 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 15:13:25 +0100 Subject: [PATCH 08/11] Fix namespaces --- .../Editor/BuildAndDeploy/BuildDeployPreferences.cs | 2 +- .../Editor/BuildAndDeploy/BuildDeployWindow.cs | 4 ++-- .../Editor/BuildAndDeploy/UnityPlayerBuildTools.cs | 2 +- .../Editor/BuildAndDeploy/UwpAppxBuildTools.cs | 2 +- .../Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs | 2 +- .../Editor/BuildAndDeploy/UwpPlayerBuildTools.cs | 1 + .../com.xrtk.core/Editor/ControllerPopupWindow.cs | 4 ++-- .../com.xrtk.core/Editor/MixedRealityPreferences.cs | 2 +- ...eMixedRealityControllerDataProviderProfileInspector.cs | 3 ++- .../Editor/Utilities/MixedRealityInspectorUtility.cs | 1 - .../Editor/Utilities/MixedRealityServiceWizard.cs | 1 - .../Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs | 1 - .../TestFixture_01_UnityInputManagerHelperTests.cs | 8 ++++---- 13 files changed, 16 insertions(+), 17 deletions(-) diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs index a29514261..c9d230324 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployPreferences.cs @@ -5,7 +5,7 @@ using System.IO; using UnityEditor; using UnityEngine; -using XRTK.Utilities.Editor; +using XRTK.Editor.Utilities; namespace XRTK.Editor.BuildAndDeploy { diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs index 7c3e372b4..430cd0d85 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/BuildDeployWindow.cs @@ -11,8 +11,8 @@ using System.Xml; using UnityEditor; using UnityEngine; -using XRTK.Utilities.Editor; -using XRTK.Utilities.Editor.Usb; +using XRTK.Editor.Utilities; +using XRTK.Editor.Utilities.USB; using XRTK.Utilities.Gltf; using XRTK.Utilities.WebRequestRest; using XRTK.Utilities.WindowsDevicePortal; diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs index 73f3ccb70..d9c7031cb 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UnityPlayerBuildTools.cs @@ -13,7 +13,7 @@ using UnityEditor.Build.Reporting; using UnityEngine; using XRTK.Extensions; -using XRTK.Utilities.Editor; +using XRTK.Editor.Utilities; using Debug = UnityEngine.Debug; namespace XRTK.Editor.BuildAndDeploy diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs index 911fde20e..cd0ed8e8f 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpAppxBuildTools.cs @@ -12,7 +12,7 @@ using UnityEditor; using UnityEngine; using XRTK.Extensions; -using XRTK.Utilities.Editor; +using XRTK.Editor.Utilities; using Debug = UnityEngine.Debug; namespace XRTK.Editor.BuildAndDeploy diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs index fb49d3080..0d679fcdc 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpBuildDeployPreferences.cs @@ -1,7 +1,7 @@ using System; using System.IO; using UnityEngine; -using XRTK.Utilities.Editor; +using XRTK.Editor.Utilities; using XRTK.Utilities.WindowsDevicePortal.DataStructures; namespace XRTK.Editor.BuildAndDeploy diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs index f2b4e71d4..f3192719e 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/BuildAndDeploy/UwpPlayerBuildTools.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using UnityEditor; using UnityEditor.Build.Reporting; +using XRTK.Editor.Utilities; namespace XRTK.Editor.BuildAndDeploy { diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs index 0c9c81c7c..8a95ecfa4 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs @@ -105,7 +105,7 @@ private void OnFocus() Close(); } - currentControllerTexture = ControllerMappingLibrary.GetControllerTexture(controllerDataProviderProfile); + currentControllerTexture = ControllerMappingUtilities.GetControllerTexture(controllerDataProviderProfile); } /// @@ -135,7 +135,7 @@ public static void Show(MixedRealityControllerMappingProfile profile, Serialized window.titleContent = new GUIContent($"{window.currentControllerName} {handednessTitleText}Input Action Assignment"); window.controllerDataProviderProfile = profile; window.currentInteractionProfiles = interactionMappingProfiles; - window.currentControllerTexture = ControllerMappingLibrary.GetControllerTexture(profile); + window.currentControllerTexture = ControllerMappingUtilities.GetControllerTexture(profile); isMouseInRects = new bool[interactionMappingProfiles.arraySize]; diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/MixedRealityPreferences.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/MixedRealityPreferences.cs index 53a2b1c76..9e6681ae0 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/MixedRealityPreferences.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/MixedRealityPreferences.cs @@ -10,7 +10,7 @@ using XRTK.Editor.Utilities.SymbolicLinks; using XRTK.Editor.Extensions; using XRTK.Extensions; -using XRTK.Utilities.Editor; +using XRTK.Editor.Utilities; namespace XRTK.Editor { diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Profiles/InputSystem/Controllers/BaseMixedRealityControllerDataProviderProfileInspector.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Profiles/InputSystem/Controllers/BaseMixedRealityControllerDataProviderProfileInspector.cs index 0866490d6..df3028f5c 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Profiles/InputSystem/Controllers/BaseMixedRealityControllerDataProviderProfileInspector.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Profiles/InputSystem/Controllers/BaseMixedRealityControllerDataProviderProfileInspector.cs @@ -15,6 +15,7 @@ using System.Runtime.InteropServices; using XRTK.Editor.Extensions; using XRTK.Editor.PropertyDrawers; +using XRTK.Editor.Utilities; namespace XRTK.Editor.Profiles.InputSystem.Controllers { @@ -283,7 +284,7 @@ internal void RenderControllerMappingButton(MixedRealityControllerMappingProfile typeName = "HoloLens 1"; } - var buttonContent = new GUIContent($"Edit {typeName} Action Mapping", ControllerMappingLibrary.GetControllerTextureScaled(controllerMappingProfile)); + var buttonContent = new GUIContent($"Edit {typeName} Action Mapping", ControllerMappingUtilities.GetControllerTextureScaled(controllerMappingProfile)); if (GUILayout.Button(buttonContent, ControllerButtonStyle, GUILayout.Height(128f), GUILayout.MinWidth(32f), GUILayout.ExpandWidth(true))) { EditorApplication.delayCall += () => ControllerPopupWindow.Show(controllerMappingProfile, new SerializedObject(controllerMappingProfile).FindProperty("interactionMappingProfiles")); diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityInspectorUtility.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityInspectorUtility.cs index ce8da46b3..2e1981966 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityInspectorUtility.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityInspectorUtility.cs @@ -7,7 +7,6 @@ using System.Reflection; using UnityEditor; using UnityEngine; -using XRTK.Utilities.Editor; using Object = UnityEngine.Object; namespace XRTK.Editor.Utilities diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityServiceWizard.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityServiceWizard.cs index 70ee8d4af..4a18eb9e1 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityServiceWizard.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/MixedRealityServiceWizard.cs @@ -18,7 +18,6 @@ using XRTK.Interfaces.Events; using XRTK.Interfaces.TeleportSystem; using XRTK.Services; -using XRTK.Utilities.Editor; using Assembly = System.Reflection.Assembly; namespace XRTK.Editor.Utilities diff --git a/XRTK-Core/Packages/com.xrtk.core/Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs b/XRTK-Core/Packages/com.xrtk.core/Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs index b6300f6e1..620fb8314 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Tests/Core/TestFixture_01_MixedRealityToolkitTests.cs @@ -10,7 +10,6 @@ using XRTK.Interfaces; using XRTK.Services; using XRTK.Tests.Services; -using XRTK.Utilities.Editor; namespace XRTK.Tests.Core { diff --git a/XRTK-Core/Packages/com.xrtk.core/Tests/InputSystem/TestFixture_01_UnityInputManagerHelperTests.cs b/XRTK-Core/Packages/com.xrtk.core/Tests/InputSystem/TestFixture_01_UnityInputManagerHelperTests.cs index 286591aab..fadcea204 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Tests/InputSystem/TestFixture_01_UnityInputManagerHelperTests.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Tests/InputSystem/TestFixture_01_UnityInputManagerHelperTests.cs @@ -2,7 +2,7 @@ // Licensed under the MIT License. See LICENSE in the project root for license information. using XRTK.Definitions.Devices; -using XRTK.Utilities.Editor; +using XRTK.Editor.Utilities; using NUnit.Framework; namespace XRTK.Tests.InputSystem @@ -12,7 +12,7 @@ public class TestFixture_01_UnityInputManagerHelperTests [Test] public void Test01_TestAddCustomMappings() { - InputMappingAxisUtility.CheckUnityInputManagerMappings(ControllerMappingLibrary.UnityInputManagerAxes); + InputMappingAxisUtility.CheckUnityInputManagerMappings(ControllerMappingUtilities.UnityInputManagerAxes); Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist(ControllerMappingLibrary.AXIS_1)); Assert.IsTrue(InputMappingAxisUtility.DoesAxisNameExist(ControllerMappingLibrary.AXIS_2)); @@ -42,7 +42,7 @@ public void Test01_TestAddCustomMappings() [Test] public void Test02_TestRemoveCustomMappings() { - InputMappingAxisUtility.RemoveMappings(ControllerMappingLibrary.UnityInputManagerAxes); + InputMappingAxisUtility.RemoveMappings(ControllerMappingUtilities.UnityInputManagerAxes); Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist(ControllerMappingLibrary.AXIS_1)); Assert.IsFalse(InputMappingAxisUtility.DoesAxisNameExist(ControllerMappingLibrary.AXIS_2)); @@ -73,7 +73,7 @@ public void Test02_TestRemoveCustomMappings() public void TearDown() { // Put the mappings back. - InputMappingAxisUtility.CheckUnityInputManagerMappings(ControllerMappingLibrary.UnityInputManagerAxes); + InputMappingAxisUtility.CheckUnityInputManagerMappings(ControllerMappingUtilities.UnityInputManagerAxes); } } } \ No newline at end of file From a5a660e38a5cf4e3d80b0002d59d3db74981d7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 15:17:52 +0100 Subject: [PATCH 09/11] Adds log for updated axis mappings --- .../Editor/EditorActiveProfileChangeHandler.cs | 14 ++++++-------- .../Editor/Utilities/InputMappingAxisUtility.cs | 16 ++++++++++++++-- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs index 940f6fe7c..1f0ffc557 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/EditorActiveProfileChangeHandler.cs @@ -18,19 +18,17 @@ static EditorActiveProfileChangeHandler() private static void EditorApplication_hierarchyChanged() { - Debug.Log("CHANGED"); if (!MixedRealityToolkit.Instance.IsNull()) { - if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled) + if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled && + Utilities.InputMappingAxisUtility.CheckUnityInputManagerMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes)) { - Debug.Log("INPUT SYSTEM ENABLED"); - // Make sure unity axis mappings are set. - Utilities.InputMappingAxisUtility.CheckUnityInputManagerMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes); + Debug.Log("XRTK Input System was enabled, updated input axis mappings."); } - else + else if (!MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled && + Utilities.InputMappingAxisUtility.RemoveMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes)) { - Debug.Log("INPUT SYSTEM DISABLED"); - Utilities.InputMappingAxisUtility.RemoveMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes); + Debug.Log("XRTK Input System was disabled, removed input axis mappings."); } } } diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs index ca5429cbc..b63465e4c 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/InputMappingAxisUtility.cs @@ -37,8 +37,11 @@ public static class InputMappingAxisUtility /// This only exists as the Unity input manager CANNOT map Axis to an id, it has to be through a mapping /// /// Optional array of Axis Mappings, to configure your own custom set - public static void CheckUnityInputManagerMappings(InputManagerAxis[] axisMappings) + /// True, if input axis mappings were added. + public static bool CheckUnityInputManagerMappings(InputManagerAxis[] axisMappings) { + var addedMappings = false; + AssureInputManagerReference(); if (axisMappings != null) @@ -48,11 +51,14 @@ public static void CheckUnityInputManagerMappings(InputManagerAxis[] axisMapping if (!DoesAxisNameExist(axis.Name)) { AddAxis(axis); + addedMappings = true; } } inputManagerAsset.ApplyModifiedProperties(); } + + return addedMappings; } /// @@ -62,8 +68,11 @@ public static void CheckUnityInputManagerMappings(InputManagerAxis[] axisMapping /// This only exists as the Unity input manager CANNOT map Axis to an id, it has to be through a mapping /// /// Optional array of Axis Mappings, to configure your own custom set - public static void RemoveMappings(InputManagerAxis[] axisMappings) + /// True, if input axis mappings were removed. + public static bool RemoveMappings(InputManagerAxis[] axisMappings) { + var removedMappings = false; + AssureInputManagerReference(); if (axisMappings != null) @@ -73,11 +82,14 @@ public static void RemoveMappings(InputManagerAxis[] axisMappings) if (DoesAxisNameExist(axis.Name)) { RemoveAxis(axis.Name); + removedMappings = true; } } } inputManagerAsset.ApplyModifiedProperties(); + + return removedMappings; } private static void AddAxis(InputManagerAxis axis) From 72269f46578f8d2a77f2e032ae3cb402faf34d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 15:33:31 +0100 Subject: [PATCH 10/11] Fix core path finder location in strings --- .../Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs | 2 +- .../com.xrtk.core/Editor/Utilities/PathFinderUtility.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs index 79bfb7308..4ab4d0457 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/CorePathFinder.cs @@ -12,6 +12,6 @@ namespace XRTK.Editor.Utilities public class CorePathFinder : ScriptableObject, IPathFinder { /// - public string Location => $"/Runtime/Utilities/Editor/{nameof(CorePathFinder)}.cs"; + public string Location => $"/Editor/Utilities/{nameof(CorePathFinder)}.cs"; } } \ No newline at end of file diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs index 49139e0ee..2e37b9b3e 100644 --- a/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs +++ b/XRTK-Core/Packages/com.xrtk.core/Editor/Utilities/PathFinderUtility.cs @@ -26,7 +26,7 @@ public interface IPathFinder public static class PathFinderUtility { - private const string CORE_PATH_FINDER = "/Runtime/Utilities/Editor/CorePathFinder.cs"; + private const string CORE_PATH_FINDER = "/Editor/Utilities/CorePathFinder.cs"; private const string SDK_PATH_FINDER = "/Editor/SdkPathFinder.cs"; private static readonly Dictionary PathFinderCache = new Dictionary(); From a3d63d44b1e58b7a3a89130ebdbbcdc4a227e4ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dino=20Fejzagi=C4=87?= Date: Wed, 13 Jan 2021 15:40:32 +0100 Subject: [PATCH 11/11] Update submodules --- Submodules/ARCore | 2 +- Submodules/Etee | 2 +- Submodules/Lenovo | 2 +- Submodules/Lumin | 2 +- Submodules/Nreal | 2 +- Submodules/Oculus | 2 +- Submodules/SDK | 2 +- Submodules/SteamVR | 2 +- Submodules/Ultraleap | 2 +- Submodules/WindowsMixedReality | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Submodules/ARCore b/Submodules/ARCore index 5aadf9734..cb50f4d9a 160000 --- a/Submodules/ARCore +++ b/Submodules/ARCore @@ -1 +1 @@ -Subproject commit 5aadf9734e878583a9a620cfe0b1b1f385f19841 +Subproject commit cb50f4d9ac4804e730f2352b18170e722c35d66e diff --git a/Submodules/Etee b/Submodules/Etee index dccc32dd7..38ffe5c68 160000 --- a/Submodules/Etee +++ b/Submodules/Etee @@ -1 +1 @@ -Subproject commit dccc32dd7fd749ce3bd86ed5101ba393913bf1ed +Subproject commit 38ffe5c68cc9d64b54f999e872ff16613ebdee8c diff --git a/Submodules/Lenovo b/Submodules/Lenovo index f83677a05..9a7aaaba9 160000 --- a/Submodules/Lenovo +++ b/Submodules/Lenovo @@ -1 +1 @@ -Subproject commit f83677a05701f5063610a09b949f88ed7057f7db +Subproject commit 9a7aaaba9b43db0d8412858bfec7d69001ab709e diff --git a/Submodules/Lumin b/Submodules/Lumin index c6ba2d358..0e452e2c4 160000 --- a/Submodules/Lumin +++ b/Submodules/Lumin @@ -1 +1 @@ -Subproject commit c6ba2d3585383731b758c077c0ff426037029cac +Subproject commit 0e452e2c4928b89f50edd8eb2142e0309fc5e157 diff --git a/Submodules/Nreal b/Submodules/Nreal index c3285391d..24adfd734 160000 --- a/Submodules/Nreal +++ b/Submodules/Nreal @@ -1 +1 @@ -Subproject commit c3285391d7ff41354317ac19cd2a3f6b5f28c662 +Subproject commit 24adfd734a57d15cb6ab74f352d2422a6ead90eb diff --git a/Submodules/Oculus b/Submodules/Oculus index d36162878..7b6239658 160000 --- a/Submodules/Oculus +++ b/Submodules/Oculus @@ -1 +1 @@ -Subproject commit d3616287820b80b9a855cfb37d324f95d1df9bb1 +Subproject commit 7b623965845566fa55df6a0047208cb44b9af77f diff --git a/Submodules/SDK b/Submodules/SDK index cbac0dc91..1da0f9f9c 160000 --- a/Submodules/SDK +++ b/Submodules/SDK @@ -1 +1 @@ -Subproject commit cbac0dc9125c36049b45c4ebab8aaa321c2a9e6b +Subproject commit 1da0f9f9cc111192c54a07ed5615145e570b23bd diff --git a/Submodules/SteamVR b/Submodules/SteamVR index dd64ae44e..9009d136e 160000 --- a/Submodules/SteamVR +++ b/Submodules/SteamVR @@ -1 +1 @@ -Subproject commit dd64ae44ef8e71f2d8d0bc271e1e9f1b4aa276db +Subproject commit 9009d136ed339965a4eba9cce396d1fb0cc01e81 diff --git a/Submodules/Ultraleap b/Submodules/Ultraleap index ce8c19857..02dbf51d6 160000 --- a/Submodules/Ultraleap +++ b/Submodules/Ultraleap @@ -1 +1 @@ -Subproject commit ce8c198572fc26a28bf32439827a8b4ee101bd06 +Subproject commit 02dbf51d608e120a8c930b65de993329bcbd1692 diff --git a/Submodules/WindowsMixedReality b/Submodules/WindowsMixedReality index 385465f38..5b1afa413 160000 --- a/Submodules/WindowsMixedReality +++ b/Submodules/WindowsMixedReality @@ -1 +1 @@ -Subproject commit 385465f38204f4388703d596d51aeebeb60aea42 +Subproject commit 5b1afa41360132d5e21776009d0e7621d4e65d47