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

[pull] master from LibreVR:master #70

Merged
merged 2 commits into from
Sep 5, 2019
Merged
Changes from 1 commit
Commits
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
CompositorBase: Fix incorrect quad layer flags used with older games.
  • Loading branch information
CrossVR committed Sep 5, 2019
commit cf74195097b970a5ccea2ec80779e9b35050f49b
4 changes: 2 additions & 2 deletions Revive/CompositorBase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@ ovrResult CompositorBase::EndFrame(ovrSession session, ovrLayerHeader const * co
// Transform the overlay.
vr::HmdMatrix34_t transform = REV::Matrix4f(pose);
vr::VROverlay()->SetOverlayWidthInMeters(chain->Overlay, layer.QuadSize.x);
if (layer.Header.Flags & ovrLayerFlag_HeadLocked)
if (layerPtrList[i]->Flags & ovrLayerFlag_HeadLocked)
vr::VROverlay()->SetOverlayTransformTrackedDeviceRelative(chain->Overlay, vr::k_unTrackedDeviceIndex_Hmd, &transform);
else
vr::VROverlay()->SetOverlayTransformAbsolute(chain->Overlay, session->TrackingOrigin, &transform);

// Set the texture and show the overlay.
vr::VRTextureBounds_t bounds = ViewportToTextureBounds(layer.Viewport, layer.ColorTexture, layer.Header.Flags);
vr::VRTextureBounds_t bounds = ViewportToTextureBounds(layer.Viewport, layer.ColorTexture, layerPtrList[i]->Flags);
vr::VROverlay()->SetOverlayTextureBounds(chain->Overlay, &bounds);

// Show the overlay, unfortunately we have no control over the order in which
Expand Down