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

Add two DPAD shifting methods #139

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add two DPAD shifting methods #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cca8b8
Add another DPAD Shifting method R3 + Left Joystick
wdoo02 Jan 11, 2024
4b7716e
Merge branch 'pico_controller_dev'
wdoo02 Jan 16, 2024
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
84 changes: 57 additions & 27 deletions src/mods/VR.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,8 @@ void VR::on_xinput_get_state(uint32_t* retval, uint32_t user_index, XINPUT_STATE
state->Gamepad.sThumbRY = (int16_t)std::clamp<float>(((float)state->Gamepad.sThumbRY + right_joystick_axis.y * 32767.0f), -32767.0f, 32767.0f);

bool already_dpad_shifted{false};
bool true_left_joystick_as_dpad{false};
bool true_right_joystick_as_dpad{false};

if (m_dpad_gesture_state.direction != DPadGestureState::Direction::NONE) {
already_dpad_shifted = true;
Expand All @@ -895,9 +897,14 @@ void VR::on_xinput_get_state(uint32_t* retval, uint32_t user_index, XINPUT_STATE
state->Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT;
}

// Zero out the thumbstick values
state->Gamepad.sThumbLX = 0;
state->Gamepad.sThumbLY = 0;
DPadMethod dpad_method = get_dpad_method();
if (dpad_method == DPadMethod::GESTURE_HEAD){
true_left_joystick_as_dpad = true;
}
else if (dpad_method == DPadMethod::GESTURE_HEAD_RIGHT) {
true_right_joystick_as_dpad = true;
}


std::scoped_lock _{m_dpad_gesture_state.mtx};
m_dpad_gesture_state.direction = DPadGestureState::Direction::NONE;
Expand All @@ -918,25 +925,30 @@ void VR::on_xinput_get_state(uint32_t* retval, uint32_t user_index, XINPUT_STATE
button_touch_inactive = !is_action_active_any_joystick(m_action_a_button_touch_left) && !is_action_active_any_joystick(m_action_b_button_touch_left);
}

const auto dpad_active = (button_touch_inactive && thumbrest_check) || dpad_method == DPadMethod::LEFT_JOYSTICK || dpad_method == DPadMethod::RIGHT_JOYSTICK;
// Toggling UEVR menu using L3 + R3 has higher priority
const auto dpad_active = (is_right_joystick_click_down && (dpad_method == DPadMethod::RIGHT_JOYSTICK_CLICK) && (! is_left_joystick_click_down))
|| (is_left_joystick_click_down && (dpad_method == DPadMethod::LEFT_JOYSTICK_CLICK) && (! is_right_joystick_click_down))
|| (button_touch_inactive && thumbrest_check) || dpad_method == DPadMethod::LEFT_JOYSTICK || dpad_method == DPadMethod::RIGHT_JOYSTICK;

if (dpad_active) {
float ty{0.0f};
float tx{0.0f};
//SHORT ThumbY{0};
//SHORT ThumbX{0};
// If someone is accidentally touching both thumbrests while also moving a joystick, this will default to left joystick.
if (dpad_method == DPadMethod::RIGHT_TOUCH || dpad_method == DPadMethod::LEFT_JOYSTICK) {
if (dpad_method == DPadMethod::RIGHT_TOUCH || dpad_method == DPadMethod::LEFT_JOYSTICK || dpad_method == DPadMethod::RIGHT_JOYSTICK_CLICK) {
//ThumbY = state->Gamepad.sThumbLY;
//ThumbX = state->Gamepad.sThumbLX;
ty = true_left_joystick_axis.y;
tx = true_left_joystick_axis.x;
true_left_joystick_as_dpad = true;
}
else if (dpad_method == DPadMethod::LEFT_TOUCH || dpad_method == DPadMethod::RIGHT_JOYSTICK) {
else if (dpad_method == DPadMethod::LEFT_TOUCH || dpad_method == DPadMethod::RIGHT_JOYSTICK || dpad_method == DPadMethod::LEFT_JOYSTICK_CLICK) {
//ThumbY = state->Gamepad.sThumbRY;
//ThumbX = state->Gamepad.sThumbRX;
ty = true_right_joystick_axis.y;
tx = true_right_joystick_axis.x;
true_right_joystick_as_dpad = true;
}

if (ty >= 0.5f) {
Expand All @@ -955,27 +967,40 @@ void VR::on_xinput_get_state(uint32_t* retval, uint32_t user_index, XINPUT_STATE
state->Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT;
}

if (dpad_method == DPadMethod::RIGHT_TOUCH || dpad_method == DPadMethod::LEFT_JOYSTICK) {
if (!wants_swap) {
state->Gamepad.sThumbLY = 0;
state->Gamepad.sThumbLX = 0;
} else {
state->Gamepad.sThumbRY = 0;
state->Gamepad.sThumbRX = 0;
}
if(dpad_method == DPadMethod::RIGHT_JOYSTICK_CLICK)
{
state->Gamepad.wButtons &= ~XINPUT_GAMEPAD_RIGHT_THUMB;
}
else if (dpad_method == DPadMethod::LEFT_TOUCH || dpad_method == DPadMethod::RIGHT_JOYSTICK) {
if (!wants_swap) {
state->Gamepad.sThumbRY = 0;
state->Gamepad.sThumbRX = 0;
} else {
state->Gamepad.sThumbLY = 0;
state->Gamepad.sThumbLX = 0;
}
else if(dpad_method == DPadMethod::LEFT_JOYSTICK_CLICK)
{
state->Gamepad.wButtons &= ~XINPUT_GAMEPAD_LEFT_THUMB;
}

}
}

// Zero out the thumbstick values
if (true_left_joystick_as_dpad) {
if (!wants_swap) {
state->Gamepad.sThumbLY = 0;
state->Gamepad.sThumbLX = 0;
} else {
state->Gamepad.sThumbRY = 0;
state->Gamepad.sThumbRX = 0;
}
}
else if (true_right_joystick_as_dpad) {
if (!wants_swap) {
state->Gamepad.sThumbRY = 0;
state->Gamepad.sThumbRX = 0;
} else {
state->Gamepad.sThumbLY = 0;
state->Gamepad.sThumbLX = 0;
}
}



// Determine if snapturn should be run on frame
if (m_snapturn->value()) {
DPadMethod dpad_method = get_dpad_method();
Expand All @@ -996,12 +1021,17 @@ void VR::on_xinput_get_state(uint32_t* retval, uint32_t user_index, XINPUT_STATE
else {
stick_axis = right_joystick_axis.x;
const auto& thumbrest_touch_left = !wants_swap ? m_action_thumbrest_touch_left : m_action_thumbrest_touch_right;
if (glm::abs(stick_axis) >= snapturn_deadzone && !(dpad_method == DPadMethod::LEFT_TOUCH && is_action_active_any_joystick(thumbrest_touch_left))) {
if (stick_axis < 0) {
m_snapturn_left = true;
const auto& stick_as_dpad = (!wants_swap) ? true_right_joystick_as_dpad : true_left_joystick_as_dpad;
if (glm::abs(stick_axis) >= snapturn_deadzone){
if(!stick_as_dpad) {
if (stick_axis < 0) {
m_snapturn_left = true;
}
m_snapturn_on_frame = true;
}
m_snapturn_on_frame = true;
m_was_snapturn_run_on_input = true;
// Requiring the joystick returning to its natrual position at least once before another snapturn,
// even if no snapturn is actually run
m_was_snapturn_run_on_input = true;
}
}
}
Expand Down
4 changes: 4 additions & 0 deletions src/mods/VR.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class VR : public Mod {
RIGHT_JOYSTICK,
GESTURE_HEAD,
GESTURE_HEAD_RIGHT,
RIGHT_JOYSTICK_CLICK,
LEFT_JOYSTICK_CLICK
};

static const inline std::string s_action_pose = "/actions/default/in/Pose";
Expand Down Expand Up @@ -762,6 +764,8 @@ class VR : public Mod {
"Right Joystick (Disables Standard Joystick Input)",
"Gesture (Head) + Left Joystick",
"Gesture (Head) + Right Joystick",
"Right Joystick Press + Left Joystick (Disables R3)",
"Left Joystick Press + Right Joystick (Disables L3)"
};

const ModCombo::Ptr m_rendering_method{ ModCombo::create(generate_name("RenderingMethod"), s_rendering_method_names) };
Expand Down