Skip to content

Commit

Permalink
Cleanup XInput
Browse files Browse the repository at this point in the history
  • Loading branch information
@oneup03
oneup03 committed Sep 20, 2024
1 parent a2b417a commit bdce667
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 70 deletions.
120 changes: 53 additions & 67 deletions vrto3d/src/hmd_device_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
#include <sstream>
#include <ctime>
#include <iomanip>
#include <vector>
#include <windows.h>
#include <Xinput.h>

// Link the XInput library
#pragma comment(lib, "XInput.lib")
Expand Down Expand Up @@ -114,6 +112,8 @@ MockControllerDeviceDriver::MockControllerDeviceDriver()
// Keep track of whether Activate() has been called
is_active_ = false;

state_ = new XINPUT_STATE();

auto* vrs = vr::VRSettings();

char model_number[ 1024 ];
Expand Down Expand Up @@ -431,15 +431,15 @@ vr::DriverPose_t MockControllerDeviceDriver::GetPose()
pose.qRotation = HmdQuaternion_Identity;

// Adjust pitch based on controller input
if (stereo_display_component_->GetConfig().pitch_enable)
if (stereo_display_component_->GetConfig().pitch_enable && got_xinput_)
{
stereo_display_component_->AdjustPitch(currentPitch);
stereo_display_component_->AdjustPitch(currentPitch, state_);
}

// Adjust yaw based on controller input
if (stereo_display_component_->GetConfig().yaw_enable)
if (stereo_display_component_->GetConfig().yaw_enable && got_xinput_)
{
stereo_display_component_->AdjustYaw(currentYawQuat);
stereo_display_component_->AdjustYaw(currentYawQuat, state_);
}

