Skip to content

Fixed Gyro not working #8

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

Merged
Kenix3 merged 1 commit into from
Mar 22, 2022
Merged

Fixed Gyro not working #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
39 changes: 7 additions & 32 deletions libultraship/libultraship/SDLController.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,38 +63,9 @@ namespace Ship {
if (Conf[ConfSection]["GUID"].compare("") == 0 || Conf[ConfSection]["GUID"].compare(INVALID_SDL_CONTROLLER_GUID) == 0 || Conf[ConfSection]["GUID"].compare(NewGuid) == 0) {
auto NewCont = SDL_GameControllerOpen(i);

if (SDL_GameControllerHasSensor(Cont, SDL_SENSOR_GYRO)){
float gyroData[3];
SDL_GameControllerGetSensorData(Cont, SDL_SENSOR_GYRO, gyroData, 3);

const char* contName = SDL_GameControllerName(Cont);
const int isSpecialController = strcmp("PS5 Controller", contName);
const float gyroSensitivity = Game::Settings.controller.gyro_sensitivity;

if (gyroDriftX == 0) {
if (isSpecialController == 0) {
gyroDriftX = gyroData[2];
}
else {
gyroDriftX = gyroData[0];
}
}

if (gyroDriftY == 0) {
gyroDriftY = gyroData[1];
}

if (isSpecialController == 0) {
wGyroX = gyroData[2] - gyroDriftX;
}
else {
wGyroX = gyroData[0] - gyroDriftX;
}

wGyroY = gyroData[1] - gyroDriftY;

wGyroX *= gyroSensitivity;
wGyroY *= gyroSensitivity;
if (SDL_GameControllerHasSensor(NewCont, SDL_SENSOR_GYRO))
{
SDL_GameControllerSetSensorEnabled(NewCont, SDL_SENSOR_GYRO, SDL_TRUE);
}

// We failed to load the controller. Go to next.
Expand Down Expand Up @@ -216,6 +187,7 @@ namespace Ship {

const char* contName = SDL_GameControllerName(Cont);
const int isSpecialController = strcmp("PS5 Controller", contName);
const float gyroSensitivity = Game::Settings.controller.gyro_sensitivity;

if (gyroDriftX == 0) {
if (isSpecialController == 0) {
Expand All @@ -238,6 +210,9 @@ namespace Ship {
}

wGyroY = gyroData[1] - gyroDriftY;

wGyroX *= gyroSensitivity;
wGyroY *= gyroSensitivity;
}

for (int32_t i = SDL_CONTROLLER_BUTTON_A; i < SDL_CONTROLLER_BUTTON_MAX; i++) {
Expand Down