From 3c8655f48627ddf7c6ecab2bdf31f5bbab8cf276 Mon Sep 17 00:00:00 2001 From: "Javier S. Pedro" Date: Mon, 8 Feb 2010 20:25:39 +0100 Subject: [PATCH] onscreen diagonals --- debian/changelog | 4 +++- platform/sdli.cpp | 36 +++++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index 01f4513..f56b11c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ drnoksnes (1.3.0) unstable; urgency=low * Diablo config dialogs updated. * Allow player 2 to use onscreen controls. + * Diagonals in onscreen controls. + * Diagonals in keyboard controls. - -- Javier S. Pedro Mon, 8 Feb 2010 19:51:41 +0100 + -- Javier S. Pedro Mon, 8 Feb 2010 20:19:15 +0100 drnoksnes (1.2.6) unstable; urgency=low diff --git a/platform/sdli.cpp b/platform/sdli.cpp index 7553c8a..0e454d1 100644 --- a/platform/sdli.cpp +++ b/platform/sdli.cpp @@ -14,27 +14,33 @@ struct TouchButton { double fw, fh; }; -#define TOUCH_BUTTON_INITIALIZER(name, x, y, w, h) \ - {SNES_##name##_MASK, 0, 0, 0, 0, x, y, w, h} - #define kCornerButtonWidth (0.375) #define kCornerButtonHeight (0.0833333333334) #define kBigButtonWidth (0.125) #define kBigButtonHeight (0.2777777777778) static TouchButton touchbuttons[] = { - TOUCH_BUTTON_INITIALIZER(TL, 0.0, 0.0, kCornerButtonWidth, kCornerButtonHeight), - TOUCH_BUTTON_INITIALIZER(TR, 0.625, 0.0, kCornerButtonWidth, kCornerButtonHeight), - TOUCH_BUTTON_INITIALIZER(UP, kBigButtonWidth, kCornerButtonHeight, kBigButtonWidth, kBigButtonHeight), - TOUCH_BUTTON_INITIALIZER(LEFT, 0.0, kCornerButtonHeight + kBigButtonHeight, kBigButtonWidth, kBigButtonHeight), - TOUCH_BUTTON_INITIALIZER(RIGHT, 2.0 * kBigButtonWidth, kCornerButtonHeight + kBigButtonHeight, kBigButtonWidth, kBigButtonHeight), - TOUCH_BUTTON_INITIALIZER(DOWN, kBigButtonWidth, 1.0 - (kCornerButtonHeight + kBigButtonHeight), kBigButtonWidth, kBigButtonHeight), - TOUCH_BUTTON_INITIALIZER(SELECT, 0.0, 1.0 - kCornerButtonHeight, kCornerButtonWidth, kCornerButtonHeight), - TOUCH_BUTTON_INITIALIZER(X, 1.0 - 2.0 * kBigButtonWidth, kCornerButtonHeight, kBigButtonWidth, kBigButtonHeight), - TOUCH_BUTTON_INITIALIZER(Y, 1.0 - 3.0 * kBigButtonWidth, kCornerButtonHeight + kBigButtonHeight, kBigButtonWidth, kBigButtonHeight), - TOUCH_BUTTON_INITIALIZER(A, 1.0 - kBigButtonWidth, kCornerButtonHeight + kBigButtonHeight, kBigButtonWidth, kBigButtonHeight), - TOUCH_BUTTON_INITIALIZER(B, 1.0 - 2.0 * kBigButtonWidth, 1.0 - (kCornerButtonHeight + kBigButtonHeight), kBigButtonWidth, kBigButtonHeight), - TOUCH_BUTTON_INITIALIZER(START, 1.0 - kCornerButtonWidth, 1.0 - kCornerButtonHeight, kCornerButtonWidth, kCornerButtonHeight), +#define TB(actions, x, y, w, h) \ + {actions, 0, 0, 0, 0, x, y, w, h} +#define P(x) SNES_##x##_MASK + TB(P(TL), 0.0, 0.0, kCornerButtonWidth, kCornerButtonHeight), + TB(P(TR), 0.625, 0.0, kCornerButtonWidth, kCornerButtonHeight), + TB(P(LEFT) | P(UP), 0.0, kCornerButtonHeight, kBigButtonWidth, kBigButtonHeight), + TB(P(UP), kBigButtonWidth, kCornerButtonHeight, kBigButtonWidth, kBigButtonHeight), + TB(P(RIGHT) | P(UP), 2.0 * kBigButtonWidth, kCornerButtonHeight, kBigButtonWidth, kBigButtonHeight), + TB(P(LEFT), 0.0, kCornerButtonHeight + kBigButtonHeight, kBigButtonWidth, kBigButtonHeight), + TB(P(RIGHT), 2.0 * kBigButtonWidth, kCornerButtonHeight + kBigButtonHeight, kBigButtonWidth, kBigButtonHeight), + TB(P(LEFT) | P(DOWN), 0, 1.0 - (kCornerButtonHeight + kBigButtonHeight), kBigButtonWidth, kBigButtonHeight), + TB(P(DOWN), kBigButtonWidth, 1.0 - (kCornerButtonHeight + kBigButtonHeight), kBigButtonWidth, kBigButtonHeight), + TB(P(RIGHT) | P(DOWN), 2.0 * kBigButtonWidth, 1.0 - (kCornerButtonHeight + kBigButtonHeight), kBigButtonWidth, kBigButtonHeight), + TB(P(SELECT), 0.0, 1.0 - kCornerButtonHeight, kCornerButtonWidth, kCornerButtonHeight), + TB(P(X), 1.0 - 2.0 * kBigButtonWidth, kCornerButtonHeight, kBigButtonWidth, kBigButtonHeight), + TB(P(Y), 1.0 - 3.0 * kBigButtonWidth, kCornerButtonHeight + kBigButtonHeight, kBigButtonWidth, kBigButtonHeight), + TB(P(A), 1.0 - kBigButtonWidth, kCornerButtonHeight + kBigButtonHeight, kBigButtonWidth, kBigButtonHeight), + TB(P(B), 1.0 - 2.0 * kBigButtonWidth, 1.0 - (kCornerButtonHeight + kBigButtonHeight), kBigButtonWidth, kBigButtonHeight), + TB(P(START), 1.0 - kCornerButtonWidth, 1.0 - kCornerButtonHeight, kCornerButtonWidth, kCornerButtonHeight), +#undef P +#undef TB }; static TouchButton* current = 0; -- 1.7.9.5