New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Focus Plus support #1149
Focus Plus support #1149
Conversation
@bluemarvin Nice work, thanks for leading this. |
43bdded
to
927b7da
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
detecting which hand each controller is in not work properly. I would suggest open a follow up bug to fix it. r+ for fixing other nits.
delegate->SetButtonState(index, ControllerDelegate::BUTTON_APP, -1, menuPressed, menuPressed); | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
redundant new line?
@@ -324,14 +334,18 @@ DeviceDelegateWaveVR::ReleaseControllerDelegate() { | |||
|
|||
int32_t | |||
DeviceDelegateWaveVR::GetControllerModelCount() const { | |||
return 1; | |||
return 2; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think even on Focus Plus, the model count still should be one. In Oculus Quest
if (m.IsOculusQuest()) {
return 2;
} else {
return 1;
}
It exactly uses two controller models.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oculus has an API to know what device you are on, from what I can tell Wave does not.
} else if (aModelIndex == 1) { | ||
return "focus_plus.obj"; | ||
} | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like we should change it to
if (!m.Is6Dof()) { // or !IsFocusPlus().
return "vr_controller_focus.obj";
} else if (aModelIndex == 1) {
return "focus_plus.obj";
}
We were using aModelIndex
is because Quest has two kinds of controller models.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The fact that the controller can change from 3DoF to 6DoF while running makes this a different situation from the Quest.
To reset view press and hold the grip button.