Skip to content

Commit 1b33622

Browse files
author
lawwong
committed
Fix Focus 3 controller not recoginzed in OpenXR mode
1 parent 2e1e3c7 commit 1b33622

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

Assets/HTC.UnityPlugin/VRModule/VRModuleBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ protected enum DefaultModuleOrder
3636

3737
private static readonly Regex s_viveRgx = new Regex("^.*(vive|htc).*$", REGEX_OPTIONS);
3838
private static readonly Regex s_viveCosmosRgx = new Regex("^.*(cosmos).*$", REGEX_OPTIONS);
39-
private static readonly Regex s_focus3Rgx = new Regex("focus3", REGEX_OPTIONS);
39+
private static readonly Regex s_focus3Rgx = new Regex("focus[\\s_\\-]*3", REGEX_OPTIONS);
4040
private static readonly Regex s_ver3Rgx = new Regex("^.*3.0.*$", REGEX_OPTIONS);
4141
private static readonly Regex s_oculusRgx = new Regex("^.*(oculus|quest).*$", REGEX_OPTIONS);
42-
private static readonly Regex s_questRgx = new Regex("(quest)", REGEX_OPTIONS);
43-
private static readonly Regex s_quest2Rgx = new Regex("(quest2|quest 2)", REGEX_OPTIONS);
42+
private static readonly Regex s_questRgx = new Regex("quest", REGEX_OPTIONS);
43+
private static readonly Regex s_quest2Rgx = new Regex("quest[\\s_\\-]*2", REGEX_OPTIONS);
4444
private static readonly Regex s_indexRgx = new Regex("^.*(index|knuckles).*$", REGEX_OPTIONS);
4545
private static readonly Regex s_knucklesRgx = new Regex("^.*(knu_ev1).*$", REGEX_OPTIONS);
4646
private static readonly Regex s_daydreamRgx = new Regex("^.*(daydream).*$", REGEX_OPTIONS);

0 commit comments

Comments
 (0)