Skip to content

Commit df1a3c5

Browse files
author
Stephen Hodgson
committed
updated gaze controls on mixed reality camera prefabs
1 parent bc98c35 commit df1a3c5

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

Assets/HoloToolkit/Input/Prefabs/MixedRealityCamera.prefab

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,6 @@ AudioListener:
415415
m_PrefabInternal: {fileID: 100100000}
416416
m_GameObject: {fileID: 1208988342737728}
417417
m_Enabled: 1
418-
m_ExtensionPropertyValues: []
419418
--- !u!114 &114065736676316334
420419
MonoBehaviour:
421420
m_ObjectHideFlags: 1
@@ -513,6 +512,7 @@ MonoBehaviour:
513512
m_EditorClassIdentifier:
514513
NearClipPlane_OpaqueDisplay: 0.1
515514
CameraClearFlags_OpaqueDisplay: 1
515+
BackgroundColor_OpaqueDisplay: {r: 0, g: 0, b: 0, a: 1}
516516
OpaqueQualityLevel: 5
517517
NearClipPlane_TransparentDisplay: 0.85
518518
CameraClearFlags_TransparentDisplay: 2
@@ -573,8 +573,8 @@ MonoBehaviour:
573573
UseUnscaledTime: 1
574574
axisType: 0
575575
buttonType: 21
576-
InputManagerHorizontalAxisName: ControllerTriggerAxis
577-
InputManagerVerticalAxisName: ControllerTriggerAxis
576+
InputManagerHorizontalAxisName: CONTROLLER_LEFT_TRIGGER
577+
InputManagerVerticalAxisName: CONTROLLER_RIGHT_TRIGGER
578578
Axis0Destination: 2
579579
Axis1Destination: 2
580580
Axis2Destination: 6
@@ -613,8 +613,8 @@ MonoBehaviour:
613613
UseUnscaledTime: 1
614614
axisType: 0
615615
buttonType: 21
616-
InputManagerHorizontalAxisName: ControllerLeftStickX
617-
InputManagerVerticalAxisName: ControllerLeftStickY
616+
InputManagerHorizontalAxisName: CONTROLLER_LEFT_STICK_HORIZONTAL
617+
InputManagerVerticalAxisName: CONTROLLER_LEFT_STICK_VERTICAL
618618
Axis0Destination: 0
619619
Axis1Destination: 5
620620
Axis2Destination: 6
@@ -653,8 +653,8 @@ MonoBehaviour:
653653
UseUnscaledTime: 1
654654
axisType: 0
655655
buttonType: 21
656-
InputManagerHorizontalAxisName: ControllerRightStickX
657-
InputManagerVerticalAxisName: ControllerRightStickY
656+
InputManagerHorizontalAxisName: CONTROLLER_RIGHT_STICK_HORIZONTAL
657+
InputManagerVerticalAxisName: CONTROLLER_RIGHT_STICK_VERTICAL
658658
Axis0Destination: 2
659659
Axis1Destination: 0
660660
Axis2Destination: 6

Assets/HoloToolkit/Input/Prefabs/MixedRealityCameraParent.prefab

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,6 @@ AudioListener:
579579
m_PrefabInternal: {fileID: 100100000}
580580
m_GameObject: {fileID: 1372541880982678}
581581
m_Enabled: 1
582-
m_ExtensionPropertyValues: []
583582
--- !u!114 &114029515443702222
584583
MonoBehaviour:
585584
m_ObjectHideFlags: 1
@@ -595,8 +594,8 @@ MonoBehaviour:
595594
UseUnscaledTime: 1
596595
axisType: 0
597596
buttonType: 21
598-
InputManagerHorizontalAxisName: ControllerRightStickX
599-
InputManagerVerticalAxisName: ControllerRightStickY
597+
InputManagerHorizontalAxisName: CONTROLLER_RIGHT_STICK_HORIZONTAL
598+
InputManagerVerticalAxisName: CONTROLLER_RIGHT_STICK_VERTICAL
600599
Axis0Destination: 0
601600
Axis1Destination: 4
602601
Axis2Destination: 6
@@ -851,8 +850,8 @@ MonoBehaviour:
851850
UseUnscaledTime: 1
852851
axisType: 0
853852
buttonType: 21
854-
InputManagerHorizontalAxisName: LeftTrigger
855-
InputManagerVerticalAxisName: RightTrigger
853+
InputManagerHorizontalAxisName: CONTROLLER_LEFT_TRIGGER
854+
InputManagerVerticalAxisName: CONTROLLER_RIGHT_TRIGGER
856855
Axis0Destination: 2
857856
Axis1Destination: 3
858857
Axis2Destination: 6
@@ -891,8 +890,8 @@ MonoBehaviour:
891890
UseUnscaledTime: 1
892891
axisType: 0
893892
buttonType: 21
894-
InputManagerHorizontalAxisName: ControllerLeftStickX
895-
InputManagerVerticalAxisName: ControllerLeftStickY
893+
InputManagerHorizontalAxisName: CONTROLLER_LEFT_STICK_HORIZONTAL
894+
InputManagerVerticalAxisName: CONTROLLER_LEFT_STICK_VERTICAL
896895
Axis0Destination: 2
897896
Axis1Destination: 0
898897
Axis2Destination: 6

0 commit comments

Comments
 (0)