Skip to content

Commit c1261e9

Browse files
author
lawwong
committed
Add VRModuleDeviceModel.OculusQuest2ControllerLeft/Right
1 parent 8cca8f2 commit c1261e9

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

Assets/HTC.UnityPlugin/VRModule/Modules/OculusVRModule.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,9 +570,7 @@ public override void BeforeRenderUpdate()
570570
currState.input2DType = VRModuleInput2DType.JoystickOnly;
571571
break;
572572
case OVRSystemHeadset.Oculus_Link_Quest:
573-
case OVRSystemHeadset.Oculus_Link_Quest_2:
574573
case OVRSystemHeadset.Oculus_Quest:
575-
case OVRSystemHeadset.Oculus_Quest_2:
576574
case OVRSystemHeadset.Rift_S:
577575
if (node == OVRPlugin.Node.HandLeft)
578576
{
@@ -584,6 +582,18 @@ public override void BeforeRenderUpdate()
584582
}
585583
currState.input2DType = VRModuleInput2DType.JoystickOnly;
586584
break;
585+
case OVRSystemHeadset.Oculus_Link_Quest_2:
586+
case OVRSystemHeadset.Oculus_Quest_2:
587+
if (node == OVRPlugin.Node.HandLeft)
588+
{
589+
currState.deviceModel = VRModuleDeviceModel.OculusQuest2ControllerLeft;
590+
}
591+
else
592+
{
593+
currState.deviceModel = VRModuleDeviceModel.OculusQuest2ControllerRight;
594+
}
595+
currState.input2DType = VRModuleInput2DType.JoystickOnly;
596+
break;
587597
}
588598
break;
589599
case VRModuleDeviceClass.TrackedHand:
@@ -661,6 +671,7 @@ public override void BeforeRenderUpdate()
661671
#endif
662672
case VRModuleDeviceModel.OculusTouchLeft:
663673
case VRModuleDeviceModel.OculusQuestControllerLeft:
674+
case VRModuleDeviceModel.OculusQuest2ControllerLeft:
664675
{
665676
var ctrlState = OVRPlugin.GetControllerState((uint)OVRPlugin.Controller.LTouch);
666677

@@ -687,6 +698,7 @@ public override void BeforeRenderUpdate()
687698
}
688699
case VRModuleDeviceModel.OculusTouchRight:
689700
case VRModuleDeviceModel.OculusQuestControllerRight:
701+
case VRModuleDeviceModel.OculusQuest2ControllerRight:
690702
{
691703
var ctrlState = OVRPlugin.GetControllerState((uint)OVRPlugin.Controller.RTouch);
692704

Assets/HTC.UnityPlugin/VRModule/VRModuleDeviceState.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ public enum VRModuleDeviceModel
7070
WaveCRControllerRight = ViveFocus3ControllerRight,
7171
ViveTracker3,
7272
ViveFlowPhoneController,
73+
OculusQuest2ControllerLeft,
74+
OculusQuest2ControllerRight,
7375
}
7476

7577
public enum VRModuleRawButton

0 commit comments

Comments
 (0)