UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/sdl] Use key centers to compute keypresses

Browse Source
This commit is contained in:
Romain Goyet
2019-02-27 14:43:20 +01:00
parent 72a8ab7461
commit abc204f06a
2 changed files with 90 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

170
ion/src/sdl/layout.cpp
View File

@@ -4,25 +4,34 @@ namespace Ion {
namespace SDL {
namespace Layout {
#define X(x) ((x)/(1250.0f))
#define Y(y) ((y)/(2100.0f))
static constexpr int backgroundWidth = 1160;
static constexpr int backgroundHeight = 2220;
constexpr SDL_FRect areaOfInterest = {X(237), Y(83), X(776), Y(1733)};
static constexpr float X(int x) { return static_cast<float>(x)/static_cast<float>(backgroundWidth); }
static constexpr float Y(int y) { return static_cast<float>(y)/static_cast<float>(backgroundHeight); }
static constexpr SDL_FRect areaOfInterest = {X(110), Y(30), X(940), Y(2150)};
static constexpr SDL_FRect screenRect = {X(191), Y(189), X(779), Y(582)};
static SDL_Rect sFrame;
static void makeAbsolute(SDL_FRect * f, SDL_Rect * r) {
static void makeAbsolute(const SDL_FRect * f, SDL_Rect * r) {
r->x = f->x * sFrame.w + sFrame.x;
r->y = f->y * sFrame.h + sFrame.y;
r->w = f->w * sFrame.w;
r->h = f->h * sFrame.h;
}
static void makeAbsolute(const SDL_FPoint * f, SDL_Point * p) {
p->x = f->x * sFrame.w + sFrame.x;
p->y = f->y * sFrame.h + sFrame.y;
}
void recompute(int width, int height) {
float windowWidth = static_cast<float>(width);
float windowHeight = static_cast<float>(height);
float aoiRatio = (areaOfInterest.w / areaOfInterest.h) * (1250.0f/2100.0f);
float aoiRatio = (areaOfInterest.w / areaOfInterest.h) * (static_cast<float>(backgroundWidth)/static_cast<float>(backgroundHeight));
float windowRatio = windowWidth/windowHeight;
if (aoiRatio > windowRatio) {
@@ -60,17 +69,12 @@ void recompute(int width, int height) {
sFrame.h = windowHeight / areaOfInterest.h;
sFrame.w = (windowHeight * aoiRatio) / areaOfInterest.w;
sFrame.y = - areaOfInterest.y * sFrame.h;
sFrame.x = (windowWidth - windowHeight*aoiRatio)/2 - areaOfInterest.x * sFrame.w;
sFrame.x = (windowWidth - windowHeight*aoiRatio)/2.0f - areaOfInterest.x * sFrame.w;
}
}
void getScreenRect(SDL_Rect * rect) {
SDL_FRect fRect;
fRect.x = X(310);
fRect.y = Y(215);
fRect.w = X(640);
fRect.h = Y(485);
makeAbsolute(&fRect, rect);
makeAbsolute(&screenRect, rect);
}
void getBackgroundRect(SDL_Rect * rect) {
@@ -80,78 +84,84 @@ void getBackgroundRect(SDL_Rect * rect) {
rect->h = sFrame.h;
}
Keyboard::Key keyAt(SDL_Point * p) {
for (int i=0; i<Keyboard::NumberOfValidKeys; i++) {
SDL_Rect r;
getKeyRect(i, &r);
if (SDL_PointInRect(p, &r)) {
return Keyboard::ValidKeys[i];
}
}
return Keyboard::Key::None;
}
static constexpr SDL_FPoint sKeyCenters[Keyboard::NumberOfValidKeys] = {
{X(185), Y(1029)}, // A1, Left
{X(273), Y(941)}, // A2, Up
{X(273), Y(1117)}, // A3, Down
{X(361), Y(1029)}, // A4, Right
{X(810), Y(1029)}, // A5, OK
{X(963), Y(1029)}, // A6, Back
void getKeyRect(int validKeyIndex, SDL_Rect * rect) {
{X(580), Y(958)}, // B1, Home
{X(580), Y(1094)}, // B2, Power
{X(198), Y(1252)}, // C1, Shift
{X(352), Y(1252)}, // C2, Alpha
{X(506), Y(1252)}, // C3, xnt
{X(656), Y(1252)}, // C4, var
{X(810), Y(1252)}, // C5, toolbox
{X(963), Y(1252)}, // C6, Delete
{X(198), Y(1375)}, // D1, exp
{X(352), Y(1375)}, // D2, ln
{X(506), Y(1375)}, // D3, log
{X(656), Y(1375)}, // D4, i
{X(810), Y(1375)}, // D5, comma
{X(963), Y(1375)}, // D6, power
{X(198), Y(1498)}, // E1, sin
{X(352), Y(1498)}, // E2, cos
{X(506), Y(1498)}, // E3, tan
{X(656), Y(1498)}, // E4, pi
{X(810), Y(1498)}, // E5, sqrt
{X(963), Y(1498)}, // E6, square
{X(210), Y(1629)}, // F1, 7
{X(395), Y(1629)}, // F2, 8
{X(580), Y(1629)}, // F3, 9
{X(765), Y(1629)}, // F4, (
{X(950), Y(1629)}, // F5, )
{X(210), Y(1766)}, // G1, 4
{X(395), Y(1766)}, // G2, 5
{X(580), Y(1766)}, // G3, 6
{X(765), Y(1766)}, // G4, *
{X(950), Y(1766)}, // G5, /
{X(210), Y(1902)}, // H1, 1
{X(395), Y(1902)}, // H2, 2
{X(580), Y(1902)}, // H3, 3
{X(765), Y(1902)}, // H4, +
{X(950), Y(1902)}, // H5, -
{X(210), Y(2040)}, // I1, 0
{X(395), Y(2040)}, // I2, .
{X(580), Y(2040)}, // I3, x10
{X(765), Y(2040)}, // I4, Ans
{X(950), Y(2040)}, // I5, EXE
};
static void getKeyCenter(int validKeyIndex, SDL_Point * point) {
assert(validKeyIndex >= 0);
assert(validKeyIndex < Keyboard::NumberOfValidKeys);
SDL_FRect rectForKey[Keyboard::NumberOfValidKeys] = {
{X(250), Y(880), X(85), Y(75) }, // A1, Left
{X(330), Y(795), X(75), Y(85) }, // A2, Up
{X(330), Y(950), X(75), Y(85) }, // A3, Down
{X(400), Y(880), X(85), Y(75) }, // A4, Right
{X(765), Y(855), X(110), Y(110)}, // A5, OK
{X(900), Y(855), X(110), Y(110)}, // A6, Back
makeAbsolute(&sKeyCenters[validKeyIndex], point);
}
{X(565), Y(815), X(130), Y(85)}, // B1, Home
{X(565), Y(920), X(130), Y(85)}, // B2, Power
{X(255), Y(1066), X(110), Y(75)}, // C1, Shift
{X(385), Y(1066), X(110), Y(75)}, // C2, Alpha
{X(512), Y(1066), X(110), Y(75)}, // C3, xnt
{X(638), Y(1066), X(110), Y(75)}, // C4, var
{X(768), Y(1066), X(110), Y(75)}, // C5, toolbox
{X(895), Y(1066), X(110), Y(75)}, // C6, Delete
{X(255), Y(1170), X(110), Y(75)}, // D1, exp
{X(385), Y(1170), X(110), Y(75)}, // D2, ln
{X(512), Y(1170), X(110), Y(75)}, // D3, log
{X(638), Y(1170), X(110), Y(75)}, // D4, i
{X(768), Y(1170), X(110), Y(75)}, // D5, comma
{X(895), Y(1170), X(110), Y(75)}, // D6, power
{X(255), Y(1272), X(110), Y(75)}, // E1, sin
{X(385), Y(1272), X(110), Y(75)}, // E2, cos
{X(512), Y(1272), X(110), Y(75)}, // E3, tan
{X(638), Y(1272), X(110), Y(75)}, // E4, pi
{X(768), Y(1272), X(110), Y(75)}, // E5, sqrt
{X(895), Y(1272), X(110), Y(75)}, // E6, square
{X(255), Y(1376), X(130), X(85)}, // F1, 7
{X(408), Y(1376), X(130), X(85)}, // F2, 8
{X(564), Y(1376), X(130), X(85)}, // F3, 9
{X(718), Y(1376), X(130), X(85)}, // F4, (
{X(872), Y(1376), X(130), X(85)}, // F5, )
{X(255), Y(1490), X(130), X(85)}, // G1, 4
{X(408), Y(1490), X(130), X(85)}, // G2, 5
{X(564), Y(1490), X(130), X(85)}, // G3, 6
{X(718), Y(1490), X(130), X(85)}, // G4, *
{X(872), Y(1490), X(130), X(85)}, // G5, /
{X(255), Y(1605), X(130), X(85)}, // H1, 1
{X(408), Y(1605), X(130), X(85)}, // H2, 2
{X(564), Y(1605), X(130), X(85)}, // H3, 3
{X(718), Y(1605), X(130), X(85)}, // H4, +
{X(872), Y(1605), X(130), X(85)}, // H5, -
{X(255), Y(1718), X(130), X(85)}, // I1, 0
{X(408), Y(1718), X(130), X(85)}, // I2, .
{X(564), Y(1718), X(130), X(85)}, // I3, x10
{X(718), Y(1718), X(130), X(85)}, // I4, Ans
{X(872), Y(1718), X(130), X(85)}, // I5, EXE
};
makeAbsolute(&rectForKey[validKeyIndex], rect);
Keyboard::Key keyAt(SDL_Point * p) {
int minSquaredDistance = -1;
Keyboard::Key nearestKey = Keyboard::Key::None;
for (int i=0; i<Keyboard::NumberOfValidKeys; i++) {
SDL_Point keyCenter;
getKeyCenter(i, &keyCenter);
int dx = keyCenter.x - p->x;
int dy = keyCenter.y - p->y;
int squaredDistance = dx*dx + dy*dy;
if (squaredDistance < minSquaredDistance || minSquaredDistance < 0) {
minSquaredDistance = squaredDistance;
nearestKey = Keyboard::ValidKeys[i];
}
}
return nearestKey;
}
}

1
ion/src/sdl/layout.h
View File

@@ -12,7 +12,6 @@ void recompute(int width, int height);
void getScreenRect(SDL_Rect * rect);
void getBackgroundRect(SDL_Rect * rect);
void getKeyRect(int validKeyIndex, SDL_Rect * rect);
Ion::Keyboard::Key keyAt(SDL_Point * p);