Skip to content

Commit

Permalink
Merge pull request #13 from fholger/ingame_menu
Browse files Browse the repository at this point in the history 
Workaround: make ingame menu work properly in VR
  • Loading branch information
@Gistix
Gistix committed Sep 17, 2023
2 parents 42bb8f4 + d0a916e commit 5047cf6
Showing 1 changed file with 69 additions and 22 deletions.
91 changes: 69 additions & 22 deletions L4D2VR/vr.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,11 +255,29 @@ void VR::SubmitVRTextures()
if (!vr::VROverlay()->IsOverlayVisible(m_MainMenuHandle))
RepositionOverlays();

vr::VRTextureBounds_t bounds{ 0, 0, 1, 1 };
if (m_Game->m_EngineClient->IsInGame())
{
// menu only renders to the window portion of the texture. Until we figure out a proper fix,
// as a workaround only show that portion of the texture
int windowWidth, windowHeight;
IMatRenderContext* rndrContext = m_Game->m_MaterialSystem->GetRenderContext();
rndrContext->GetWindowSize(windowWidth, windowHeight);
rndrContext->Release();

bounds.uMax = (float)windowWidth / m_RenderWidth;
bounds.vMax = (float)windowHeight / m_RenderHeight;
vr::VROverlay()->SetOverlayTexelAspect(m_MainMenuHandle, bounds.vMax / bounds.uMax);
}
else
vr::VROverlay()->SetOverlayTexelAspect(m_MainMenuHandle, 1.0f);

vr::VROverlay()->SetOverlayTextureBounds(m_MainMenuHandle, &bounds);
vr::VROverlay()->SetOverlayTexture(m_MainMenuHandle, &m_VKBackBuffer.m_VRTexture);
vr::VROverlay()->ShowOverlay(m_MainMenuHandle);
vr::VROverlay()->HideOverlay(m_HUDHandle);

