Skip to content
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

Merged
merged 4 commits into from May 6, 2019
Merged

Focus Plus support #1149

merged 4 commits into from May 6, 2019

Conversation

bluemarvin
Copy link
Contributor

To reset view press and hold the grip button.

@philip-lamb
Copy link
Contributor

@bluemarvin Nice work, thanks for leading this.

@bluemarvin bluemarvin force-pushed the focus-plus branch 5 times, most recently from 43bdded to 927b7da Compare May 3, 2019 20:00
Copy link
Contributor

@daoshengmu daoshengmu left a 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);


Copy link
Contributor

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;
Copy link
Contributor

@daoshengmu daoshengmu May 3, 2019

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.

Copy link
Contributor Author

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";
}

Copy link
Contributor

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.

Copy link
Contributor Author

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.

@bluemarvin bluemarvin mentioned this pull request May 6, 2019
@bluemarvin bluemarvin merged commit 212e03f into master May 6, 2019
@cvan cvan deleted the focus-plus branch May 6, 2019 23:29
@cvan cvan added this to the v1.2 milestone May 6, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants