bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix TOUCH

Browse Source
This commit is contained in:
otya128
2016-12-10 21:31:14 +09:00
parent 73f4394117
commit 865303c123
2 changed files with 73 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
SMILEBASIC/builtinfunctions.d
View File

@@ -336,17 +336,37 @@ class BuiltinFunction
static void XOFF(PetitComputer p, Value mode/*!?!???!?*/) static void XOFF(PetitComputer p, Value mode/*!?!???!?*/)
{ {
} }
static void TOUCH(PetitComputer p, DefaultValue!(int, false) id, out int tm, out int tchx, out int tchy) static void TOUCH(PetitComputer p, out int tm, out int tchx, out int tchy)
{ {
if(!id.isDefault)
{
writeln("NOTIMPL:TOUCH MPID");
}
auto pos = p.touchPosition; auto pos = p.touchPosition;
tm = pos.tm; tm = pos.tm;
tchx = pos.x; tchx = pos.x;
tchy = pos.y; tchy = pos.y;
} }
static void TOUCH(PetitComputer p, int id, out int tm, out int tchx, out int tchy)
{
//BIG
if (p.x.mode == PetitComputer.XMode.WIIU)
{
auto pos = p.touchPosition;
tm = pos.tm;
if (id == 0)
{
tchx = pos.display1X;
tchy = pos.display1Y;
}
else
{
tchx = pos.gamepadX;
tchy = pos.gamepadY;
}
}
else
{
writeln("NOTIMPL:TOUCH MPID");
tm = tchx = tchy = 0;
}
}
static void XSCREEN(PetitComputer p, int mode, int tv, int gamepad, int sp, int bg) static void XSCREEN(PetitComputer p, int mode, int tv, int gamepad, int sp, int bg)
{ {
if (p.x.mode != PetitComputer.XMode.WIIU || mode != 6) if (p.x.mode != PetitComputer.XMode.WIIU || mode != 6)

56
SMILEBASIC/petitcomputer.d
View File

@@ -457,6 +457,11 @@ class PetitComputer
int tm; int tm;
int x; int x;
int y; int y;
//WiiU
int gamepadX;
int gamepadY;
int display1X;
int display1Y;
}; };
Object touchSync = new Object(); Object touchSync = new Object();
Touch m_touch; Touch m_touch;
@@ -684,16 +689,51 @@ class PetitComputer
int mousex, mousey; int mousex, mousey;
if (SDL_GetMouseState(&mousex, &mousey) & SDL_BUTTON_LMASK) if (SDL_GetMouseState(&mousex, &mousey) & SDL_BUTTON_LMASK)
{ {
if (mousey >= screenHeight)
{
mousey -= screenHeight;
mousex -= (screenWidth - screenWidthDisplay1) / 2;
}
import std.algorithm.comparison : clamp; import std.algorithm.comparison : clamp;
mousex = mousex.clamp(5, 314);
mousey = mousey.clamp(5, 234);
auto old = touchPosition; auto old = touchPosition;
touchPosition = Touch(old.tm + 1, mousex, mousey); if (x.mode != XMode.WIIU)
{
if (mousey >= screenHeight)
{
mousey -= screenHeight;
mousex -= (screenWidth - screenWidthDisplay1) / 2;
}
mousex = mousex.clamp(5, 314);
mousey = mousey.clamp(5, 234);
touchPosition = Touch(old.tm + 1, mousex, mousey);
}
else
{
//!!WiiU
if (xscreenmode == 3)//XSCREEN 5
{
auto w = currentDisplay.rect[0].w;
auto h = currentDisplay.rect[0].h;
auto x3DS = cast(int)(mousex * (cast(float)w / screenWidthDisplay1));
auto y3DS = cast(int)(mousey * (cast(float)h / screenHeightDisplay1));
auto gamepadx = cast(int)(mousex * (cast(float)w / 854));
auto gamepady = cast(int)(mousey * (cast(float)h / 480));
touchPosition = Touch(old.tm + 1,
x3DS.clamp(5, 314), y3DS.clamp(5, 234),
gamepadx.clamp(8, 854 - 8), gamepady.clamp(8, 480 - 8),
mousex, mousey);
}
else
{
auto w = currentDisplay.rect[1].w;
auto h = currentDisplay.rect[1].h;
mousex -= currentDisplay.rect[1].x;
mousey -= currentDisplay.rect[1].y;
if (mousex >= 0 && mousey >= 0)
{
auto x3DS = cast(int)(mousex * (cast(float)w / screenWidthDisplay1));
auto y3DS = cast(int)(mousey * (cast(float)h / screenHeightDisplay1));
auto gamepadx = cast(int)(mousex * (cast(float)w / 854));
auto gamepady = cast(int)(mousey * (cast(float)h / 480));
touchPosition = Touch(old.tm + 1, x3DS, y3DS, gamepadx, gamepady, mousex, mousey);
}
}
}
} }
else else
{ {