This commit is contained in:
parent
336367a823
commit
d3d0fdf2f8
|
@ -151,12 +151,20 @@
|
||||||
{"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",},
|
{"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",},
|
||||||
],
|
],
|
||||||
"IncludedFiles": [
|
"IncludedFiles": [
|
||||||
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.dat","resourceType":"GMIncludedFile",},
|
|
||||||
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.size","resourceType":"GMIncludedFile",},
|
|
||||||
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"grass.png","resourceType":"GMIncludedFile",},
|
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"grass.png","resourceType":"GMIncludedFile",},
|
||||||
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"koakuma.png","resourceType":"GMIncludedFile",},
|
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"koakuma.png","resourceType":"GMIncludedFile",},
|
||||||
{"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",},
|
{"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",},
|
||||||
{"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",},
|
{"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"MapTerrain.png","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"Map 1.size","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"mapthatchhouseroof.png","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"mapwatertemp.png","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"maptreebark.png","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"maptreeleavesdark.png","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"maphousewall.png","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.size","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"Map 1.dat","resourceType":"GMIncludedFile",},
|
||||||
|
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.dat","resourceType":"GMIncludedFile",},
|
||||||
],
|
],
|
||||||
"MetaData": {
|
"MetaData": {
|
||||||
"IDEVersion": "2.3.3.574",
|
"IDEVersion": "2.3.3.574",
|
||||||
|
|
|
@ -48,5 +48,5 @@ function drawModels(){
|
||||||
models = [];
|
models = [];
|
||||||
|
|
||||||
//var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0);
|
//var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0);
|
||||||
var spr = sprite_add("./Test Map/grass.png",0,false,false,0,0);
|
var spr = sprite_add("./Map 1/mapthatchhouseroof.png",0,false,false,0,0);
|
||||||
nu Model("./shrine thing.dat",spr);
|
nu Model("./Map 1/Map 1.dat",spr);
|
|
@ -5,16 +5,17 @@ global.viewMat = camera_get_view_mat(cam);
|
||||||
setCam();
|
setCam();
|
||||||
draw_set_color(c_black);
|
draw_set_color(c_black);
|
||||||
draw_rectangle(-9999, -9999, 9999, 9999, false);
|
draw_rectangle(-9999, -9999, 9999, 9999, false);
|
||||||
|
drawModels();
|
||||||
var i, j, k;
|
var i, j, k;
|
||||||
for (i=0; i<array_length(global.map); i++) {
|
for (i=0; i<array_length(global.map); i++) {
|
||||||
for (j=0; j<array_length(global.map[i]); j++) {
|
for (j=0; j<array_length(global.map[i]); j++) {
|
||||||
draw_set_color(c_white);
|
/*draw_set_color(c_white);
|
||||||
draw_rectangle(
|
draw_rectangle(
|
||||||
i*global.tilesize.x,
|
i*global.tilesize.x,
|
||||||
j*global.tilesize.y,
|
j*global.tilesize.y,
|
||||||
(i+1)*global.tilesize.x,
|
(i+1)*global.tilesize.x,
|
||||||
(j+1)*global.tilesize.y, false
|
(j+1)*global.tilesize.y, false
|
||||||
);
|
);*/
|
||||||
for (k=0; k<array_length(global.map[i][j].overlays); k++) {
|
for (k=0; k<array_length(global.map[i][j].overlays); k++) {
|
||||||
draw_set_color(global.map[i][j].overlays[k]);
|
draw_set_color(global.map[i][j].overlays[k]);
|
||||||
draw_set_alpha(.4);
|
draw_set_alpha(.4);
|
||||||
|
@ -46,4 +47,3 @@ for (i=0; i<array_length(global.map); i++) {
|
||||||
var a = c_2dto3d(mouse_x,mouse_y);
|
var a = c_2dto3d(mouse_x,mouse_y);
|
||||||
draw_circle(a.x,a.y,2,false);
|
draw_circle(a.x,a.y,2,false);
|
||||||
|
|
||||||
drawModels();
|
|
Loading…
Reference in New Issue