// Reset Pose to origin
Expand Down Expand Up @@ -526,6 +526,9 @@ void MockControllerDeviceDriver::PoseUpdateThread()
{
if (!is_loading_)
{
ZeroMemory(state_, sizeof(XINPUT_STATE));
got_xinput_ = (_XInputGetState(0, state_) == ERROR_SUCCESS);

// Inform the vrserver that our tracked device's pose has updated, giving it the pose returned by our GetPose().
vr::VRServerDriverHost()->TrackedDevicePoseUpdated(device_index_, GetPose(), sizeof(vr::DriverPose_t));

Expand Down Expand Up @@ -578,7 +581,7 @@ void MockControllerDeviceDriver::PoseUpdateThread()
}

// Check User binds
stereo_display_component_->CheckUserSettings(device_index_);
stereo_display_component_->CheckUserSettings(got_xinput_, state_, device_index_);
}
// Update our pose ~ every frame
std::this_thread::sleep_for( std::chrono::milliseconds(sleep_time));
Expand Down Expand Up @@ -916,7 +919,7 @@ float StereoDisplayComponent::GetConvergence()
//-----------------------------------------------------------------------------
// Purpose: Check User Settings and act on them
//-----------------------------------------------------------------------------
void StereoDisplayComponent::CheckUserSettings(uint32_t device_index)
void StereoDisplayComponent::CheckUserSettings(bool got_xinput, XINPUT_STATE* state, uint32_t device_index)
{
static bool pitch_set = config_.pitch_enable;
static bool yaw_set = config_.yaw_enable;
Expand All @@ -925,19 +928,16 @@ void StereoDisplayComponent::CheckUserSettings(uint32_t device_index)

// Get the state of the first controller (index 0)
DWORD xstate = 0x00000000;
XINPUT_STATE state;
ZeroMemory(&state, sizeof(XINPUT_STATE));
DWORD dwResult = _XInputGetState(0, &state);
xstate = state.Gamepad.wButtons;
if (state.Gamepad.bLeftTrigger > XINPUT_GAMEPAD_TRIGGER_THRESHOLD) {
xstate = state->Gamepad.wButtons;
if (state->Gamepad.bLeftTrigger > XINPUT_GAMEPAD_TRIGGER_THRESHOLD) {
xstate |= XINPUT_GAMEPAD_LEFT_TRIGGER;
}
if (state.Gamepad.bRightTrigger > XINPUT_GAMEPAD_TRIGGER_THRESHOLD) {
if (state->Gamepad.bRightTrigger > XINPUT_GAMEPAD_TRIGGER_THRESHOLD) {
xstate |= XINPUT_GAMEPAD_RIGHT_TRIGGER;
}

// Toggle Pitch and Yaw control
if (((config_.ctrl_xinput && dwResult == ERROR_SUCCESS &&
if (((config_.ctrl_xinput && got_xinput &&
((xstate & config_.ctrl_toggle_key) == config_.ctrl_toggle_key))
|| (!config_.ctrl_xinput && (GetAsyncKeyState(config_.ctrl_toggle_key) & 0x8000)))
&& sleep_ctrl == 0)
Expand All @@ -955,7 +955,7 @@ void StereoDisplayComponent::CheckUserSettings(uint32_t device_index)
}

// Reset HMD position
if (((config_.reset_xinput && dwResult == ERROR_SUCCESS &&
if (((config_.reset_xinput && got_xinput &&
((xstate & config_.pose_reset_key) == config_.pose_reset_key))
|| (!config_.reset_xinput && (GetAsyncKeyState(config_.pose_reset_key) & 0x8000)))
&& sleep_rest == 0)
Expand All @@ -976,7 +976,7 @@ void StereoDisplayComponent::CheckUserSettings(uint32_t device_index)
config_.sleep_count[i]--;

// Load stored depth & convergence
if ((config_.load_xinput[i] && dwResult == ERROR_SUCCESS &&
if ((config_.load_xinput[i] && got_xinput &&
((xstate & config_.user_load_key[i]) == config_.user_load_key[i]))
|| (!config_.load_xinput[i] && (GetAsyncKeyState(config_.user_load_key[i]) & 0x8000)))
{
Expand Down Expand Up @@ -1033,74 +1033,60 @@ void StereoDisplayComponent::CheckUserSettings(uint32_t device_index)
//-----------------------------------------------------------------------------
// Purpose: Adjust HMD Pitch using XInput Right Stick YAxis
//-----------------------------------------------------------------------------
void StereoDisplayComponent::AdjustPitch(float& currentPitch)
void StereoDisplayComponent::AdjustPitch(float& currentPitch, XINPUT_STATE* state)
{
XINPUT_STATE state;
ZeroMemory(&state, sizeof(XINPUT_STATE));
DWORD dwResult = XInputGetState(0, &state);
SHORT sThumbRY = state->Gamepad.sThumbRY;
float normalizedY = sThumbRY / 32767.0f;

if (dwResult == ERROR_SUCCESS)
// Apply deadzone
if (std::abs(normalizedY) < config_.ctrl_deadzone)
{
SHORT sThumbRY = state.Gamepad.sThumbRY;
float normalizedY = sThumbRY / 32767.0f;

// Apply deadzone
if (std::abs(normalizedY) < config_.ctrl_deadzone)
{
normalizedY = 0.0f;
}
normalizedY = 0.0f;
}
else
{
if (normalizedY > 0)
normalizedY = (normalizedY - config_.ctrl_deadzone) / (1.0f - config_.ctrl_deadzone);
else
{
if (normalizedY > 0)
normalizedY = (normalizedY - config_.ctrl_deadzone) / (1.0f - config_.ctrl_deadzone);
else
normalizedY = (normalizedY + config_.ctrl_deadzone) / (1.0f - config_.ctrl_deadzone);
}

// Scale Pitch
currentPitch += (normalizedY * config_.ctrl_sensitivity);
if (currentPitch > 90.0f) currentPitch = 90.0f;
if (currentPitch < -90.0f) currentPitch = -90.0f;
normalizedY = (normalizedY + config_.ctrl_deadzone) / (1.0f - config_.ctrl_deadzone);
}

// Scale Pitch
currentPitch += (normalizedY * config_.ctrl_sensitivity);
if (currentPitch > 90.0f) currentPitch = 90.0f;
if (currentPitch < -90.0f) currentPitch = -90.0f;
}


//-----------------------------------------------------------------------------
// Purpose: Adjust HMD Yaw using XInput Right Stick XAxis
//-----------------------------------------------------------------------------
void StereoDisplayComponent::AdjustYaw(vr::HmdQuaternion_t& currentYawQuat)
void StereoDisplayComponent::AdjustYaw(vr::HmdQuaternion_t& currentYawQuat, XINPUT_STATE* state)
{
XINPUT_STATE state;
ZeroMemory(&state, sizeof(XINPUT_STATE));
DWORD dwResult = XInputGetState(0, &state);
SHORT sThumbRX = state->Gamepad.sThumbRX;
float normalizedX = sThumbRX / 32767.0f;

if (dwResult == ERROR_SUCCESS)
// Apply deadzone
if (std::abs(normalizedX) < config_.ctrl_deadzone)
{
SHORT sThumbRX = state.Gamepad.sThumbRX;
float normalizedX = sThumbRX / 32767.0f;

// Apply deadzone
if (std::abs(normalizedX) < config_.ctrl_deadzone)
{
normalizedX = 0.0f;
}
normalizedX = 0.0f;
}
else
{
if (normalizedX > 0)
normalizedX = (normalizedX - config_.ctrl_deadzone) / (1.0f - config_.ctrl_deadzone);
else
{
if (normalizedX > 0)
normalizedX = (normalizedX - config_.ctrl_deadzone) / (1.0f - config_.ctrl_deadzone);
else
normalizedX = (normalizedX + config_.ctrl_deadzone) / (1.0f - config_.ctrl_deadzone);
}
normalizedX = (normalizedX + config_.ctrl_deadzone) / (1.0f - config_.ctrl_deadzone);
}

// Scale Yaw
float yawAdjustment = -normalizedX * config_.ctrl_sensitivity;
// Scale Yaw
float yawAdjustment = -normalizedX * config_.ctrl_sensitivity;

// Create a quaternion for the yaw adjustment
vr::HmdQuaternion_t yawQuatAdjust = QuaternionFromAxisAngle(0.0f, 1.0f, 0.0f, DEG_TO_RAD(yawAdjustment));
// Create a quaternion for the yaw adjustment
vr::HmdQuaternion_t yawQuatAdjust = QuaternionFromAxisAngle(0.0f, 1.0f, 0.0f, DEG_TO_RAD(yawAdjustment));

// Update the current yaw quaternion
currentYawQuat = HmdQuaternion_Normalize(yawQuatAdjust * currentYawQuat);
}
// Update the current yaw quaternion
currentYawQuat = HmdQuaternion_Normalize(yawQuatAdjust * currentYawQuat);
}


Expand Down
12 changes: 9 additions & 3 deletions vrto3d/src/hmd_device_driver.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
#include <thread>
#include <vector>

// Forward declare XINPUT_STATE
struct _XINPUT_STATE;
typedef _XINPUT_STATE XINPUT_STATE;

struct StereoDisplayDriverConfiguration
{
Expand Down Expand Up @@ -96,9 +99,9 @@ class StereoDisplayComponent : public vr::IVRDisplayComponent
void AdjustConvergence(float new_conv, bool is_delta, uint32_t device_index);
float GetDepth();
float GetConvergence();
void CheckUserSettings(uint32_t device_index);
void AdjustPitch(float& currentPitch);
void AdjustYaw(vr::HmdQuaternion_t& currentYawQuat);
void CheckUserSettings(bool got_xinput, XINPUT_STATE* state, uint32_t device_index);
void AdjustPitch(float& currentPitch, XINPUT_STATE* state);
void AdjustYaw(vr::HmdQuaternion_t& currentYawQuat, XINPUT_STATE* state);
void SetHeight();
void SetReset();
void LoadSettings(const std::string& app_name, uint32_t device_index);
Expand Down Expand Up @@ -144,6 +147,9 @@ class MockControllerDeviceDriver : public vr::ITrackedDeviceServerDriver
std::atomic< bool > is_on_top_;
std::atomic< bool > is_loading_;

XINPUT_STATE* state_;
bool got_xinput_;

std::thread pose_update_thread_;
std::thread focus_update_thread_;
};

0 comments on commit bdce667

Please sign in to comment.