Skip to content

Commit cf6723a

Browse files
first pass at controller viz refactoring.
1 parent 5973575 commit cf6723a

30 files changed

+477
-517
lines changed

Assets/MixedRealityToolkit-Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity

Lines changed: 101 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,105 @@ NavMeshSettings:
113113
debug:
114114
m_Flags: 0
115115
m_NavMeshData: {fileID: 0}
116+
--- !u!1 &134971634
117+
GameObject:
118+
m_ObjectHideFlags: 0
119+
m_PrefabParentObject: {fileID: 0}
120+
m_PrefabInternal: {fileID: 0}
121+
serializedVersion: 5
122+
m_Component:
123+
- component: {fileID: 134971635}
124+
- component: {fileID: 134971638}
125+
- component: {fileID: 134971637}
126+
- component: {fileID: 134971636}
127+
m_Layer: 0
128+
m_Name: UIRaycastCamera
129+
m_TagString: Untagged
130+
m_Icon: {fileID: 0}
131+
m_NavMeshLayer: 0
132+
m_StaticEditorFlags: 0
133+
m_IsActive: 1
134+
--- !u!4 &134971635
135+
Transform:
136+
m_ObjectHideFlags: 0
137+
m_PrefabParentObject: {fileID: 0}
138+
m_PrefabInternal: {fileID: 0}
139+
m_GameObject: {fileID: 134971634}
140+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
141+
m_LocalPosition: {x: 0, y: 0, z: 0}
142+
m_LocalScale: {x: 1, y: 1, z: 1}
143+
m_Children: []
144+
m_Father: {fileID: 1491404204}
145+
m_RootOrder: 0
146+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
147+
--- !u!114 &134971636
148+
MonoBehaviour:
149+
m_ObjectHideFlags: 0
150+
m_PrefabParentObject: {fileID: 0}
151+
m_PrefabInternal: {fileID: 0}
152+
m_GameObject: {fileID: 134971634}
153+
m_Enabled: 1
154+
m_EditorHideFlags: 0
155+
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
156+
m_Name:
157+
m_EditorClassIdentifier:
158+
m_HorizontalAxis: Horizontal
159+
m_VerticalAxis: Vertical
160+
m_SubmitButton: Submit
161+
m_CancelButton: Cancel
162+
m_InputActionsPerSecond: 10
163+
m_RepeatDelay: 0.5
164+
m_ForceModuleActive: 0
165+
--- !u!114 &134971637
166+
MonoBehaviour:
167+
m_ObjectHideFlags: 0
168+
m_PrefabParentObject: {fileID: 0}
169+
m_PrefabInternal: {fileID: 0}
170+
m_GameObject: {fileID: 134971634}
171+
m_Enabled: 1
172+
m_EditorHideFlags: 0
173+
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
174+
m_Name:
175+
m_EditorClassIdentifier:
176+
m_FirstSelected: {fileID: 0}
177+
m_sendNavigationEvents: 1
178+
m_DragThreshold: 10
179+
--- !u!20 &134971638
180+
Camera:
181+
m_ObjectHideFlags: 0
182+
m_PrefabParentObject: {fileID: 0}
183+
m_PrefabInternal: {fileID: 0}
184+
m_GameObject: {fileID: 134971634}
185+
m_Enabled: 0
186+
serializedVersion: 2
187+
m_ClearFlags: 3
188+
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
189+
m_NormalizedViewPortRect:
190+
serializedVersion: 2
191+
x: 0
192+
y: 0
193+
width: 1
194+
height: 1
195+
near clip plane: 0.1
196+
far clip plane: 1000
197+
field of view: 60
198+
orthographic: 1
199+
orthographic size: 0.5
200+
m_Depth: 0
201+
m_CullingMask:
202+
serializedVersion: 2
203+
m_Bits: 4294967295
204+
m_RenderingPath: -1
205+
m_TargetTexture: {fileID: 0}
206+
m_TargetDisplay: 1
207+
m_TargetEye: 3
208+
m_HDR: 0
209+
m_AllowMSAA: 0
210+
m_AllowDynamicResolution: 0
211+
m_ForceIntoRT: 0
212+
m_OcclusionCulling: 0
213+
m_StereoConvergence: 10
214+
m_StereoSeparation: 0.022
116215
--- !u!1001 &310729792
117216
Prefab:
118217
m_ObjectHideFlags: 0
@@ -220,105 +319,6 @@ Transform:
220319
m_PrefabParentObject: {fileID: 4753320988497866, guid: cf1e39a641f010e42a8168c9737d1803,
221320
type: 2}
222321
m_PrefabInternal: {fileID: 310729792}
223-
--- !u!1 &333528527
224-
GameObject:
225-
m_ObjectHideFlags: 0
226-
m_PrefabParentObject: {fileID: 0}
227-
m_PrefabInternal: {fileID: 0}
228-
serializedVersion: 5
229-
m_Component:
230-
- component: {fileID: 333528528}
231-
- component: {fileID: 333528531}
232-
- component: {fileID: 333528530}
233-
- component: {fileID: 333528529}
234-
m_Layer: 0
235-
m_Name: UIRaycastCamera
236-
m_TagString: Untagged
237-
m_Icon: {fileID: 0}
238-
m_NavMeshLayer: 0
239-
m_StaticEditorFlags: 0
240-
m_IsActive: 1
241-
--- !u!4 &333528528
242-
Transform:
243-
m_ObjectHideFlags: 0
244-
m_PrefabParentObject: {fileID: 0}
245-
m_PrefabInternal: {fileID: 0}
246-
m_GameObject: {fileID: 333528527}
247-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
248-
m_LocalPosition: {x: 0, y: 0, z: 0}
249-
m_LocalScale: {x: 1, y: 1, z: 1}
250-
m_Children: []
251-
m_Father: {fileID: 1491404204}
252-
m_RootOrder: 0
253-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
254-
--- !u!114 &333528529
255-
MonoBehaviour:
256-
m_ObjectHideFlags: 0
257-
m_PrefabParentObject: {fileID: 0}
258-
m_PrefabInternal: {fileID: 0}
259-
m_GameObject: {fileID: 333528527}
260-
m_Enabled: 1
261-
m_EditorHideFlags: 0
262-
m_Script: {fileID: 1077351063, guid: f70555f144d8491a825f0804e09c671c, type: 3}
263-
m_Name:
264-
m_EditorClassIdentifier:
265-
m_HorizontalAxis: Horizontal
266-
m_VerticalAxis: Vertical
267-
m_SubmitButton: Submit
268-
m_CancelButton: Cancel
269-
m_InputActionsPerSecond: 10
270-
m_RepeatDelay: 0.5
271-
m_ForceModuleActive: 0
272-
--- !u!114 &333528530
273-
MonoBehaviour:
274-
m_ObjectHideFlags: 0
275-
m_PrefabParentObject: {fileID: 0}
276-
m_PrefabInternal: {fileID: 0}
277-
m_GameObject: {fileID: 333528527}
278-
m_Enabled: 1
279-
m_EditorHideFlags: 0
280-
m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3}
281-
m_Name:
282-
m_EditorClassIdentifier:
283-
m_FirstSelected: {fileID: 0}
284-
m_sendNavigationEvents: 1
285-
m_DragThreshold: 10
286-
--- !u!20 &333528531
287-
Camera:
288-
m_ObjectHideFlags: 0
289-
m_PrefabParentObject: {fileID: 0}
290-
m_PrefabInternal: {fileID: 0}
291-
m_GameObject: {fileID: 333528527}
292-
m_Enabled: 0
293-
serializedVersion: 2
294-
m_ClearFlags: 3
295-
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
296-
m_NormalizedViewPortRect:
297-
serializedVersion: 2
298-
x: 0
299-
y: 0
300-
width: 1
301-
height: 1
302-
near clip plane: 0.1
303-
far clip plane: 1000
304-
field of view: 60
305-
orthographic: 1
306-
orthographic size: 0.5
307-
m_Depth: 0
308-
m_CullingMask:
309-
serializedVersion: 2
310-
m_Bits: 4294967295
311-
m_RenderingPath: -1
312-
m_TargetTexture: {fileID: 0}
313-
m_TargetDisplay: 1
314-
m_TargetEye: 3
315-
m_HDR: 0
316-
m_AllowMSAA: 0
317-
m_AllowDynamicResolution: 0
318-
m_ForceIntoRT: 0
319-
m_OcclusionCulling: 0
320-
m_StereoConvergence: 10
321-
m_StereoSeparation: 0.022
322322
--- !u!1 &353698134
323323
GameObject:
324324
m_ObjectHideFlags: 0
@@ -556,7 +556,7 @@ Transform:
556556
m_LocalPosition: {x: 0, y: 0, z: 0}
557557
m_LocalScale: {x: 1, y: 1, z: 1}
558558
m_Children:
559-
- {fileID: 333528528}
559+
- {fileID: 134971635}
560560
m_Father: {fileID: 1289414260}
561561
m_RootOrder: 0
562562
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -594,7 +594,7 @@ MonoBehaviour:
594594
m_Name:
595595
m_EditorClassIdentifier:
596596
pointingExtent: 10
597-
uiRaycastCamera: {fileID: 333528531}
597+
uiRaycastCamera: {fileID: 134971638}
598598
pointingRaycastLayerMasks:
599599
- serializedVersion: 2
600600
m_Bits: 4294967291

Assets/MixedRealityToolkit-SDK/Features/Input/GazeProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using Microsoft.MixedReality.Toolkit.InputSystem.Pointers;
55
using Microsoft.MixedReality.Toolkit.InputSystem.Sources;
6-
using Microsoft.MixedReality.Toolkit.Internal.Interfaces;
6+
using Microsoft.MixedReality.Toolkit.Internal.Interfaces.Devices;
77
using Microsoft.MixedReality.Toolkit.Internal.Interfaces.InputSystem;
88
using Microsoft.MixedReality.Toolkit.Internal.Utilities;
99
using Microsoft.MixedReality.Toolkit.Internal.Utilities.Physics;

0 commit comments

Comments
 (0)