updated all of the default sdk profiles with new parent references. (#29

) * updated all of the default sdk profiles with new parent references. * bumped package version and xrtk.core requirement * updated packages and editor * updated wmr package
XRTK · May 7, 2019 · cf24a2d · cf24a2d
1 parent 7d6667d
commit cf24a2d
Show file tree

Hide file tree

Showing 27 changed files with 37 additions and 12 deletions.
diff --git a/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset b/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset
@@ -4,14 +4,16 @@
 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: e50d0c2910ab4e8a9d14709c5f17506e, type: 3}
   m_Name: DefaultMixedRealityBoundaryVisualizationProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
   boundaryHeight: 3
   showFloor: 1
   floorMaterial: {fileID: 2100000, guid: cff739f75e6f4d2aa27638b66200ef95, type: 2}

diff --git a/DefaultProfiles/DefaultMixedRealityCameraProfile.asset b/DefaultProfiles/DefaultMixedRealityCameraProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityCameraProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
   isCameraPersistent: 1
   nearClipPlaneOpaqueDisplay: 0.1
   cameraClearFlagsOpaqueDisplay: 1
@@ -21,4 +22,4 @@ MonoBehaviour:
   nearClipPlaneTransparentDisplay: 0.1
   cameraClearFlagsTransparentDisplay: 2
   backgroundColorTransparentDisplay: {r: 0, g: 0, b: 0, a: 0}
-  holoLensQualityLevel: 0
+  transparentQualityLevel: 0
diff --git a/DefaultProfiles/DefaultMixedRealityDiagnosticsProfile.asset b/DefaultProfiles/DefaultMixedRealityDiagnosticsProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityDiagnosticsProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
   visible: 0
   showCpu: 1
   handlerType:

diff --git a/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset b/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset
@@ -13,4 +13,5 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityRegisteredServiceProvidersProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
   configurations: []
diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultGenericOpenVRControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Generic OpenVR Controller Left

diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultGenericUnityControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Generic Unity Controller

diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultLuminControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Lumin Motion Controller Left

diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMouseControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Mouse Input

diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultOculusRemoteControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Oculus Remote Controller

diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultOculusTouchControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Oculus Touch Controller Left

diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultTouchScreenControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Touch Screen Input

diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultViveWandControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Vive Wand Controller Left

diff --git a/...rofiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset b/...rofiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultWindowsMixedRealityControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Windows Mixed Reality HoloLens Hand Input

diff --git a/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset b/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultXboxControllerMappingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
   hasSetupDefaults: 1
   controllerMappings:
   - description: Xbox Controller

diff --git a/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityControllerDataProvidersProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
   registeredControllerDataProviders:
   - dataProviderType:
       reference: XRTK.Providers.Controllers.UnityInput.MouseDataProvider, XRTK

diff --git a/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset b/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityControllerMappingProfiles
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
   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
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityControllerVisualizationProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
   renderMotionControllers: 1
   controllerVisualizationType:
     reference: XRTK.SDK.UX.Controllers.DefaultMixedRealityControllerVisualizer, XRTK.SDK

diff --git a/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset
@@ -13,11 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityGesturesProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
-  manipulationGestures: 15
-  navigationGestures: 112
-  useRailsNavigation: 0
-  railsNavigationGestures: 896
-  windowsGestureAutoStart: 0
+  parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
   gestures:
   - description: Hold
     gestureType: 3

diff --git a/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset
@@ -4,14 +4,16 @@
 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: 08ea25856c6c4f5c80992c2c14a81027, type: 3}
   m_Name: DefaultMixedRealityInputActionRulesProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
   inputActionRulesDigital: []
   inputActionRulesSingleAxis: []
   inputActionRulesDualAxis: []

diff --git a/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityInputActionsProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
   inputActions:
   - id: 1
     description: Select

diff --git a/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityInputPointerProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
   pointingExtent: 10
   pointingRaycastLayerMasks:
   - serializedVersion: 2

diff --git a/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset b/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealityInputSystemProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
   focusProviderType:
     reference: XRTK.Services.InputSystem.FocusProvider, XRTK
   inputActionsProfile: {fileID: 11400000, guid: 399335ccc89c4d12b79f3539ca7771db,

diff --git a/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset b/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset
@@ -4,14 +4,16 @@
 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: 7108692c36a84dfaaa0984f6c5d6d3a3, type: 3}
   m_Name: DefaultMixedRealitySpeechCommandsProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
   startBehavior: 0
   recognitionConfidenceLevel: 1
   speechCommands:

diff --git a/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset b/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset
@@ -4,12 +4,14 @@
 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: 47c0c9c4be8544379a5571fad761efd8, type: 3}
   m_Name: DefaultMixedRealityNetworkingProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
   registeredNetworkDataProviders: []
diff --git a/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset b/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultMixedRealitySpatialAwarenessSystemProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
   registeredSpatialObserverDataProviders:
   - spatialObserverType:
       reference: XRTK.WindowsMixedReality.SpatialObservers.WindowsMixedRealitySpatialMeshObserver,

diff --git a/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset b/DefaultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset
@@ -13,6 +13,7 @@ MonoBehaviour:
   m_Name: DefaultWindowsMixedRealitySpatialMeshObserverProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
+  parentProfile: {fileID: 11400000, guid: 41ce31a4954544c58d16f6b3c4c88f4b, type: 2}
   startupBehavior: 0
   observationExtents: {x: 3, y: 3, z: 3}
   isStationaryObserver: 0

diff --git 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.6",
+  "version": "0.1.7",
   "unity": "2019.1",
   "license": "MIT",
   "repository": {
@@ -12,6 +12,6 @@
   "src": "Assets/XRTK.Core",
   "author": "XRTK Team (https://github.com/XRTK)",
   "dependencies": {
-    "com.xrtk.core": "0.1.9"
+    "com.xrtk.core": "0.1.10"
   }
 }