@@ -71,22 +71,23 @@ Right Trackpad NearTouch 16
71
71
*/
72
72
73
73
protected int [ ] rightControllerTouchCodes = new int [ ] { 15 , 17 , 10 , 11 } ;
74
- protected int [ ] rightControllerPressCodes = new int [ ] { 9 , 0 , 1 , 7 } ;
74
+ protected int [ ] rightControllerPressCodes = new int [ ] { 9 , 1 , 0 , 7 } ;
75
+ protected int [ ] rightOculusRemotePressCodes = new int [ ] { 9 , 0 , 1 , 7 } ;
75
76
76
77
protected int [ ] leftControllerTouchCodes = new int [ ] { 14 , 16 , 12 , 13 } ;
77
- protected int [ ] leftControllerPressCodes = new int [ ] { 8 , 2 , 3 , 7 } ;
78
+ protected int [ ] leftControllerPressCodes = new int [ ] { 8 , 3 , 2 , 7 } ;
78
79
79
80
protected ControllerType cachedControllerType = ControllerType . Custom ;
80
81
81
82
protected Dictionary < ButtonTypes , KeyCode ? > rightControllerTouchKeyCodes = new Dictionary < ButtonTypes , KeyCode ? > ( )
82
83
{
83
- { ButtonTypes . Trigger , KeyCode . Joystick1Button15 } ,
84
+ { ButtonTypes . Trigger , KeyCode . JoystickButton15 } ,
84
85
{ ButtonTypes . TriggerHairline , null } ,
85
86
{ ButtonTypes . Grip , null } ,
86
87
{ ButtonTypes . GripHairline , null } ,
87
- { ButtonTypes . Touchpad , KeyCode . Joystick1Button17 } ,
88
- { ButtonTypes . ButtonOne , KeyCode . Joystick1Button10 } ,
89
- { ButtonTypes . ButtonTwo , KeyCode . Joystick1Button11 } ,
88
+ { ButtonTypes . Touchpad , KeyCode . JoystickButton17 } ,
89
+ { ButtonTypes . ButtonOne , KeyCode . JoystickButton10 } ,
90
+ { ButtonTypes . ButtonTwo , KeyCode . JoystickButton11 } ,
90
91
{ ButtonTypes . StartMenu , null }
91
92
} ;
92
93
@@ -96,21 +97,21 @@ Right Trackpad NearTouch 16
96
97
{ ButtonTypes . TriggerHairline , null } ,
97
98
{ ButtonTypes . Grip , null } ,
98
99
{ ButtonTypes . GripHairline , null } ,
99
- { ButtonTypes . Touchpad , KeyCode . Joystick1Button9 } ,
100
- { ButtonTypes . ButtonOne , KeyCode . Joystick1Button0 } ,
101
- { ButtonTypes . ButtonTwo , KeyCode . Joystick1Button1 } ,
102
- { ButtonTypes . StartMenu , KeyCode . Joystick1Button7 }
100
+ { ButtonTypes . Touchpad , KeyCode . JoystickButton9 } ,
101
+ { ButtonTypes . ButtonOne , KeyCode . JoystickButton1 } ,
102
+ { ButtonTypes . ButtonTwo , KeyCode . JoystickButton0 } ,
103
+ { ButtonTypes . StartMenu , KeyCode . JoystickButton7 }
103
104
} ;
104
105
105
106
protected Dictionary < ButtonTypes , KeyCode ? > leftControllerTouchKeyCodes = new Dictionary < ButtonTypes , KeyCode ? > ( )
106
107
{
107
- { ButtonTypes . Trigger , KeyCode . Joystick1Button14 } ,
108
+ { ButtonTypes . Trigger , KeyCode . JoystickButton14 } ,
108
109
{ ButtonTypes . TriggerHairline , null } ,
109
110
{ ButtonTypes . Grip , null } ,
110
111
{ ButtonTypes . GripHairline , null } ,
111
- { ButtonTypes . Touchpad , KeyCode . Joystick1Button16 } ,
112
- { ButtonTypes . ButtonOne , KeyCode . Joystick1Button12 } ,
113
- { ButtonTypes . ButtonTwo , KeyCode . Joystick1Button13 } ,
112
+ { ButtonTypes . Touchpad , KeyCode . JoystickButton16 } ,
113
+ { ButtonTypes . ButtonOne , KeyCode . JoystickButton12 } ,
114
+ { ButtonTypes . ButtonTwo , KeyCode . JoystickButton13 } ,
114
115
{ ButtonTypes . StartMenu , null }
115
116
} ;
116
117
@@ -120,10 +121,10 @@ Right Trackpad NearTouch 16
120
121
{ ButtonTypes . TriggerHairline , null } ,
121
122
{ ButtonTypes . Grip , null } ,
122
123
{ ButtonTypes . GripHairline , null } ,
123
- { ButtonTypes . Touchpad , KeyCode . Joystick1Button8 } ,
124
- { ButtonTypes . ButtonOne , KeyCode . Joystick1Button2 } ,
125
- { ButtonTypes . ButtonTwo , KeyCode . Joystick1Button3 } ,
126
- { ButtonTypes . StartMenu , KeyCode . Joystick1Button7 }
124
+ { ButtonTypes . Touchpad , KeyCode . JoystickButton8 } ,
125
+ { ButtonTypes . ButtonOne , KeyCode . JoystickButton3 } ,
126
+ { ButtonTypes . ButtonTwo , KeyCode . JoystickButton2 } ,
127
+ { ButtonTypes . StartMenu , KeyCode . JoystickButton7 }
127
128
} ;
128
129
129
130
private bool settingCaches = false ;
@@ -745,7 +746,8 @@ protected virtual void SetControllerButtons(ControllerHand hand)
745
746
{
746
747
if ( hand == ControllerHand . Right )
747
748
{
748
- SetControllerButtonValues ( ref rightControllerTouchKeyCodes , ref rightControllerPressKeyCodes , validJoystickIndex , rightControllerTouchCodes , rightControllerPressCodes ) ;
749
+ var pressCodes = cachedControllerType == ControllerType . Oculus_OculusRemote ? rightOculusRemotePressCodes : rightControllerPressCodes ;
750
+ SetControllerButtonValues ( ref rightControllerTouchKeyCodes , ref rightControllerPressKeyCodes , validJoystickIndex , rightControllerTouchCodes , pressCodes ) ;
749
751
}
750
752
else
751
753
{
@@ -767,6 +769,9 @@ protected virtual void SetCachedControllerType(string givenType)
767
769
case "googledaydream" :
768
770
cachedControllerType = ControllerType . Daydream_Controller ;
769
771
return ;
772
+ case "oculus remote" :
773
+ cachedControllerType = ControllerType . Oculus_OculusRemote ;
774
+ return ;
770
775
}
771
776
772
777
//fallback to fuzzy matching
0 commit comments