bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix TOUCH

Browse Source
This commit is contained in:
otya128
2016-12-11 20:44:07 +09:00
parent 77d7c4366e
commit 6b5bf35584
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SMILEBASIC/builtinfunctions.d
View File

@@ -340,8 +340,16 @@ class BuiltinFunction
{ {
auto pos = p.touchPosition; auto pos = p.touchPosition;
tm = pos.tm; tm = pos.tm;
tchx = pos.x; if (p.x.mode == PetitComputer.XMode.WIIU)
tchy = pos.y; {
tchx = pos.display1X;
tchy = pos.display1Y;
}
else
{
tchx = pos.x;
tchy = pos.y;
}
} }
static void TOUCH(PetitComputer p, int id, out int tm, out int tchx, out int tchy) static void TOUCH(PetitComputer p, int id, out int tm, out int tchx, out int tchy)
{ {

16
SMILEBASIC/petitcomputer.d
View File

@@ -754,14 +754,14 @@ class PetitComputer
{ {
auto w = currentDisplay.rect[0].w; auto w = currentDisplay.rect[0].w;
auto h = currentDisplay.rect[0].h; auto h = currentDisplay.rect[0].h;
auto x3DS = cast(int)(mousex * (cast(float)w / screenWidthDisplay1)); auto x3DS = cast(int)(mousex * (screenWidthDisplay1 / cast(float)w));
auto y3DS = cast(int)(mousey * (cast(float)h / screenHeightDisplay1)); auto y3DS = cast(int)(mousey * (screenHeightDisplay1 / cast(float)h));
auto gamepadx = cast(int)(mousex * (cast(float)w / 854)); auto gamepadx = cast(int)(mousex * (854 / cast(float)w));
auto gamepady = cast(int)(mousey * (cast(float)h / 480)); auto gamepady = cast(int)(mousey * (480 / cast(float)h));
touchPosition = Touch(old.tm + 1, touchPosition = Touch(old.tm + 1,
x3DS.clamp(5, 314), y3DS.clamp(5, 234), x3DS.clamp(5, 314), y3DS.clamp(5, 234),
gamepadx.clamp(8, 854 - 8), gamepady.clamp(8, 480 - 8), gamepadx.clamp(8, 854 - 9), gamepady.clamp(8, 480 - 9),
mousex, mousey); mousex.clamp(8, w - 9), mousey.clamp(8, h - 9));
} }
else else
{ {
@@ -777,8 +777,8 @@ class PetitComputer
auto gamepady = cast(int)(mousey * (480 / cast(float)h)); auto gamepady = cast(int)(mousey * (480 / cast(float)h));
touchPosition = Touch(old.tm + 1, touchPosition = Touch(old.tm + 1,
x3DS.clamp(5, 314), y3DS.clamp(5, 234), x3DS.clamp(5, 314), y3DS.clamp(5, 234),
gamepadx.clamp(8, 854 - 8), gamepady.clamp(8, 480 - 8), gamepadx.clamp(8, 854 - 9), gamepady.clamp(8, 480 - 9),
mousex, mousey); mousex.clamp(8, w - 9), mousey.clamp(8, h - 9));
} }
} }
} }