Skip to content

Commit 46a7c7a

Browse files
authored
Merge pull request #5 from Aryzon/controller-input-changes
Controller input changes
2 parents 1c607c9 + bd6bbea commit 46a7c7a

27 files changed

+6717
-2927
lines changed

EditorScripts/AryzonEditor.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ public class AryzonEditor : Editor
2424

2525
SerializedProperty trackingEngineProp;
2626

27-
SerializedProperty setAryzonModeOnStartProp;
27+
SerializedProperty addEditorMovementControlsProp;
28+
29+
SerializedProperty setAryzonModeOnStartProp;
2830
SerializedProperty blackBackgroundProp;
2931

3032
SerializedProperty onStartProp;
@@ -77,7 +79,8 @@ void OnEnable()
7779
trackingEngineProp = serializedObject.FindProperty("trackingEngine");
7880

7981
setAryzonModeOnStartProp = serializedObject.FindProperty("setAryzonModeOnStart");
80-
blackBackgroundProp = serializedObject.FindProperty("blackBackgroundInStereoscopicMode");
82+
addEditorMovementControlsProp = serializedObject.FindProperty("editorMovementsControls");
83+
blackBackgroundProp = serializedObject.FindProperty("blackBackgroundInStereoscopicMode");
8184

8285
m_OnClickProperty = serializedObject.FindProperty("onClick");
8386

@@ -146,7 +149,8 @@ public override void OnInspectorGUI()
146149

147150
EditorGUILayout.PropertyField(setAryzonModeOnStartProp, new GUIContent("Set Aryzon mode on Start"), GUILayout.Height(fieldHeight));
148151
EditorGUILayout.PropertyField(blackBackgroundProp, new GUIContent("Auto setup cameras for AR/MR", "This will disable the camera feed in stereoscopic mode (ARFoundation only) and set its Clear Flags to Solid Color black (any tracking engine). This is recommended for MR use, for VR you may want to render the Sky Box, in that case you will need to disable the camera feed manually."), GUILayout.Height(fieldHeight));
149-
EditorGUILayout.Space();
152+
EditorGUILayout.PropertyField(addEditorMovementControlsProp, new GUIContent("Add movement controls (editor only)"), GUILayout.Height(fieldHeight));
153+
EditorGUILayout.Space();
150154
EditorGUILayout.Space();
151155

152156
aryzonManager.showAryzonModeEvents = EditorGUILayout.Foldout(EditorPrefs.GetBool("showAryzonModeEvents", false), "Aryzon mode events");
47.6 KB
Loading

Runtime/Graphics/AryzonControllerBlack.png.meta

Lines changed: 146 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
7.3 KB
Loading

Runtime/Graphics/AryzonControllerTurnOn.png.meta

Lines changed: 146 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)