diff --git a/ISLE/isleapp.cpp b/ISLE/isleapp.cpp index b042c683..373ea881 100644 --- a/ISLE/isleapp.cpp +++ b/ISLE/isleapp.cpp @@ -500,7 +500,6 @@ SDL_AppResult SDL_AppEvent(void* appstate, SDL_Event* event) g_lastJoystickMouseY = -((float) event->gaxis.value) / SDL_JOYSTICK_AXIS_MAX * 4; } else if (event->gaxis.axis == SDL_XBOX_AXIS_RIGHT_TRIGGER) { - SDL_Log("Right trigger axis motion: %d", event->gaxis.value); if (event->gaxis.value != SDL_JOYSTICK_AXIS_MIN) { g_mousedown = TRUE; diff --git a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp index a70b43f5..08c40da1 100644 --- a/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp +++ b/LEGO1/lego/legoomni/src/input/legoinputmanager.cpp @@ -189,8 +189,13 @@ MxResult LegoInputManager::GetJoystickState(MxU32* p_joystickX, MxU32* p_joystic return FAILURE; } +#ifdef WINDOWS_STORE + MxS16 xPos = SDL_GetJoystickAxis(m_joystick, 1); + MxS16 yPos = -SDL_GetJoystickAxis(m_joystick, 0); +#else MxS16 xPos = SDL_GetJoystickAxis(m_joystick, 0); MxS16 yPos = SDL_GetJoystickAxis(m_joystick, 1); +#endif MxU8 hatPos = SDL_GetJoystickHat(m_joystick, 0); // normalize values acquired from joystick axes