Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

updated profile inspector #55

Merged
merged 4 commits into from
Apr 1, 2020
Merged

updated profile inspector #55

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
8988de1
updated profile inspector
StephenHodgson Apr 1, 2020
a35dc3d
updated using statement
StephenHodgson Apr 1, 2020
e4836a6
Updated package dependencies
StephenHodgson Apr 1, 2020
f8db31c
updated packages
StephenHodgson Apr 1, 2020
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
2 changes: 1 addition & 1 deletion XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/Controllers/WindowsMixedRealityController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
using XRTK.Definitions.Devices;
using XRTK.Definitions.InputSystem;
using XRTK.Definitions.Utilities;
using XRTK.Extensions;
using XRTK.Interfaces.InputSystem;
using XRTK.Providers.Controllers;

#if UNITY_WSA
using UnityEngine;
using UnityEngine.XR.WSA.Input;
using XRTK.Extensions;
using XRTK.Services;
#endif

Expand Down
31 changes: 12 additions & 19 deletions ...ality/Packages/com.xrtk.wmr/Inspectors/WindowsMixedRealityDataProviderProfileInspector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Licensed under the MIT License. See LICENSE in the project root for license information.

using UnityEditor;
using UnityEngine;
using XRTK.Inspectors.Profiles;
using XRTK.Inspectors.Utilities;
using XRTK.WindowsMixedReality.Profiles;
Expand All @@ -12,32 +11,26 @@ namespace XRTK.WindowsMixedReality.Inspectors
[CustomEditor(typeof(WindowsMixedRealityControllerDataProviderProfile))]
public class WindowsMixedRealityDataProviderProfileInspector : BaseMixedRealityProfileInspector
{
private SerializedProperty windowsManipulationGestureSettings;
private SerializedProperty manipulationGestures;
private SerializedProperty useRailsNavigation;
private SerializedProperty windowsNavigationGestureSettings;
private SerializedProperty windowsRailsNavigationGestures;
private SerializedProperty navigationGestures;
private SerializedProperty railsNavigationGestures;
private SerializedProperty windowsGestureAutoStart;

protected override void OnEnable()
{
base.OnEnable();

windowsManipulationGestureSettings = serializedObject.FindProperty("manipulationGestures");
useRailsNavigation = serializedObject.FindProperty("useRailsNavigation");
windowsNavigationGestureSettings = serializedObject.FindProperty("navigationGestures");
windowsRailsNavigationGestures = serializedObject.FindProperty("railsNavigationGestures");
windowsGestureAutoStart = serializedObject.FindProperty("windowsGestureAutoStart");
manipulationGestures = serializedObject.FindProperty(nameof(manipulationGestures));
useRailsNavigation = serializedObject.FindProperty(nameof(useRailsNavigation));
navigationGestures = serializedObject.FindProperty(nameof(navigationGestures));
railsNavigationGestures = serializedObject.FindProperty(nameof(railsNavigationGestures));
windowsGestureAutoStart = serializedObject.FindProperty(nameof(windowsGestureAutoStart));
}

public override void OnInspectorGUI()
{
MixedRealityInspectorUtility.RenderMixedRealityToolkitLogo();

if (ThisProfile.ParentProfile != null &&
GUILayout.Button("Back to Controller Data Providers"))
{
Selection.activeObject = ThisProfile.ParentProfile;
}
RenderHeader();

EditorGUILayout.Space();
EditorGUILayout.LabelField("Windows Mixed Reality Controller Data Provider Settings", EditorStyles.boldLabel);
Expand All @@ -49,10 +42,10 @@ public override void OnInspectorGUI()
EditorGUILayout.Space();
EditorGUILayout.LabelField("Windows Gesture Settings", EditorStyles.boldLabel);
EditorGUILayout.PropertyField(windowsGestureAutoStart);
EditorGUILayout.PropertyField(windowsManipulationGestureSettings);
EditorGUILayout.PropertyField(windowsNavigationGestureSettings);
EditorGUILayout.PropertyField(manipulationGestures);
EditorGUILayout.PropertyField(navigationGestures);
EditorGUILayout.PropertyField(useRailsNavigation);
EditorGUILayout.PropertyField(windowsRailsNavigationGestures);
EditorGUILayout.PropertyField(railsNavigationGestures);
serializedObject.ApplyModifiedProperties();
}
}
Expand Down
4 changes: 2 additions & 2 deletions XRTK.WindowsMixedReality/Packages/com.xrtk.wmr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"mixed",
"reality"
],
"version": "0.1.11",
"version": "0.1.12",
"unity": "2019.1",
"license": "MIT",
"author": "XRTK Team (https://github.com/XRTK)",
"dependencies": {
"com.xrtk.core": "0.1.31",
"com.xrtk.core": "0.1.32",
"com.unity.xr.windowsmr.metro": "1.0.19"
}
}
2 changes: 1 addition & 1 deletion XRTK.WindowsMixedReality/Packages/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"com.unity.xr.legacyinputhelpers": "2.0.8",
"com.unity.xr.openvr.standalone": "1.0.5",
"com.unity.xr.windowsmr.metro": "1.0.19",
"com.xrtk.core": "0.1.31",
"com.xrtk.core": "0.1.32",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.animation": "1.0.0",
"com.unity.modules.assetbundle": "1.0.0",
Expand Down