UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] simulator/layout: change signature of makeAbsolute

Browse Source
This commit is contained in:
Émilie Feral
2020-07-03 16:06:15 +02:00
committed by EmilieNumworks
parent 8f8f42edd5
commit fcf4c011cb
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ion/src/simulator/shared/layout.cpp
View File

@@ -16,16 +16,16 @@ static constexpr SDL_FRect screenRect = {X(192), Y(191), X(776), Y(582)};
static SDL_Rect sFrame;
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_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;
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) {
@@ -75,7 +75,7 @@ void recompute(int width, int height) {
}
void getScreenRect(SDL_Rect * rect) {
makeAbsolute(&screenRect, rect);
makeAbsolute(screenRect, rect);
}
void getBackgroundRect(SDL_Rect * rect) {
@@ -143,9 +143,8 @@ static constexpr SDL_FPoint sKeyCenters[Keyboard::NumberOfValidKeys] = {
};
static void getKeyCenter(int validKeyIndex, SDL_Point * point) {
assert(validKeyIndex >= 0);
assert(validKeyIndex < Keyboard::NumberOfValidKeys);
makeAbsolute(&sKeyCenters[validKeyIndex], point);
assert(validKeyIndex >= 0 && validKeyIndex < Keyboard::NumberOfValidKeys);
makeAbsolute(sKeyCenters[validKeyIndex], point);
}
Keyboard::Key keyAt(SDL_Point * p) {