bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Implement LOAD GRPF

Browse Source
This commit is contained in:
otya128
2017-07-09 23:25:09 +09:00
parent e10c6fb0d8
commit 2d2c09e38b
3 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SMILEBASIC/builtinfunctions.d
View File

@@ -660,11 +660,11 @@ class BuiltinFunction
int colorflag = flagOrPalette.castInteger;
if (ary.type == ValueType.IntegerArray)
{
p.graphic.gload(x, y, w, h, ary.integerArray.array, colorflag, copymode);
p.graphic.gload(p.graphic.useGRP, x, y, w, h, ary.integerArray.array, colorflag, copymode);
}
if (ary.type == ValueType.DoubleArray)
{
p.graphic.gload(x, y, w, h, ary.doubleArray.array, colorflag, copymode);
p.graphic.gload(p.graphic.useGRP, x, y, w, h, ary.doubleArray.array, colorflag, copymode);
}
}
else if (flagOrPalette.isNumberArray)
@@ -2879,8 +2879,15 @@ class BuiltinFunction
p.program.slot[lot].load(filename, txt);
return;
}
if(file.resource == Resource.graphic)
if(file.resource == Resource.graphic || file.resource == Resource.graphicFont)
{
auto r = file.resourceNumber;
if (file.resource == Resource.graphicFont)
{
r = -1;
}
else if (!file.hasResourceNumber)
throw new IllegalFunctionCall("LOAD");
import otya.smilebasic.data;
DataHeader header;
Value data = Value(new Array!int([0, 0]));
@@ -2888,7 +2895,7 @@ class BuiltinFunction
return;
if (header.type == DataType.double_)
throw new IllegalFileFormat("LOAD");
GLOAD(p, 0, 0, data.integerArray.dim[0], data.integerArray.dim[1], data, Value(1), 1);
p.graphic.gload(r, 0, 0, data.integerArray.dim[0], data.integerArray.dim[1], data.integerArray.array, 1, 1);
return;
}
throw new IllegalFunctionCall("LOAD");