Skip to content
This repository has been archived by the owner on Aug 11, 2024. It is now read-only.

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

Merged
merged 4 commits into from
May 7, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
774b539
updated all of the default sdk profiles with new parent references.
StephenHodgson May 6, 2019
f81d0b8
bumped package version and xrtk.core requirement
StephenHodgson May 7, 2019
ea3f3b2
updated packages and editor
StephenHodgson May 7, 2019
5ed0362
updated wmr package
StephenHodgson May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ...ckages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityBoundaryVisualizationProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
3 changes: 2 additions & 1 deletion XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityCameraProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -21,4 +22,4 @@ MonoBehaviour:
nearClipPlaneTransparentDisplay: 0.1
cameraClearFlagsTransparentDisplay: 2
backgroundColorTransparentDisplay: {r: 0, g: 0, b: 0, a: 0}
holoLensQualityLevel: 0
transparentQualityLevel: 0
1 change: 1 addition & 0 deletions XRTK.SDK/Packages/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityDiagnosticsProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: DefaultMixedRealityDiagnosticsProfile
m_EditorClassIdentifier:
isCustomProfile: 0
parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
visible: 0
showCpu: 1
handlerType:
Expand Down
1 change: 1 addition & 0 deletions ...s/com.xrtk.sdk/DefaultProfiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ MonoBehaviour:
m_Name: DefaultMixedRealityRegisteredServiceProvidersProfile
m_EditorClassIdentifier:
isCustomProfile: 0
parentProfile: {fileID: 11400000, guid: 99874ef12e4f4f27ae4888ce1c693090, type: 2}
configurations: []
1 change: 1 addition & 0 deletions ...faultProfiles/Input/ControllerMappings/DefaultGenericOpenVRControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...efaultProfiles/Input/ControllerMappings/DefaultGenericUnityControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...k.sdk/DefaultProfiles/Input/ControllerMappings/DefaultLuminControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...k.sdk/DefaultProfiles/Input/ControllerMappings/DefaultMouseControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...efaultProfiles/Input/ControllerMappings/DefaultOculusRemoteControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...DefaultProfiles/Input/ControllerMappings/DefaultTouchScreenControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...dk/DefaultProfiles/Input/ControllerMappings/DefaultViveWandControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...rofiles/Input/ControllerMappings/DefaultWindowsMixedRealityControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...tk.sdk/DefaultProfiles/Input/ControllerMappings/DefaultXboxControllerMappingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...om.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerDataProvidersProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...ges/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerMappingProfiles.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
1 change: 1 addition & 0 deletions ...om.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityControllerVisualizationProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 1 addition & 5 deletions ....SDK/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityGesturesProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion ...kages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionRulesProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
Expand Down
1 change: 1 addition & 0 deletions .../Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputActionsProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: DefaultMixedRealityInputActionsProfile
m_EditorClassIdentifier:
isCustomProfile: 0
parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
inputActions:
- id: 1
description: Select
Expand Down
1 change: 1 addition & 0 deletions .../Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputPointerProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: DefaultMixedRealityInputPointerProfile
m_EditorClassIdentifier:
isCustomProfile: 0
parentProfile: {fileID: 11400000, guid: a176466fbf4e44a087639abca7e5ba47, type: 2}
pointingExtent: 10
pointingRaycastLayerMasks:
- serializedVersion: 2
Expand Down
1 change: 1 addition & 0 deletions ...K/Packages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealityInputSystemProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 3 additions & 1 deletion ...ackages/com.xrtk.sdk/DefaultProfiles/Input/DefaultMixedRealitySpeechCommandsProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 3 additions & 1 deletion ...ckages/com.xrtk.sdk/DefaultProfiles/Networking/DefaultMixedRealityNetworkingProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
1 change: 1 addition & 0 deletions ...k/DefaultProfiles/SpatialAwareness/DefaultMixedRealitySpatialAwarenessSystemProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions ...faultProfiles/SpatialAwareness/DefaultWindowsMixedRealitySpatialMeshObserverProfile.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions XRTK.SDK/Packages/com.xrtk.sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
18 changes: 9 additions & 9 deletions XRTK.SDK/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"com.unity.textmeshpro": "2.0.0",
"com.unity.xr.legacyinputhelpers": "2.0.2",
"com.unity.xr.oculus.standalone": "1.29.1",
"com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.9",
"com.xrtk.lumin": "https://github.com/XRTK/Lumin.git#0.1.1",
"com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.10",
"com.xrtk.lumin": "https://github.com/XRTK/Lumin.git#0.1.2",
"com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.5",
"com.xrtk.wmr": "https://github.com/XRTK/WindowsMixedReality.git#0.1.2",
"com.xrtk.wmr": "https://github.com/XRTK/WindowsMixedReality.git#0.1.3",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
Expand Down Expand Up @@ -42,20 +42,20 @@
},
"lock": {
"com.xrtk.core": {
"hash": "d4be87365d4a56d22bb908f3acc8b409cf10240c",
"revision": "0.1.9"
"hash": "69f4126007422a60fc0e26b8ccf846e0f7118574",
"revision": "0.1.10"
},
"com.xrtk.lumin": {
"hash": "45da20dee3740ee5781aa380c962f1aa361c7a7c",
"revision": "0.1.1"
"hash": "a196ab9a5e951eb79905a732dfbbd2a08becd78a",
"revision": "0.1.2"
},
"com.xrtk.upm-git-extension": {
"hash": "4e5c893cdbb28c82f8d23756696515108fe130ef",
"revision": "0.9.5"
},
"com.xrtk.wmr": {
"hash": "7b8d08a2318b9c5190608741debfb2d7078bdae7",
"revision": "0.1.2"
"hash": "40f707ba94f5b34d8969246ee980dbe9c3b8ff31",
"revision": "0.1.3"
}
}
}
4 changes: 2 additions & 2 deletions XRTK.SDK/ProjectSettings/ProjectVersion.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2019.1.0f2
m_EditorVersionWithRevision: 2019.1.0f2 (292b93d75a2c)
m_EditorVersion: 2019.1.1f1
m_EditorVersionWithRevision: 2019.1.1f1 (fef62e97e63b)