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

Commit 3e51306

Browse files
StephenHodgsonStephenHodgson
authored
Dev/camera system updates (#97)
* Associated changes for the Camera System update * Fixed the disable end hold event to pass cancelled if the application is attempting to quit * updated the teleport cursor to utilize the camera rig instead of camera cache * Fixed bounds calculation for manipulation handler * adjusted the hit point frame of reference * Added public accessor for manipulation target * updated mouse pointer's CameraCache reference (#102) * Updates needed for Core\#397 (#103) * Updated Touch defaults (openVR) * Gaze Provider set to Body * Base Scene updated for latest rig * fixed base scene and teleport pointer * Bumped versions * updated camera profile serialization * updated core
1 parent 03928fe commit 3e51306

File tree

9 files changed

+284
-161
lines changed

9 files changed

+284
-161
lines changed

‎DefaultProfiles/DefaultMixedRealityCameraProfile.asset‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,6 @@ MonoBehaviour:
2222
cameraClearFlagsTransparentDisplay: 2
2323
backgroundColorTransparentDisplay: {r: 0, g: 0, b: 0, a: 0}
2424
transparentQualityLevel: 0
25+
cameraRigType:
26+
reference: XRTK.Services.CameraSystem.DefaultCameraRig, XRTK
27+
defaultHeadHeight: 1.6

‎DefaultProfiles/Input/ControllerMappings/DefaultOculusTouchControllerMappingProfile.asset‎

Lines changed: 53 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ MonoBehaviour:
1313
m_Name: DefaultOculusTouchControllerMappingProfile
1414
m_EditorClassIdentifier:
1515
isCustomProfile: 0
16-
parentProfile: {fileID: 11400000, guid: f83e1d143c5a46dba5e70f497a7a996d, type: 2}
1716
hasSetupDefaults: 1
1817
controllerMappings:
1918
- description: Oculus Touch Controller Left
@@ -31,6 +30,7 @@ MonoBehaviour:
3130
description: Pointer Pose
3231
axisConstraint: 7
3332
keyCode: 0
33+
inputName:
3434
axisCodeX:
3535
axisCodeY:
3636
invertXAxis: 0
@@ -44,6 +44,7 @@ MonoBehaviour:
4444
description: Trigger
4545
axisConstraint: 3
4646
keyCode: 0
47+
inputName:
4748
axisCodeX: AXIS_9
4849
axisCodeY:
4950
invertXAxis: 0
@@ -57,6 +58,7 @@ MonoBehaviour:
5758
description: None
5859
axisConstraint: 0
5960
keyCode: 344
61+
inputName:
6062
axisCodeX:
6163
axisCodeY:
6264
invertXAxis: 0
@@ -70,6 +72,7 @@ MonoBehaviour:
7072
description: None
7173
axisConstraint: 0
7274
keyCode: 0
75+
inputName:
7376
axisCodeX: AXIS_13
7477
axisCodeY:
7578
invertXAxis: 0
@@ -83,6 +86,7 @@ MonoBehaviour:
8386
description: Select
8487
axisConstraint: 2
8588
keyCode: 0
89+
inputName:
8690
axisCodeX: AXIS_9
8791
axisCodeY:
8892
invertXAxis: 0
@@ -96,6 +100,7 @@ MonoBehaviour:
96100
description: Grip Press
97101
axisConstraint: 3
98102
keyCode: 0
103+
inputName:
99104
axisCodeX: AXIS_11
100105
axisCodeY:
101106
invertXAxis: 0
@@ -109,6 +114,7 @@ MonoBehaviour:
109114
description: None
110115
axisConstraint: 0
111116
keyCode: 0
117+
inputName:
112118
axisCodeX: AXIS_11
113119
axisCodeY:
114120
invertXAxis: 0
@@ -118,14 +124,15 @@ MonoBehaviour:
118124
axisType: 4
119125
inputType: 17
120126
inputAction:
121-
id: 0
122-
description: None
123-
axisConstraint: 0
127+
id: 5
128+
description: Teleport Direction
129+
axisConstraint: 4
124130
keyCode: 0
131+
inputName:
125132
axisCodeX: AXIS_1
126133
axisCodeY: AXIS_2
127134
invertXAxis: 0
128-
invertYAxis: 0
135+
invertYAxis: 1
129136
- id: 7
130137
description: Button.PrimaryThumbstick Touch
131138
axisType: 2
@@ -135,6 +142,7 @@ MonoBehaviour:
135142
description: None
136143
axisConstraint: 0
137144
keyCode: 346
145+
inputName:
138146
axisCodeX:
139147
axisCodeY:
140148
invertXAxis: 0
@@ -148,6 +156,7 @@ MonoBehaviour:
148156
description: None
149157
axisConstraint: 0
150158
keyCode: 0
159+
inputName:
151160
axisCodeX: AXIS_15
152161
axisCodeY:
153162
invertXAxis: 0
@@ -161,6 +170,7 @@ MonoBehaviour:
161170
description: None
162171
axisConstraint: 0
163172
keyCode: 338
173+
inputName:
164174
axisCodeX:
165175
axisCodeY:
166176
invertXAxis: 0
@@ -174,6 +184,7 @@ MonoBehaviour:
174184
description: None
175185
axisConstraint: 0
176186
keyCode: 332
187+
inputName:
177188
axisCodeX:
178189
axisCodeY:
179190
invertXAxis: 0
@@ -187,6 +198,7 @@ MonoBehaviour:
187198
description: None
188199
axisConstraint: 0
189200
keyCode: 333
201+
inputName:
190202
axisCodeX:
191203
axisCodeY:
192204
invertXAxis: 0
@@ -200,6 +212,7 @@ MonoBehaviour:
200212
description: None
201213
axisConstraint: 0
202214
keyCode: 337
215+
inputName:
203216
axisCodeX:
204217
axisCodeY:
205218
invertXAxis: 0
@@ -213,6 +226,7 @@ MonoBehaviour:
213226
description: None
214227
axisConstraint: 0
215228
keyCode: 342
229+
inputName:
216230
axisCodeX:
217231
axisCodeY:
218232
invertXAxis: 0
@@ -226,6 +240,7 @@ MonoBehaviour:
226240
description: None
227241
axisConstraint: 0
228242
keyCode: 343
243+
inputName:
229244
axisCodeX:
230245
axisCodeY:
231246
invertXAxis: 0
@@ -239,6 +254,7 @@ MonoBehaviour:
239254
description: None
240255
axisConstraint: 0
241256
keyCode: 348
257+
inputName:
242258
axisCodeX:
243259
axisCodeY:
244260
invertXAxis: 0
@@ -252,6 +268,7 @@ MonoBehaviour:
252268
description: None
253269
axisConstraint: 0
254270
keyCode: 0
271+
inputName:
255272
axisCodeX: AXIS_17
256273
axisCodeY:
257274
invertXAxis: 0
@@ -267,10 +284,11 @@ MonoBehaviour:
267284
axisType: 7
268285
inputType: 3
269286
inputAction:
270-
id: 0
271-
description: None
272-
axisConstraint: 0
287+
id: 4
288+
description: Pointer Pose
289+
axisConstraint: 7
273290
keyCode: 0
291+
inputName:
274292
axisCodeX:
275293
axisCodeY:
276294
invertXAxis: 0
@@ -280,10 +298,11 @@ MonoBehaviour:
280298
axisType: 3
281299
inputType: 10
282300
inputAction:
283-
id: 0
284-
description: None
285-
axisConstraint: 0
301+
id: 6
302+
description: Trigger
303+
axisConstraint: 3
286304
keyCode: 0
305+
inputName:
287306
axisCodeX: AXIS_10
288307
axisCodeY:
289308
invertXAxis: 0
@@ -297,6 +316,7 @@ MonoBehaviour:
297316
description: None
298317
axisConstraint: 0
299318
keyCode: 345
319+
inputName:
300320
axisCodeX:
301321
axisCodeY:
302322
invertXAxis: 0
@@ -310,6 +330,7 @@ MonoBehaviour:
310330
description: None
311331
axisConstraint: 0
312332
keyCode: 0
333+
inputName:
313334
axisCodeX: AXIS_14
314335
axisCodeY:
315336
invertXAxis: 0
@@ -323,6 +344,7 @@ MonoBehaviour:
323344
description: Select
324345
axisConstraint: 2
325346
keyCode: 0
347+
inputName:
326348
axisCodeX: AXIS_10
327349
axisCodeY:
328350
invertXAxis: 0
@@ -332,10 +354,11 @@ MonoBehaviour:
332354
axisType: 3
333355
inputType: 10
334356
inputAction:
335-
id: 0
336-
description: None
337-
axisConstraint: 0
357+
id: 7
358+
description: Grip Press
359+
axisConstraint: 3
338360
keyCode: 0
361+
inputName:
339362
axisCodeX: AXIS_12
340363
axisCodeY:
341364
invertXAxis: 0
@@ -349,6 +372,7 @@ MonoBehaviour:
349372
description: None
350373
axisConstraint: 0
351374
keyCode: 0
375+
inputName:
352376
axisCodeX: AXIS_12
353377
axisCodeY:
354378
invertXAxis: 0
@@ -358,14 +382,15 @@ MonoBehaviour:
358382
axisType: 4
359383
inputType: 17
360384
inputAction:
361-
id: 0
362-
description: None
363-
axisConstraint: 0
385+
id: 5
386+
description: Teleport Direction
387+
axisConstraint: 4
364388
keyCode: 0
389+
inputName:
365390
axisCodeX: AXIS_4
366391
axisCodeY: AXIS_5
367392
invertXAxis: 0
368-
invertYAxis: 0
393+
invertYAxis: 1
369394
- id: 7
370395
description: Button.SecondaryThumbstick Touch
371396
axisType: 2
@@ -375,6 +400,7 @@ MonoBehaviour:
375400
description: None
376401
axisConstraint: 0
377402
keyCode: 347
403+
inputName:
378404
axisCodeX:
379405
axisCodeY:
380406
invertXAxis: 0
@@ -388,6 +414,7 @@ MonoBehaviour:
388414
description: None
389415
axisConstraint: 0
390416
keyCode: 0
417+
inputName:
391418
axisCodeX: AXIS_16
392419
axisCodeY:
393420
invertXAxis: 0
@@ -401,6 +428,7 @@ MonoBehaviour:
401428
description: None
402429
axisConstraint: 0
403430
keyCode: 339
431+
inputName:
404432
axisCodeX:
405433
axisCodeY:
406434
invertXAxis: 0
@@ -414,6 +442,7 @@ MonoBehaviour:
414442
description: None
415443
axisConstraint: 0
416444
keyCode: 330
445+
inputName:
417446
axisCodeX:
418447
axisCodeY:
419448
invertXAxis: 0
@@ -427,6 +456,7 @@ MonoBehaviour:
427456
description: None
428457
axisConstraint: 0
429458
keyCode: 331
459+
inputName:
430460
axisCodeX:
431461
axisCodeY:
432462
invertXAxis: 0
@@ -440,6 +470,7 @@ MonoBehaviour:
440470
description: None
441471
axisConstraint: 0
442472
keyCode: 340
473+
inputName:
443474
axisCodeX:
444475
axisCodeY:
445476
invertXAxis: 0
@@ -453,6 +484,7 @@ MonoBehaviour:
453484
description: None
454485
axisConstraint: 0
455486
keyCode: 341
487+
inputName:
456488
axisCodeX:
457489
axisCodeY:
458490
invertXAxis: 0
@@ -466,6 +498,7 @@ MonoBehaviour:
466498
description: None
467499
axisConstraint: 0
468500
keyCode: 349
501+
inputName:
469502
axisCodeX:
470503
axisCodeY:
471504
invertXAxis: 0
@@ -479,7 +512,8 @@ MonoBehaviour:
479512
description: None
480513
axisConstraint: 0
481514
keyCode: 0
515+
inputName:
482516
axisCodeX: AXIS_18
483517
axisCodeY:
484518
invertXAxis: 0
485-
invertYAxis: 0
519+
invertYAxis: 0

‎Features/Input/GazeProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ private IMixedRealityPointer InitializeGazePointer()
375375
MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile != null &&
376376
MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.GazeCursorPrefab != null)
377377
{
378-
var cursor = Instantiate(MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.GazeCursorPrefab, MixedRealityToolkit.Instance.MixedRealityPlayspace);
378+
var cursor = Instantiate(MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.PointerProfile.GazeCursorPrefab, MixedRealityToolkit.CameraSystem.CameraRig.BodyTransform);
379379
SetGazeCursor(cursor);
380380
}
381381

‎Features/Input/Handlers/ManipulationHandler.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,10 +541,8 @@ protected override void OnDisable()
541541

542542
if (IsBeingHeld)
543543
{
544-
// We don't pass IsCancelled here because
545-
// it's the intended behaviour to end the hold
546-
// if the component is disabled.
547-
EndHold();
544+
// Only flag cancelled if the application is quitting.
545+
EndHold(MixedRealityToolkit.IsApplicationQuitting);
548546
}
549547
}
550548

‎Features/UX/Scripts/Cursors/TeleportCursor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected override void UpdateCursorTransform()
104104

105105
transform.position = focusDetails.EndPoint;
106106

107-
var forward = CameraCache.Main.transform.forward;
107+
var forward = MixedRealityToolkit.CameraSystem.CameraRig.CameraTransform.forward;
108108
forward.y = 0f;
109109

110110
// Smooth out rotation just a tad to prevent jarring transitions

0 commit comments

Comments
 (0)