bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix GLOAD clipping

Browse Source
This commit is contained in:
otya128
2016-12-24 16:07:00 +09:00
parent 38a5f7f869
commit 0e4f1d1e6b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
SMILEBASIC/graphic.d
View File

@@ -1094,7 +1094,7 @@ class Graphic2 : Graphic
return true; return true;
} }
} }
if (wa.h < h2) if (wa.h + wa.y < y + sy + h2)
{ {
h2 = h2 - ((y + sy + h2) - (wa.h + wa.y)); h2 = h2 - ((y + sy + h2) - (wa.h + wa.y));
if (h < 1) if (h < 1)
@@ -1238,9 +1238,9 @@ class Graphic2 : Graphic
int sx, sy; int sx, sy;
if (clipXYWH(writeArea[petitcom.displaynum], x, y, w, h, sx, sy, w, h)) if (clipXYWH(writeArea[petitcom.displaynum], x, y, w, h, sx, sy, w, h))
return; return;
for (int iy = sy; iy < h; iy++) for (int iy = sy; iy < sy + h; iy++)
{ {
for (int ix = sx; ix < w; ix++) for (int ix = sx; ix < sx + w; ix++)
{ {
auto c = cast(int)array[iy * arrayW + ix]; auto c = cast(int)array[iy * arrayW + ix];
if (flag) if (flag)
@@ -1270,9 +1270,9 @@ class Graphic2 : Graphic
int sx, sy; int sx, sy;
if (clipXYWH(writeArea[petitcom.displaynum], x, y, w, h, sx, sy, w, h)) if (clipXYWH(writeArea[petitcom.displaynum], x, y, w, h, sx, sy, w, h))
return; return;
for (int iy = sy; iy < h; iy++) for (int iy = sy; iy < sy + h; iy++)
{ {
for (int ix = sx; ix < w; ix++) for (int ix = sx; ix < sx + w; ix++)
{ {
auto c = cast(int)palette[cast(int)array[iy * arrayW + ix]]; auto c = cast(int)palette[cast(int)array[iy * arrayW + ix]];
c = convertColor(c); c = convertColor(c);