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
XRTK · Mar 28, 2020 · 729a7d6 · 729a7d6
1 parent 2455468
commit 729a7d6
Show file tree

Hide file tree

Showing 33 changed files with 182 additions and 105 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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/...put/ControllerDataProviders/DefaultWindowsMixedRealityControllerDataProviderProfile.asset b/...put/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
@@ -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
@@ -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