VAR/GameLib
1
1
Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity

Fixes for Emscripten+SDL2

Browse Source
This commit is contained in:
Valeriano A.R.
2022-04-04 04:29:06 +02:00
parent 48583e0b08
commit b55b9b3138
13 changed files with 157 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Draw.c
View File

@@ -493,10 +493,6 @@ int Draw_LoopIteration() {
Input_SetPointerPosition(event.tfinger.x, event.tfinger.y);
Input_SetPointerDown(1);
}
if (event.type == SDL_TOUCHBUTTONDOWN) {
Input_SetPointerPosition(event.tfinger.x, event.tfinger.y);
Input_SetPointerDown(1);
}
if (event.type == SDL_MOUSEBUTTONUP) {
Input_SetPointerPosition(event.button.x / (float)_width,
event.button.y / (float)_height);
@@ -506,10 +502,6 @@ int Draw_LoopIteration() {
Input_SetPointerPosition(event.tfinger.x, event.tfinger.y);
Input_SetPointerDown(0);
}
if (event.type == SDL_TOUCHBUTTONUP) {
Input_SetPointerPosition(event.tfinger.x, event.tfinger.y);
Input_SetPointerDown(0);
}
}
#else
while (SDL_PollEvent(&event)) {

2
src/Util.c
View File

@@ -31,7 +31,7 @@ int MaximumInt(int i0, int i1) {
// Rect
//
int Rect_UnionRect(Rect r0, Rect r1, Rect rd) {
void Rect_UnionRect(Rect r0, Rect r1, Rect rd) {
rd->x0 = MinimumInt(r0->x0, r1->x0);
rd->y0 = MinimumInt(r0->y0, r1->y0);
rd->x1 = MaximumInt(r0->x1, r1->x1);

2
src/Util.h
View File

@@ -30,7 +30,7 @@ struct SRect {
int y1;
};
int Rect_UnionRect(Rect r0, Rect r1, Rect rd);
void Rect_UnionRect(Rect r0, Rect r1, Rect rd);
int Rect_PointInside(Rect r, int x, int y);
int Rect_PointInsideAny(TRect r[], int rCount, int x, int y);