if (!m_Game->m_EngineClient->IsInGame())
//if (!m_Game->m_EngineClient->IsInGame())
{
vr::VRCompositor()->Submit(vr::Eye_Left, &m_VKBlankTexture.m_VRTexture, NULL, vr::Submit_Default);
vr::VRCompositor()->Submit(vr::Eye_Right, &m_VKBlankTexture.m_VRTexture, NULL, vr::Submit_Default);
Expand Down Expand Up @@ -468,6 +486,7 @@ void VR::ProcessMenuInput()
vr::VREvent_t vrEvent;
while (vr::VROverlay()->PollNextOverlayEvent(currentOverlay, &vrEvent, sizeof(vrEvent)))
{
INPUT input;
switch (vrEvent.eventType)
{
case vr::VREvent_MouseMove:
Expand All @@ -493,13 +512,23 @@ void VR::ProcessMenuInput()
// Don't allow holding down the mouse down in the pause menu. The resume button can be clicked before
// the MouseButtonUp event is polled, which causes issues with the overlay.
if (currentOverlay == m_MainMenuHandle)
m_Game->m_VguiInput->InternalMousePressed(ButtonCode_t::MOUSE_LEFT);
{
input.type = INPUT_MOUSE;
input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
SendInput(1, &input, sizeof(INPUT));
}
break;

case vr::VREvent_MouseButtonUp:
if (currentOverlay == m_HUDHandle)
m_Game->m_VguiInput->InternalMousePressed(ButtonCode_t::MOUSE_LEFT);
m_Game->m_VguiInput->InternalMouseReleased(ButtonCode_t::MOUSE_LEFT);
{
input.type = INPUT_MOUSE;
input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
SendInput(1, &input, sizeof(INPUT));
}
input.type = INPUT_MOUSE;
input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
SendInput(1, &input, sizeof(INPUT));
break;

case vr::VREvent_ScrollDiscrete:
Expand All @@ -514,39 +543,57 @@ void VR::ProcessMenuInput()

if (PressedDigitalAction(m_MenuSelect, true))
{
m_Game->m_VguiInput->InternalKeyCodeTyped(ButtonCode_t::KEY_SPACE);
m_Game->m_VguiInput->InternalKeyCodePressed(ButtonCode_t::KEY_SPACE);
m_Game->m_VguiInput->InternalKeyCodeReleased(ButtonCode_t::KEY_SPACE);
INPUT input {};
input.type = INPUT_KEYBOARD;
input.ki.wVk = VK_RETURN;
SendInput(1, &input, sizeof(INPUT));
input.ki.dwFlags = KEYEVENTF_KEYUP;
SendInput(1, &input, sizeof(INPUT));
}
if (PressedDigitalAction(m_MenuBack, true) || PressedDigitalAction(m_Pause, true))
{
m_Game->m_VguiInput->InternalKeyCodeTyped(ButtonCode_t::KEY_ESCAPE);
m_Game->m_VguiInput->InternalKeyCodePressed(ButtonCode_t::KEY_ESCAPE);
m_Game->m_VguiInput->InternalKeyCodeReleased(ButtonCode_t::KEY_ESCAPE);
INPUT input {};
input.type = INPUT_KEYBOARD;
input.ki.wVk = VK_ESCAPE;
SendInput(1, &input, sizeof(INPUT));
input.ki.dwFlags = KEYEVENTF_KEYUP;
SendInput(1, &input, sizeof(INPUT));
}
if (PressedDigitalAction(m_MenuUp, true))
{
m_Game->m_VguiInput->InternalKeyCodeTyped(ButtonCode_t::KEY_UP);
m_Game->m_VguiInput->InternalKeyCodePressed(ButtonCode_t::KEY_UP);
m_Game->m_VguiInput->InternalKeyCodeReleased(ButtonCode_t::KEY_UP);
INPUT input {};
input.type = INPUT_KEYBOARD;
input.ki.wVk = VK_UP;
SendInput(1, &input, sizeof(INPUT));
input.ki.dwFlags = KEYEVENTF_KEYUP;
SendInput(1, &input, sizeof(INPUT));
}
if (PressedDigitalAction(m_MenuDown, true))
{
m_Game->m_VguiInput->InternalKeyCodeTyped(ButtonCode_t::KEY_DOWN);
m_Game->m_VguiInput->InternalKeyCodePressed(ButtonCode_t::KEY_DOWN);
m_Game->m_VguiInput->InternalKeyCodeReleased(ButtonCode_t::KEY_DOWN);
INPUT input {};
input.type = INPUT_KEYBOARD;
input.ki.wVk = VK_DOWN;
SendInput(1, &input, sizeof(INPUT));
input.ki.dwFlags = KEYEVENTF_KEYUP;
SendInput(1, &input, sizeof(INPUT));
}
if (PressedDigitalAction(m_MenuLeft, true))
{
m_Game->m_VguiInput->InternalKeyCodeTyped(ButtonCode_t::KEY_LEFT);
m_Game->m_VguiInput->InternalKeyCodePressed(ButtonCode_t::KEY_LEFT);
m_Game->m_VguiInput->InternalKeyCodeReleased(ButtonCode_t::KEY_LEFT);
INPUT input {};
input.type = INPUT_KEYBOARD;
input.ki.wVk = VK_LEFT;
SendInput(1, &input, sizeof(INPUT));
input.ki.dwFlags = KEYEVENTF_KEYUP;
SendInput(1, &input, sizeof(INPUT));
}
if (PressedDigitalAction(m_MenuRight, true))
{
m_Game->m_VguiInput->InternalKeyCodeTyped(ButtonCode_t::KEY_RIGHT);
m_Game->m_VguiInput->InternalKeyCodePressed(ButtonCode_t::KEY_RIGHT);
m_Game->m_VguiInput->InternalKeyCodeReleased(ButtonCode_t::KEY_RIGHT);
INPUT input {};
input.type = INPUT_KEYBOARD;
input.ki.wVk = VK_RIGHT;
SendInput(1, &input, sizeof(INPUT));
input.ki.dwFlags = KEYEVENTF_KEYUP;
SendInput(1, &input, sizeof(INPUT));
}
}
}
Expand Down

0 comments on commit 5047cf6

Please sign in to comment.