Compare commits
No commits in common. "1a137812207219465800403a7e3f58dc712f73f2" and "629d10acd592423736e437f91f31e064a9de3fa8" have entirely different histories.
1a13781220
...
629d10acd5
|
@ -151,14 +151,12 @@
|
|||
{"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",},
|
||||
],
|
||||
"IncludedFiles": [
|
||||
{"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/Map 1","resourceVersion":"1.0","name":"Map 1.dat","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":"MapAtlas.png","resourceType":"GMIncludedFile",},
|
||||
{"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":"GBATestAtlas.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","resourceVersion":"1.0","name":"shrine thing tex.png","resourceType":"GMIncludedFile",},
|
||||
{"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",},
|
||||
],
|
||||
"MetaData": {
|
||||
"IDEVersion": "2.3.3.574",
|
||||
|
|
|
@ -48,5 +48,5 @@ function drawModels(){
|
|||
models = [];
|
||||
|
||||
//var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0);
|
||||
var spr = sprite_add("./Map 1/MapAtlas.png",0,false,false,0,0);
|
||||
nu Model("./Map 1/Map 1.dat",spr);
|
||||
var spr = sprite_add("./Test Map/grass.png",0,false,false,0,0);
|
||||
nu Model("./shrine thing.dat",spr);
|
|
@ -5,17 +5,16 @@ global.viewMat = camera_get_view_mat(cam);
|
|||
setCam();
|
||||
draw_set_color(c_black);
|
||||
draw_rectangle(-9999, -9999, 9999, 9999, false);
|
||||
drawModels();
|
||||
var i, j, k;
|
||||
for (i=0; i<array_length(global.map); i++) {
|
||||
for (j=0; j<array_length(global.map[i]); j++) {
|
||||
/*draw_set_color(c_white);
|
||||
draw_set_color(c_white);
|
||||
draw_rectangle(
|
||||
i*global.tilesize.x,
|
||||
j*global.tilesize.y,
|
||||
(i+1)*global.tilesize.x,
|
||||
(j+1)*global.tilesize.y, false
|
||||
);*/
|
||||
);
|
||||
for (k=0; k<array_length(global.map[i][j].overlays); k++) {
|
||||
draw_set_color(global.map[i][j].overlays[k]);
|
||||
draw_set_alpha(.4);
|
||||
|
@ -47,3 +46,4 @@ for (i=0; i<array_length(global.map); i++) {
|
|||
var a = c_2dto3d(mouse_x,mouse_y);
|
||||
draw_circle(a.x,a.y,2,false);
|
||||
|
||||
drawModels();
|
Loading…
Reference in New Issue