shaun_chaky
/
eastern-flames
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

some kinda merge

This commit is contained in:
the me 2022-08-19 15:06:05 -07:00
parent cd85677efd 3c53eb2f31
commit f53d693a0c
14 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
eastern flames/datafiles/Map 1/Map 1.dat
View File

Binary file not shown.

1
eastern flames/datafiles/Map 1/Map 1.size
View File

@ -1 +0,0 @@
23.71898078918457 , 16.358203887939453 , 1.5586051940917969

BIN
eastern flames/datafiles/Map 1/MapAtlas.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 385 KiB

BIN
eastern flames/datafiles/Test Map/GBA Test.dat
View File

Binary file not shown.

1
eastern flames/datafiles/Test Map/GBA Test.size
View File

@ -1 +0,0 @@
13.828370094299316 , 11.73211669921875 , 3.921311855316162

BIN
eastern flames/datafiles/Test Map/GBATestAtlas.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 635 KiB

BIN
eastern flames/datafiles/map1/map1.dat Normal file
View File

Binary file not shown.

1
eastern flames/datafiles/map1/map1.size Normal file
View File

@ -0,0 +1 @@
23.718978881835938 , 16.35820198059082 , 1.6182538270950317

BIN
eastern flames/datafiles/map1/mapatlas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 393 KiB

BIN
eastern flames/datafiles/testmap/gbatest.dat Normal file
View File

Binary file not shown.

1
eastern flames/datafiles/testmap/gbatest.size Normal file
View File

@ -0,0 +1 @@
13.828370094299316 , 11.73211669921875 , 3.961841344833374

BIN
eastern flames/datafiles/testmap/gbatestatlas.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 635 KiB

12
eastern flames/eastern flames.yyp
View File

@ -177,12 +177,12 @@
"IncludedFiles": [ "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 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":"Map 1.dat","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",},
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"Map 1.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",},
{"CopyToMask":-1,"filePath":"datafiles/Map 1","resourceVersion":"1.0","name":"MapAtlas.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/map1","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/testmap","resourceVersion":"1.0","name":"gbatest.dat","resourceType":"GMIncludedFile",},
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBA Test.size","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.size","resourceType":"GMIncludedFile",},
{"CopyToMask":-1,"filePath":"datafiles/Test Map","resourceVersion":"1.0","name":"GBATestAtlas.png","resourceType":"GMIncludedFile",}, {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatestatlas.png","resourceType":"GMIncludedFile",},
], ],
"MetaData": { "MetaData": {
"IDEVersion": "2.3.3.574", "IDEVersion": "2.3.3.574",

11
eastern flames/objects/ARTICULATOR/Create_0.gml
View File

@ -17,6 +17,7 @@ global.gh = 360;
global.camerax = 0; global.camerax = 0;
global.cameray = 0; global.cameray = 0;
state = st_control; state = st_control;
cursor = new vec2(0, 0);
//these are functions bc c_2dto3d uses them //these are functions bc c_2dto3d uses them
function getProj(){ function getProj(){
return matrix_build_projection_perspective_fov(60,-16/9,1,4000) return matrix_build_projection_perspective_fov(60,-16/9,1,4000)
@ -37,11 +38,14 @@ function setCam(){
global.turn = ARMY.US; global.turn = ARMY.US;
function drawModels(){ function drawModels(){
gpu_set_cullmode(cull_counterclockwise); //gpu_set_cullmode(cull_counterclockwise);
gpu_set_ztestenable(true); gpu_set_ztestenable(true);
gpu_set_alphatestenable(true);
gpu_set_alphatestref(128);
for(var i = 0; i < array_length(models);i++){ for(var i = 0; i < array_length(models);i++){
models[i].draw(); models[i].draw();
} }
gpu_set_alphatestenable(false);
gpu_set_cullmode(cull_noculling); gpu_set_cullmode(cull_noculling);
gpu_set_ztestenable(false); gpu_set_ztestenable(false);
} }
@ -49,7 +53,8 @@ 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("./Map 1/MapAtlas.png",0,false,false,0,0);
nu Model("./Map 1/Map 1.dat",spr);
textbox_create(txt_test); textbox_create(txt_test);
var spr = sprite_add("./map1/mapatlas.png",0,false,false,0,0);
nu Model("./map1/map1.dat", spr, u, 200, 140, u, .65, u, u, u,);
setCam();