From 1559b4404a33b4372ee3e56430613b7661055099 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Mon, 19 Aug 2013 22:40:05 +0200 Subject: [PATCH] Fix some joystick mapping errors, a minor bug --- Common/KeyMap.cpp | 12 ++++++------ UI/EmuScreen.cpp | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Common/KeyMap.cpp b/Common/KeyMap.cpp index 858424fbe5..d084bf5585 100644 --- a/Common/KeyMap.cpp +++ b/Common/KeyMap.cpp @@ -108,18 +108,18 @@ static const DefMappingStruct defaultShieldKeyMap[] = { {CTRL_SQUARE ,NKCODE_BUTTON_X}, {CTRL_TRIANGLE ,NKCODE_BUTTON_Y}, {CTRL_START, NKCODE_BUTTON_START}, - {CTRL_SELECT, NKCODE_BUTTON_L2}, + {CTRL_SELECT, JOYSTICK_AXIS_LTRIGGER, +1}, {CTRL_LTRIGGER, NKCODE_BUTTON_L1}, {CTRL_RTRIGGER, NKCODE_BUTTON_R1}, {VIRTKEY_AXIS_X_MIN, JOYSTICK_AXIS_X, -1}, {VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1}, - {VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, -1}, - {VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, +1}, + {VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, +1}, + {VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, -1}, {CTRL_LEFT, JOYSTICK_AXIS_HAT_X, -1}, {CTRL_RIGHT, JOYSTICK_AXIS_HAT_X, +1}, {CTRL_UP, JOYSTICK_AXIS_HAT_Y, -1}, {CTRL_DOWN, JOYSTICK_AXIS_HAT_Y, +1}, - {VIRTKEY_UNTHROTTLE, NKCODE_BUTTON_R2 }, + {VIRTKEY_UNTHROTTLE, JOYSTICK_AXIS_RTRIGGER, +1 }, {VIRTKEY_PAUSE, NKCODE_BACK }, }; @@ -142,8 +142,8 @@ static const DefMappingStruct defaultPadMap[] = { {VIRTKEY_SPEED_TOGGLE, NKCODE_BUTTON_L2}, {VIRTKEY_AXIS_X_MIN, JOYSTICK_AXIS_X, -1}, {VIRTKEY_AXIS_X_MAX, JOYSTICK_AXIS_X, +1}, - {VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, -1}, - {VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, +1}, + {VIRTKEY_AXIS_Y_MIN, JOYSTICK_AXIS_Y, +1}, + {VIRTKEY_AXIS_Y_MAX, JOYSTICK_AXIS_Y, -1}, #else {CTRL_CROSS , NKCODE_BUTTON_2}, {CTRL_CIRCLE , NKCODE_BUTTON_3}, diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp index 64bad9f6c9..06c0b23401 100644 --- a/UI/EmuScreen.cpp +++ b/UI/EmuScreen.cpp @@ -512,12 +512,12 @@ void EmuScreen::render() { case 3: sprintf(fpsbuf, "%0.1f/%0.0f (%0.1f%%)", actual_fps, fps, vps / 60.0f * 100.0f); break; } - ui_draw2d.SetFontScale(0.6f, 0.6f); + ui_draw2d.SetFontScale(0.7f, 0.7f); ui_draw2d.DrawText(UBUNTU24, fpsbuf, dp_xres - 8, 12, 0xc0000000, ALIGN_TOPRIGHT); ui_draw2d.DrawText(UBUNTU24, fpsbuf, dp_xres - 10, 10, 0xFF3fFF3f, ALIGN_TOPRIGHT); + ui_draw2d.SetFontScale(1.0f, 1.0f); } - glsl_bind(UIShader_Get()); ui_draw2d.End(); ui_draw2d.Flush();