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.

Sign up for GitHub

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

Jump to bottom

[pull] master from LibreVR:master #77

Merged
merged 5 commits into from
Oct 4, 2019
Merged

[pull] master from LibreVR:master #77

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2599202
ReviveXR: Map session state correctly.
CrossVR Oct 3, 2019
cd90463
ReviveXR: Set missing view config type.
CrossVR Oct 3, 2019
5526c11
ReviveXR: Flip the field-of-view to flip the image
CrossVR Oct 3, 2019
2c414b1
ReviveXR: Split frame state into current and pending.
CrossVR Oct 3, 2019
4afe0b9
ReviveXR: Briefly set HmdMounted when starting the session.
CrossVR Oct 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
ReviveXR: Briefly set HmdMounted when starting the session. 
Also refactor into a switch case for cosmetics.
  • Loading branch information
@CrossVR
CrossVR committed Oct 4, 2019
commit 4afe0b9da4d8f8a0eec2111bb023dd282177c134
32 changes: 21 additions & 11 deletions ReviveXR/REV_CAPI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,25 +327,35 @@ OVR_PUBLIC_FUNCTION(ovrResult) ovr_GetSessionStatus(ovrSession session, ovrSessi
reinterpret_cast<XrEventDataSessionStateChanged&>(event);
if (stateChanged.session == session->Session)
{
if (stateChanged.state == XR_SESSION_STATE_VISIBLE)
switch (stateChanged.state)
{
status.HmdMounted = true;
status.HasInputFocus = false;
}
else if (stateChanged.state == XR_SESSION_STATE_IDLE)
case XR_SESSION_STATE_IDLE:
status.HmdPresent = true;
else if (stateChanged.state == XR_SESSION_STATE_READY)
break;
case XR_SESSION_STATE_READY:
status.IsVisible = true;
else if (stateChanged.state == XR_SESSION_STATE_SYNCHRONIZED)
status.HmdMounted = true;
break;
case XR_SESSION_STATE_SYNCHRONIZED:
status.HmdMounted = false;
else if (stateChanged.state == XR_SESSION_STATE_FOCUSED)
break;
case XR_SESSION_STATE_VISIBLE:
status.HmdMounted = true;
status.HasInputFocus = false;
break;
case XR_SESSION_STATE_FOCUSED:
status.HasInputFocus = true;
else if (stateChanged.state == XR_SESSION_STATE_STOPPING)
break;
case XR_SESSION_STATE_STOPPING:
status.IsVisible = false;
else if (stateChanged.state == XR_SESSION_STATE_LOSS_PENDING)
break;
case XR_SESSION_STATE_LOSS_PENDING:
status.DisplayLost = true;
else if (stateChanged.state == XR_SESSION_STATE_EXITING)
break;
case XR_SESSION_STATE_EXITING:
status.ShouldQuit = true;
break;
}
}
break;
}
Expand Down