From 729a7d6930deb0f6c9d7d9c060006f5d9c876682 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Fri, 27 Mar 2020 22:14:58 -0400 Subject: [PATCH] Dev/configuration refactor (#139) * reserialized property changes from configuration refactor * updated configurations serialization * updated diagnostics window serialization * updated controller data provider serialization * updated spatial awareness serialization * updated core package dependency * updated packages * bumped sdk version --- ...dRealityBoundaryVisualizationProfile.asset | 2 +- .../DefaultMixedRealityCameraProfile.asset | 2 +- ...ityRegisteredServiceProvidersProfile.asset | 2 +- ...edRealityToolkitConfigurationProfile.asset | 2 +- ...MixedRealityDiagnosticsSystemProfile.asset | 32 ++++---- ...RealityControllerDataProviderProfile.asset | 2 +- ...enericOpenVRControllerMappingProfile.asset | 26 ++++++- ...GenericUnityControllerMappingProfile.asset | 2 +- ...DefaultLuminControllerMappingProfile.asset | 20 ++++- ...DefaultMouseControllerMappingProfile.asset | 12 ++- ...eOculusTouchControllerMappingProfile.asset | 2 +- ...aultOculusGoControllerMappingProfile.asset | 13 +++- ...OculusRemoteControllerMappingProfile.asset | 5 +- ...tOculusTouchControllerMappingProfile.asset | 2 +- ...tTouchScreenControllerMappingProfile.asset | 5 +- ...aultViveWandControllerMappingProfile.asset | 20 ++++- ...MixedRealityControllerMappingProfile.asset | 2 +- .../DefaultXboxControllerMappingProfile.asset | 2 +- ...ealityControllerDataProvidersProfile.asset | 74 +++++++++---------- ...ixedRealityControllerMappingProfiles.asset | 2 +- ...ealityControllerVisualizationProfile.asset | 2 +- .../DefaultMixedRealityGesturesProfile.asset | 2 +- ...tMixedRealityInputActionRulesProfile.asset | 2 +- ...faultMixedRealityInputActionsProfile.asset | 3 +- ...faultMixedRealityInputPointerProfile.asset | 3 +- ...efaultMixedRealityInputSystemProfile.asset | 3 +- ...ultMixedRealitySpeechCommandsProfile.asset | 2 +- ...DefaultMixedRealityNetworkingProfile.asset | 4 +- ...dRealityWebRtcNetworkProviderProfile.asset | 5 +- .../DefaultLuminMeshObserverProfile.asset | 4 +- ...RealitySpatialAwarenessSystemProfile.asset | 20 ++--- ...xedRealitySpatialMeshObserverProfile.asset | 4 +- package.json | 4 +- 33 files changed, 182 insertions(+), 105 deletions(-) diff --git a/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset b/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset index 236e0eb3..2c0f3524 100644 --- a/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset +++ b/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e50d0c2910ab4e8a9d14709c5f17506e, type: 3} m_Name: DefaultMixedRealityBoundaryVisualizationProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 boundaryHeight: 3 showFloor: 1 floorMaterial: {fileID: 2100000, guid: cff739f75e6f4d2aa27638b66200ef95, type: 2} diff --git a/DefaultProfiles/DefaultMixedRealityCameraProfile.asset b/DefaultProfiles/DefaultMixedRealityCameraProfile.asset index 944a1876..2a0a69ac 100644 --- a/DefaultProfiles/DefaultMixedRealityCameraProfile.asset +++ b/DefaultProfiles/DefaultMixedRealityCameraProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 50519740e1dd4b5f97f104c7dc8d6ae6, type: 3} m_Name: DefaultMixedRealityCameraProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 isCameraPersistent: 1 nearClipPlaneOpaqueDisplay: 0.1 cameraClearFlagsOpaqueDisplay: 1 diff --git a/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset b/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset index 3b62d305..3548e295 100644 --- a/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset +++ b/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 48c48e65a9914a9ab61b891d9b405064, type: 3} m_Name: DefaultMixedRealityRegisteredServiceProvidersProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 configurations: [] diff --git a/DefaultProfiles/DefaultMixedRealityToolkitConfigurationProfile.asset b/DefaultProfiles/DefaultMixedRealityToolkitConfigurationProfile.asset index 181906af..7d60a800 100644 --- a/DefaultProfiles/DefaultMixedRealityToolkitConfigurationProfile.asset +++ b/DefaultProfiles/DefaultMixedRealityToolkitConfigurationProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8053d706eb6545b99330d640fbe7e7d2, type: 3} m_Name: DefaultMixedRealityToolkitConfigurationProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 enableCameraSystem: 1 cameraSystemType: reference: XRTK.Services.CameraSystem.MixedRealityCameraSystem, XRTK diff --git a/DefaultProfiles/Diagnostics/DefaultMixedRealityDiagnosticsSystemProfile.asset b/DefaultProfiles/Diagnostics/DefaultMixedRealityDiagnosticsSystemProfile.asset index 5e1ac543..7d8de2fc 100644 --- a/DefaultProfiles/Diagnostics/DefaultMixedRealityDiagnosticsSystemProfile.asset +++ b/DefaultProfiles/Diagnostics/DefaultMixedRealityDiagnosticsSystemProfile.asset @@ -12,29 +12,29 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1564b9320d5f4bdf9823a35bb66d61a7, type: 3} m_Name: DefaultMixedRealityDiagnosticsSystemProfile m_EditorClassIdentifier: - isCustomProfile: 0 - diagnosticsWindowPrefab: {fileID: 2161880003638299081, guid: be9153b959e0d4d4aa50a4a1a6617daa, - type: 3} - showDiagnosticsWindowOnStart: 1 - registeredDiagnosticsDataProviders: - - dataProviderType: + isEditable: 0 + configurations: + - instancedType: reference: XRTK.Services.DiagnosticsSystem.MixedRealityMemoryDiagnosticsDataProvider, XRTK - dataProviderName: Memory Diagnostics Data Provider - priority: 1 + name: Memory Diagnostics Data Provider + priority: 0 runtimePlatform: -1 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Services.DiagnosticsSystem.MixedRealityFrameDiagnosticsDataProvider, XRTK - dataProviderName: Frame Diagnostics Data Provider + name: Frame Diagnostics Data Provider priority: 1 runtimePlatform: -1 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Services.DiagnosticsSystem.MixedRealityConsoleDiagnosticsDataProvider, XRTK - dataProviderName: Console Diagnostics Data Provider - priority: 1 + name: Console Diagnostics Data Provider + priority: 2 runtimePlatform: -1 - profile: {fileID: 0} + configurationProfile: {fileID: 0} + diagnosticsWindowPrefab: {fileID: 2161880003638299081, guid: be9153b959e0d4d4aa50a4a1a6617daa, + type: 3} + showDiagnosticsWindowOnStart: 1 diff --git a/DefaultProfiles/Input/ControllerDataProviders/DefaultWindowsMixedRealityControllerDataProviderProfile.asset b/DefaultProfiles/Input/ControllerDataProviders/DefaultWindowsMixedRealityControllerDataProviderProfile.asset index fd80bc7b..f8d464d0 100644 --- a/DefaultProfiles/Input/ControllerDataProviders/DefaultWindowsMixedRealityControllerDataProviderProfile.asset +++ b/DefaultProfiles/Input/ControllerDataProviders/DefaultWindowsMixedRealityControllerDataProviderProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe9eeb08f95b1c1419ad17953d9a48ee, type: 3} m_Name: DefaultWindowsMixedRealityControllerDataProviderProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 manipulationGestures: 12 navigationGestures: 112 useRailsNavigation: 0 diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset index 327e064a..c40ff6eb 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca432493baa34f69a0297ba33d31ab23, type: 3} m_Name: DefaultGenericOpenVRControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Generic OpenVR Controller Left @@ -30,6 +30,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -43,6 +44,7 @@ MonoBehaviour: description: Trigger axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_9 axisCodeY: invertXAxis: 0 @@ -56,6 +58,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: AXIS_9 axisCodeY: invertXAxis: 0 @@ -69,6 +72,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 344 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -82,6 +86,7 @@ MonoBehaviour: description: Grip Press axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_11 axisCodeY: invertXAxis: 0 @@ -95,6 +100,7 @@ MonoBehaviour: description: Teleport Direction axisConstraint: 4 keyCode: 0 + inputName: axisCodeX: AXIS_1 axisCodeY: AXIS_2 invertXAxis: 0 @@ -108,6 +114,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 346 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -121,6 +128,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 338 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -134,6 +142,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 332 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -147,6 +156,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 333 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -160,6 +170,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 348 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -173,6 +184,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: AXIS_17 axisCodeY: AXIS_18 invertXAxis: 0 @@ -192,6 +204,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -205,6 +218,7 @@ MonoBehaviour: description: Trigger axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_10 axisCodeY: invertXAxis: 0 @@ -218,6 +232,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: AXIS_10 axisCodeY: invertXAxis: 0 @@ -231,6 +246,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 345 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -244,6 +260,7 @@ MonoBehaviour: description: Grip Press axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_12 axisCodeY: invertXAxis: 0 @@ -257,6 +274,7 @@ MonoBehaviour: description: Teleport Direction axisConstraint: 4 keyCode: 0 + inputName: axisCodeX: AXIS_4 axisCodeY: AXIS_5 invertXAxis: 0 @@ -270,6 +288,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 347 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -283,6 +302,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 339 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -296,6 +316,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 330 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -309,6 +330,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 331 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -322,6 +344,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 349 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -335,6 +358,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: AXIS_19 axisCodeY: AXIS_20 invertXAxis: 0 diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset index 923670b9..68fd9cd8 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 61724940349b4ef2961efaab3ed51cb8, type: 3} m_Name: DefaultGenericUnityControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Generic Unity Controller diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset index 65ed63af..8a6d398c 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8edcd6f437a8f024190e49cc25f4734e, type: 3} m_Name: DefaultLuminControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Lumin Motion Controller Left @@ -30,6 +30,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -43,6 +44,7 @@ MonoBehaviour: description: Trigger axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -56,6 +58,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -69,6 +72,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -82,6 +86,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -95,6 +100,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -108,6 +114,7 @@ MonoBehaviour: description: Scroll axisConstraint: 4 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -121,6 +128,7 @@ MonoBehaviour: description: Grip Press axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -134,6 +142,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -153,6 +162,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -166,6 +176,7 @@ MonoBehaviour: description: Trigger axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -179,6 +190,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -192,6 +204,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -205,6 +218,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -218,6 +232,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -231,6 +246,7 @@ MonoBehaviour: description: Scroll axisConstraint: 4 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -244,6 +260,7 @@ MonoBehaviour: description: Grip Press axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -257,6 +274,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset index 0dcac3fd..646f6684 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a4b26248d1594598be5962b186e4d395, type: 3} m_Name: DefaultMouseControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Mouse Input @@ -30,6 +30,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -43,6 +44,7 @@ MonoBehaviour: description: Mouse Delta axisConstraint: 4 keyCode: 0 + inputName: axisCodeX: Mouse Y axisCodeY: Mouse X invertXAxis: 1 @@ -56,6 +58,7 @@ MonoBehaviour: description: Scroll axisConstraint: 4 keyCode: 0 + inputName: axisCodeX: Mouse ScrollWheel axisCodeY: Mouse ScrollWheel invertXAxis: 1 @@ -69,6 +72,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 323 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -82,6 +86,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 324 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -95,6 +100,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 325 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -108,6 +114,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 326 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -121,6 +128,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 327 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -134,6 +142,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 328 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -147,6 +156,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 329 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultNativeOculusTouchControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultNativeOculusTouchControllerMappingProfile.asset index 2a86a78c..c441255e 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultNativeOculusTouchControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultNativeOculusTouchControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ad754132a294fad4490673a98acb2ef9, type: 3} m_Name: DefaultNativeOculusTouchControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 1 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Oculus Touch Controller Left diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultOculusGoControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultOculusGoControllerMappingProfile.asset index 1214797e..0cba587c 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultOculusGoControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultOculusGoControllerMappingProfile.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e1d60560d5d91514ba18190557662a43, type: 3} m_Name: DefaultOculusGoControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 - parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2} + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Oculus Go Controller @@ -31,6 +30,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -44,6 +44,7 @@ MonoBehaviour: description: Trigger axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_10 axisCodeY: invertXAxis: 0 @@ -57,6 +58,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: AXIS_10 axisCodeY: invertXAxis: 0 @@ -70,6 +72,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 345 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -83,6 +86,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 337 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -96,6 +100,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 347 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -109,6 +114,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 339 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -122,7 +128,8 @@ MonoBehaviour: description: Teleport Direction axisConstraint: 4 keyCode: 0 + inputName: axisCodeX: AXIS_4 axisCodeY: AXIS_5 invertXAxis: 0 - invertYAxis: 0 \ No newline at end of file + invertYAxis: 0 diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset index 67fc4a18..a8bcafad 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4f17f827e08945279699139b64b44d68, type: 3} m_Name: DefaultOculusRemoteControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Oculus Remote Controller @@ -30,6 +30,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: AXIS_5 axisCodeY: AXIS_6 invertXAxis: 0 @@ -43,6 +44,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 330 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -56,6 +58,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 331 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset index 4271e5aa..72e77766 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3ae182fe909d4e03ab1523c0c74b17f8, type: 3} m_Name: DefaultOculusTouchControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Oculus Touch Controller Left diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset index aecf300c..04b0c925 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dabbad6e31fe49b2882850ce3ee225c8, type: 3} m_Name: DefaultTouchScreenControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Touch Screen Input @@ -30,6 +30,7 @@ MonoBehaviour: description: Mouse Delta axisConstraint: 4 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -43,6 +44,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -56,6 +58,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset index a72fcf39..20f10fcb 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dd95b05f91204700a86b9a6a86856064, type: 3} m_Name: DefaultViveWandControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Vive Wand Controller Left @@ -30,6 +30,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -43,6 +44,7 @@ MonoBehaviour: description: Trigger axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_9 axisCodeY: invertXAxis: 0 @@ -56,6 +58,7 @@ MonoBehaviour: description: Select axisConstraint: 2 keyCode: 0 + inputName: axisCodeX: AXIS_9 axisCodeY: invertXAxis: 0 @@ -69,6 +72,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 344 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -82,6 +86,7 @@ MonoBehaviour: description: Grip Press axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_11 axisCodeY: invertXAxis: 0 @@ -95,6 +100,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: AXIS_1 axisCodeY: AXIS_2 invertXAxis: 0 @@ -108,6 +114,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 346 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -121,6 +128,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 338 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -134,6 +142,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 332 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -153,6 +162,7 @@ MonoBehaviour: description: Pointer Pose axisConstraint: 7 keyCode: 0 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -166,6 +176,7 @@ MonoBehaviour: description: Trigger axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_10 axisCodeY: invertXAxis: 0 @@ -179,6 +190,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: AXIS_10 axisCodeY: invertXAxis: 0 @@ -192,6 +204,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 345 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -205,6 +218,7 @@ MonoBehaviour: description: Grip Press axisConstraint: 3 keyCode: 0 + inputName: axisCodeX: AXIS_12 axisCodeY: invertXAxis: 0 @@ -218,6 +232,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 0 + inputName: axisCodeX: AXIS_4 axisCodeY: AXIS_5 invertXAxis: 0 @@ -231,6 +246,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 347 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -244,6 +260,7 @@ MonoBehaviour: description: None axisConstraint: 0 keyCode: 339 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 @@ -257,6 +274,7 @@ MonoBehaviour: description: Menu axisConstraint: 2 keyCode: 330 + inputName: axisCodeX: axisCodeY: invertXAxis: 0 diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset index a99ea45a..05df1bde 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a77269983a934c18a85a96fdff6e0ef6, type: 3} m_Name: DefaultWindowsMixedRealityControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Windows Mixed Reality HoloLens Hand Input diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset index 9a6cb5f7..8916df8a 100644 --- a/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset +++ b/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65b5b96daf57415a8080c7ef4d929e15, type: 3} m_Name: DefaultXboxControllerMappingProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 hasSetupDefaults: 1 controllerMappings: - description: Xbox Controller diff --git a/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset index f3634b29..0cc83d40 100644 --- a/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset +++ b/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset @@ -12,61 +12,61 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d628c3f3d8034aa7a4c414bf96227e1a, type: 3} m_Name: DefaultMixedRealityControllerDataProvidersProfile m_EditorClassIdentifier: - isCustomProfile: 0 - registeredControllerDataProviders: - - dataProviderType: + isEditable: 0 + configurations: + - instancedType: reference: XRTK.Providers.Controllers.UnityInput.MouseDataProvider, XRTK - dataProviderName: Mouse Controller Data Provider - priority: 1 + name: Mouse Controller Data Provider + priority: 0 runtimePlatform: 31 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Providers.Controllers.UnityInput.UnityTouchDataProvider, XRTK - dataProviderName: Touch Screen Controller Data Provider + name: Touch Screen Controller Data Provider priority: 1 runtimePlatform: 223 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Providers.Controllers.UnityInput.UnityJoystickDataProvider, XRTK - dataProviderName: Unity Joystick Controller Data Provider - priority: 1 + name: Unity Joystick Controller Data Provider + priority: 2 runtimePlatform: 223 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Providers.Controllers.OpenVR.OpenVRDataProvider, XRTK - dataProviderName: Open VR Controller Data Provider - priority: 2 + name: Open VR Controller Data Provider + priority: 3 runtimePlatform: 31 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.WindowsMixedReality.Controllers.WindowsMixedRealityControllerDataProvider, XRTK.WindowsMixedReality - dataProviderName: Windows Mixed Reality Controller Data Provider - priority: 1 + name: Windows Mixed Reality Controller Data Provider + priority: 4 runtimePlatform: 17 - profile: {fileID: 11400000, guid: f0d940cf9cc45184bba3adf6d1350849, type: 2} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Providers.Controllers.Speech.WindowsSpeechDataProvider, XRTK - dataProviderName: Windows Speech Data Provider - priority: 1 + name: Windows Speech Data Provider + priority: 5 runtimePlatform: 19 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Providers.Controllers.Speech.WindowsDictationDataProvider, XRTK - dataProviderName: Windows Dictation Data Provider - priority: 1 + name: Windows Dictation Data Provider + priority: 6 runtimePlatform: 19 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Lumin.Controllers.LuminControllerDataProvider, XRTK.Lumin - dataProviderName: Lumin Controller Data Provider - priority: 1 + name: Lumin Controller Data Provider + priority: 7 runtimePlatform: 33 - profile: {fileID: 0} - - dataProviderType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Oculus.Controllers.OculusControllerDataProvider, XRTK.Oculus - dataProviderName: Oculus Controller Data Provider - priority: 1 + name: Oculus Controller Data Provider + priority: 8 runtimePlatform: 67 - profile: {fileID: 0} + configurationProfile: {fileID: 0} diff --git a/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset b/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset index afc82c69..65b38bc6 100644 --- a/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset +++ b/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a77a13b8e0bc48acaa8594833e47d96c, type: 3} m_Name: DefaultMixedRealityControllerMappingProfiles m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 controllerMappingProfiles: - {fileID: 11400000, guid: a3d986e05a0242d9b4b4d1be1543149b, type: 2} - {fileID: 11400000, guid: 037f788d893441f289c4f87185f262cb, type: 2} diff --git a/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset index 4fca6607..7c077b20 100644 --- a/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset +++ b/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e889ee36d1db42b482979f81f550d3b0, type: 3} m_Name: DefaultMixedRealityControllerVisualizationProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 renderMotionControllers: 1 controllerVisualizationType: reference: XRTK.SDK.UX.Controllers.DefaultMixedRealityControllerVisualizer, XRTK.SDK diff --git a/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset index f3e48189..d98456c2 100644 --- a/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset +++ b/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cc4e210e45f74f1c8729d17634bc5dfd, type: 3} m_Name: DefaultMixedRealityGesturesProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 gestures: - description: Hold gestureType: 3 diff --git a/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset index 6dc8c8f2..68a3fde1 100644 --- a/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset +++ b/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 08ea25856c6c4f5c80992c2c14a81027, type: 3} m_Name: DefaultMixedRealityInputActionRulesProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 inputActionRulesDigital: [] inputActionRulesSingleAxis: [] inputActionRulesDualAxis: [] diff --git a/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset index 667ab597..ba908360 100644 --- a/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset +++ b/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e7586d5ce1704458aad54224cfafad39, type: 3} m_Name: DefaultMixedRealityInputActionsProfile m_EditorClassIdentifier: - isCustomProfile: 0 - parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} + isEditable: 0 inputActions: - id: 1 description: Select diff --git a/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset index 6aa5c572..92f9f442 100644 --- a/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset +++ b/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c156ea3e1a7a493dac236ed84c4a819a, type: 3} m_Name: DefaultMixedRealityInputPointerProfile m_EditorClassIdentifier: - isCustomProfile: 0 - parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2} + isEditable: 0 pointingExtent: 10 pointingRaycastLayerMasks: - serializedVersion: 2 diff --git a/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset index 662cdb69..c0947037 100644 --- a/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset +++ b/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 96a16673d92d4e8fa24750357b3cf906, type: 3} m_Name: DefaultMixedRealityInputSystemProfile m_EditorClassIdentifier: - isCustomProfile: 0 - parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2} + isEditable: 0 focusProviderType: reference: XRTK.Services.InputSystem.FocusProvider, XRTK inputActionsProfile: {fileID: 11400000, guid: 399335ccc89c4d12b79f3539ca7771db, diff --git a/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset b/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset index b253f2fd..d0f571e7 100644 --- a/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset +++ b/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7108692c36a84dfaaa0984f6c5d6d3a3, type: 3} m_Name: DefaultMixedRealitySpeechCommandsProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 startBehavior: 0 recognitionConfidenceLevel: 1 speechCommands: diff --git a/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset b/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset index 60ec6203..4fc3edca 100644 --- a/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset +++ b/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset @@ -12,5 +12,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 47c0c9c4be8544379a5571fad761efd8, type: 3} m_Name: DefaultMixedRealityNetworkingProfile m_EditorClassIdentifier: - isCustomProfile: 0 - registeredNetworkDataProviders: [] + isEditable: 0 + configurations: [] diff --git a/DefaultProfiles/Networking/DefaultMixedRealityWebRtcNetworkProviderProfile.asset b/DefaultProfiles/Networking/DefaultMixedRealityWebRtcNetworkProviderProfile.asset index 31ac69bc..eeb741f3 100644 --- a/DefaultProfiles/Networking/DefaultMixedRealityWebRtcNetworkProviderProfile.asset +++ b/DefaultProfiles/Networking/DefaultMixedRealityWebRtcNetworkProviderProfile.asset @@ -4,11 +4,12 @@ MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: b7b32ac7ae544be5b412c3ea6864df75, type: 3} m_Name: DefaultMixedRealityWebRtcNetworkProviderProfile m_EditorClassIdentifier: - isCustomProfile: 0 + isEditable: 0 diff --git a/DefaultProfiles/SpatialAwareness/DefaultLuminMeshObserverProfile.asset b/DefaultProfiles/SpatialAwareness/DefaultLuminMeshObserverProfile.asset index 0b92c345..4e3e07b4 100644 --- a/DefaultProfiles/SpatialAwareness/DefaultLuminMeshObserverProfile.asset +++ b/DefaultProfiles/SpatialAwareness/DefaultLuminMeshObserverProfile.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b98af3642eef5f145831fbb9452531ea, type: 3} m_Name: DefaultLuminMeshObserverProfile m_EditorClassIdentifier: - isCustomProfile: 0 - parentProfile: {fileID: 11400000, guid: 41ce31a4954544c58d16f6b3c4c88f4b, type: 2} + isEditable: 0 startupBehavior: 0 observationExtents: {x: 3, y: 3, z: 3} isStationaryObserver: 0 @@ -23,7 +22,6 @@ MonoBehaviour: meshLevelOfDetail: 2000 meshTrianglesPerCubicMeter: 0 meshRecalculateNormals: 1 - meshDisplayOption: 1 meshVisibleMaterial: {fileID: 2100000, guid: 58998db165b741089929938ea4d1b249, type: 2} meshOcclusionMaterial: {fileID: 2100000, guid: 0062b17981f34cf18ad1f9060db0cb2b, type: 2} diff --git a/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset b/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset index d4eef185..318d912f 100644 --- a/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset +++ b/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset @@ -12,19 +12,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 80a1ad34855542cbbd15a6a6dde2e935, type: 3} m_Name: DefaultMixedRealitySpatialAwarenessSystemProfile m_EditorClassIdentifier: - isCustomProfile: 0 - registeredSpatialObserverDataProviders: - - spatialObserverType: + isEditable: 0 + configurations: + - instancedType: reference: XRTK.WindowsMixedReality.SpatialObservers.WindowsMixedRealitySpatialMeshObserver, XRTK.WindowsMixedReality - spatialObserverName: Windows Mixed Reality Spatial Mesh Observer - priority: 5 + name: Windows Mixed Reality Spatial Mesh Observer + priority: 0 runtimePlatform: 17 - profile: {fileID: 11400000, guid: 8e73975fd19e4224b46d0b0fea26349b, type: 2} - - spatialObserverType: + configurationProfile: {fileID: 0} + - instancedType: reference: XRTK.Lumin.SpatialObservers.LuminSpatialMeshObserver, XRTK.Lumin - spatialObserverName: Lumin Spatial Observer Data Provider - priority: 5 + name: Lumin Spatial Observer Data Provider + priority: 1 runtimePlatform: 32 - profile: {fileID: 11400000, guid: 6cbcb6266beaa724780d064525cf2896, type: 2} + configurationProfile: {fileID: 0} meshDisplayOption: 0 diff --git a/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset b/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset index dbeb1bbd..5b3fb908 100644 --- a/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset +++ b/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 68f87d1ac67141afaf834f81454c9aeb, type: 3} m_Name: DefaultWindowsMixedRealitySpatialMeshObserverProfile m_EditorClassIdentifier: - isCustomProfile: 0 - parentProfile: {fileID: 11400000, guid: 41ce31a4954544c58d16f6b3c4c88f4b, type: 2} + isEditable: 0 startupBehavior: 0 observationExtents: {x: 3, y: 3, z: 3} isStationaryObserver: 0 @@ -23,7 +22,6 @@ MonoBehaviour: meshLevelOfDetail: 0 meshTrianglesPerCubicMeter: 0 meshRecalculateNormals: 1 - meshDisplayOption: 0 meshVisibleMaterial: {fileID: 2100000, guid: 58998db165b741089929938ea4d1b249, type: 2} meshOcclusionMaterial: {fileID: 2100000, guid: 0062b17981f34cf18ad1f9060db0cb2b, type: 2} diff --git a/package.json b/package.json index fc9d1da2..0c123972 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "com.xrtk.sdk", "displayName": "XRTK.SDK", "description": "The SDK for the Mixed Reality Toolkit", - "version": "0.1.19", + "version": "0.1.20", "unity": "2019.1", "license": "MIT", "repository": { @@ -12,7 +12,7 @@ "src": "Assets/XRTK.Core", "author": "XRTK Team (https://github.com/XRTK)", "dependencies": { - "com.xrtk.core": "0.1.30", + "com.xrtk.core": "0.1.31", "com.unity.textmeshpro": "1.0.0" } } \ No newline at end of file