Skip to content

Inputs improvements #126

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

Open
FirEmerald wants to merge 5 commits into
base: holydh/inputs
Choose a base branch
from
Open

Inputs improvements #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d03e0c3
Inputs improvements
FirEmerald Feb 9, 2026
f8c0b59
Merge branch 'holydh/inputs' into firemerald/inputs
FirEmerald Feb 9, 2026
23f6a85
Merge branch 'holydh/inputs' into firemerald/inputs
FirEmerald Feb 12, 2026
ef65add
Merge branch 'holydh/inputs' into firemerald/inputs
FirEmerald Feb 13, 2026
e8c705a
fix incorrect use of "interact" instead of "interactState"
FirEmerald Feb 14, 2026
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
78 changes: 34 additions & 44 deletions src/hooking/controls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,12 +193,13 @@ bool openDpadMenuRuneButton(ButtonState::Event lastEvent, uint32_t& buttonHold,
buttonHold |= VPAD_BUTTON_UP;
gameState.last_dpad_menu_open = EquipType::SheikahSlate;
gameState.dpad_menu_open_requested = true;
gameState.current_dpad_menu_button = OpenXR::DpadMenuButton::Rune;
return true;
}
return false;
}

bool openDpadMenuBodySlots(ButtonState::Event lastEvent, HandGestureState handGesture, uint32_t& buttonHold, OpenXR::GameState& gameState) {
bool openDpadMenuBodySlots(ButtonState::Event lastEvent, HandGestureState handGesture, uint32_t& buttonHold, OpenXR::GameState& gameState, bool (*gripButton)(OpenXR::InputState)) {
if (lastEvent == ButtonState::Event::LongPress && !gameState.dpad_menu_open_requested && gameState.right_hand_current_equip_type != EquipType::MagnetGlove) {
if (isHandOverRightShoulderSlot(handGesture)) {
//open arrow menu if bow is equipped in left hand
Expand Down Expand Up @@ -241,6 +242,7 @@ bool openDpadMenuBodySlots(ButtonState::Event lastEvent, HandGestureState handGe
gameState.last_dpad_menu_open = EquipType::SheikahSlate;
}
gameState.dpad_menu_open_requested = true;
gameState.current_dpad_menu_button = gripButton;
return true;
}
return false;
Expand All @@ -267,15 +269,15 @@ void keepDpadMenuOpen(uint32_t& buttonHold, OpenXR::GameState& gameState) {
}
}

bool closeDpadMenu(OpenXR::InputState& inputs, OpenXR::GameState& gameState) {
void closeDpadMenu(OpenXR::InputState& inputs, OpenXR::GameState& gameState) {
if (!gameState.dpad_menu_open_requested)
return false;
return;

if (!inputs.inMenu.leftGrip.currentState && !inputs.inMenu.rightGrip.currentState && !inputs.inMenu.sort.currentState) {
if (!gameState.current_dpad_menu_button(inputs)) {
gameState.dpad_menu_open_requested = false;
gameState.was_dpad_menu_open = true;
gameState.current_dpad_menu_button = nullptr;
}
return true;
}

void equipWeaponOnDpadMenuExit(uint32_t& buttonHold, OpenXR::GameState& gameState, float dt) {
Expand Down Expand Up @@ -336,9 +338,10 @@ void processLeftHandInGameInput(
constexpr RumbleParameters RuneRumble = { true, 0, RumbleType::OscillationSmooth, 1.0f, false, 1.0, 0.25f, 0.25f };

auto* rumbleMgr = VRManager::instance().XR->GetRumbleManager();
bool isGrabPressed = inputs.inGame.grabState[0].lastEvent == ButtonState::Event::ShortPress;
bool isGrabPressedLong = inputs.inGame.grabState[0].lastEvent == ButtonState::Event::LongPress;
bool isCurrentGrabPressed = inputs.inGame.grabState[0].wasDownLastFrame;
bool isGrabPressed = inputs.shared.grabState[0].lastEvent == ButtonState::Event::ShortPress;
bool isGrabPressedLong = inputs.shared.grabState[0].lastEvent == ButtonState::Event::LongPress;
bool isCurrentGrabPressed = inputs.shared.grabState[0].wasDownLastFrame;
bool isCurrentInteractPressed = inputs.shared.grabState[0].wasDownLastFrame;

// Rune rumbles
if (gameState.left_hand_current_equip_type == EquipType::SheikahSlate)
Expand Down Expand Up @@ -373,7 +376,7 @@ void processLeftHandInGameInput(

// Handle shoulder slot interactions
if (isHandOverLeftShoulderSlot(leftGesture) || isHandOverRightShoulderSlot(leftGesture)) {
if (openDpadMenuBodySlots(inputs.inGame.grabState[0].lastEvent, leftGesture, buttonHold, gameState))
if (openDpadMenuBodySlots(inputs.shared.grabState[0].lastEvent, leftGesture, buttonHold, gameState, OpenXR::DpadMenuButton::LGrab))
// Don't process normal input when opening dpad menu
return;

Expand Down Expand Up @@ -408,7 +411,7 @@ void processLeftHandInGameInput(
// Handle waist slot interaction (Rune)
if (isHandOverLeftWaistSlot(leftGesture)) {
// Handle dpad menu
if (openDpadMenuBodySlots(inputs.inGame.grabState[0].lastEvent, leftGesture, buttonHold, gameState))
if (openDpadMenuBodySlots(inputs.shared.grabState[0].lastEvent, leftGesture, buttonHold, gameState, OpenXR::DpadMenuButton::LGrab))
// Don't process normal input when opening dpad menu
return;

Expand Down Expand Up @@ -485,17 +488,10 @@ void processLeftHandInGameInput(
// }
// return;
//}

if (isGrabPressed) {
// Handle grab action. is_riding_mount check added to prevent conflict with master cycle brake function
if (!gameState.prevent_grab_inputs && !gameState.is_riding_mount) {
buttonHold |= VPAD_BUTTON_A;
}
}

// Master Sword QTE fix. is_riding_mount check to prevent conflict with master cycle brake function
if (isHandNotOverAnySlot(leftGesture) && isGrabPressedLong && !gameState.is_riding_mount) {
if (!gameState.prevent_grab_inputs) {
// Handle interact action. is_riding_mount check added to prevent conflict with master cycle brake function
if (!gameState.prevent_grab_inputs && !gameState.is_riding_mount) {
if (isHandNotOverAnySlot(leftGesture) && isCurrentInteractPressed) {
buttonHold |= VPAD_BUTTON_A;
}
}
Expand All @@ -516,15 +512,16 @@ void processRightHandInGameInput(
constexpr RumbleParameters OverSlotsRumble = { false, 1, RumbleType::OscillationRaisingSawtoothWave, 1.0f, false, 1.0, 0.25f, 0.25f };

auto* rumbleMgr = VRManager::instance().XR->GetRumbleManager();
bool isGrabPressedShort = inputs.inGame.grabState[1].lastEvent == ButtonState::Event::ShortPress;
bool isGrabPressedLong = inputs.inGame.grabState[1].lastEvent == ButtonState::Event::LongPress;
bool isCurrentGrabPressed = inputs.inGame.grabState[1].wasDownLastFrame;
bool isGrabPressedShort = inputs.shared.grabState[1].lastEvent == ButtonState::Event::ShortPress;
bool isGrabPressedLong = inputs.shared.grabState[1].lastEvent == ButtonState::Event::LongPress;
bool isCurrentGrabPressed = inputs.shared.grabState[1].wasDownLastFrame;
bool isCurrentInteractPressed = inputs.inGame.interactState[1].wasDownLastFrame;
bool isTriggerPressed = inputs.inGame.useRightItem.currentState;

// Handle shoulder slot interactions
if (isHandOverLeftShoulderSlot(rightGesture) || isHandOverRightShoulderSlot(rightGesture)) {
// Handle dpad menu
if (openDpadMenuBodySlots(inputs.inGame.grabState[1].lastEvent, rightGesture, buttonHold, gameState))
if (openDpadMenuBodySlots(inputs.shared.grabState[1].lastEvent, rightGesture, buttonHold, gameState, OpenXR::DpadMenuButton::RGrab))
// Don't process normal input when opening dpad menu
return;

Expand Down Expand Up @@ -589,7 +586,7 @@ void processRightHandInGameInput(
// Handle waist slot interaction (Rune)
if (isHandOverLeftWaistSlot(rightGesture)) {
// Handle dpad menu
if (openDpadMenuBodySlots(inputs.inGame.grabState[1].lastEvent, rightGesture, buttonHold, gameState))
if (openDpadMenuBodySlots(inputs.shared.grabState[1].lastEvent, rightGesture, buttonHold, gameState, OpenXR::DpadMenuButton::RGrab))
// Don't process normal input when opening dpad menu
return;

Expand Down Expand Up @@ -667,16 +664,8 @@ void processRightHandInGameInput(
else
gameState.right_hand_position_stored = false;

if (isGrabPressedShort) {
// Handle grab action
if (!gameState.prevent_grab_inputs) {
buttonHold |= VPAD_BUTTON_A;
}
}

// Master Sword QTE fix
if (isHandNotOverAnySlot(rightGesture) && isGrabPressedLong) {
if (!gameState.prevent_grab_inputs) {
if (!gameState.prevent_grab_inputs) {
if (isHandNotOverAnySlot(rightGesture) && isCurrentInteractPressed) {
buttonHold |= VPAD_BUTTON_A;
}
}
Expand Down Expand Up @@ -791,8 +780,7 @@ void processMenuInput(
return state.currentState ? btn : 0;
};

if (!closeDpadMenu(inputs, gameState))
buttonHold |= mapButton(inputs.inMenu.sort, VPAD_BUTTON_Y);
closeDpadMenu(inputs, gameState);

if (!gameState.prevent_inputs) {
buttonHold |= mapButton(inputs.inMenu.back, VPAD_BUTTON_B);
Expand All @@ -803,8 +791,10 @@ void processMenuInput(
}

buttonHold |= mapButton(inputs.inMenu.select, VPAD_BUTTON_A);
buttonHold |= mapButton(inputs.inMenu.sort, VPAD_BUTTON_Y);
buttonHold |= mapButton(inputs.inMenu.leftTrigger, VPAD_BUTTON_L);
buttonHold |= mapButton(inputs.inMenu.rightTrigger, VPAD_BUTTON_R);
buttonHold |= mapButton(inputs.inMenu.rotate, VPAD_BUTTON_STICK_R);

if (inputs.inMenu.holdState.lastEvent == ButtonState::Event::ShortPress)
buttonHold |= VPAD_BUTTON_X;
Expand Down Expand Up @@ -1040,8 +1030,8 @@ void CemuHooks::hook_InjectXRInput(PPCInterpreter_t* hCPU) {
}

// Optional rune inputs (for seated players)
openDpadMenuRuneButton(inputs.inGame.useRune_runeMenuState.lastEvent, newXRBtnHold, gameState);
if (inputs.inGame.useRune_runeMenuState.lastEvent == ButtonState::Event::ShortPress) {
openDpadMenuRuneButton(inputs.shared.useRune_runeMenuState.lastEvent, newXRBtnHold, gameState);
if (inputs.shared.useRune_runeMenuState.lastEvent == ButtonState::Event::ShortPress) {
newXRBtnHold |= VPAD_BUTTON_L; // Equip rune
gameState.last_equip_type_held = EquipType::SheikahSlate;
}
Expand All @@ -1056,9 +1046,9 @@ void CemuHooks::hook_InjectXRInput(PPCInterpreter_t* hCPU) {
newXRBtnHold |= mapXRButtonToVpad(inputs.inGame.run_interact, VPAD_BUTTON_A);
// grabs to accelerate and brake when riding master cycle
// Skip when the respective hand is inside a body slot so grips can still equip/unequip
if (inputs.inGame.grabState[1].wasDownLastFrame && isHandNotOverAnySlot(rightGesture))
if (inputs.inGame.interactState[1].wasDownLastFrame && isHandNotOverAnySlot(rightGesture))
newXRBtnHold |= VPAD_BUTTON_A;
if (inputs.inGame.grabState[0].wasDownLastFrame && isHandNotOverAnySlot(leftGesture))
if (inputs.inGame.interactState[0].wasDownLastFrame && isHandNotOverAnySlot(leftGesture))
newXRBtnHold |= VPAD_BUTTON_B;
}
else {
Expand All @@ -1071,7 +1061,7 @@ void CemuHooks::hook_InjectXRInput(PPCInterpreter_t* hCPU) {

// Whistle gesture
if (isHandOverMouthSlot(leftGesture) && isHandOverMouthSlot(rightGesture)) {
if (inputs.inGame.grabState[0].wasDownLastFrame && inputs.inGame.grabState[1].wasDownLastFrame) {
if (inputs.shared.grabState[0].wasDownLastFrame && inputs.shared.grabState[1].wasDownLastFrame) {
rumbleMgr->enqueueInputsRumbleCommand({ true, 0, RumbleType::OscillationRaisingSawtoothWave, 1.0f, false, 0.25, 0.2f, 0.2f });
newXRBtnHold |= VPAD_BUTTON_DOWN;
}
Expand Down Expand Up @@ -1150,11 +1140,11 @@ void CemuHooks::hook_CreateNewActor(PPCInterpreter_t* hCPU) {
// }
//
// // test if controller is connected
// if (inputs.inGame.grab[OpenXR::EyeSide::LEFT].currentState == XR_TRUE && inputs.inGame.grab[OpenXR::EyeSide::LEFT].changedSinceLastSync == XR_TRUE) {
// if (inputs.shared.grab[OpenXR::EyeSide::LEFT].currentState == XR_TRUE && inputs.shared.grab[OpenXR::EyeSide::LEFT].changedSinceLastSync == XR_TRUE) {
// Log::print("Trying to spawn new thing!");
// hCPU->gpr[3] = 1;
// }
// else if (inputs.inGame.grab[OpenXR::EyeSide::RIGHT].currentState == XR_TRUE && inputs.inGame.grab[OpenXR::EyeSide::RIGHT].changedSinceLastSync == XR_TRUE) {
// else if (inputs.shared.grab[OpenXR::EyeSide::RIGHT].currentState == XR_TRUE && inputs.shared.grab[OpenXR::EyeSide::RIGHT].changedSinceLastSync == XR_TRUE) {
// Log::print("Trying to spawn new thing!");
// hCPU->gpr[3] = 1;
// }
Expand Down
2 changes: 1 addition & 1 deletion src/hooking/weapon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ void CemuHooks::hook_EquipWeapon(PPCInterpreter_t* hCPU) {
auto input = VRManager::instance().XR->m_input.load();
// Check both hands for a short press to pick up weapon
for (int side = 0; side < 2; ++side) {
auto& grabState = input.inGame.grabState[side];
auto& grabState = input.shared.grabState[side];
// todo: Make sword smaller while its equipped. I think this might be a member value, but otherwise we can just scale the weapon matrix.

//if (input.inGame.in_game && grabState.shortPress) {
Expand Down
Loading