diff --git a/eastern flames/datafiles/Map 1/Map 1.dat b/eastern flames/datafiles/Map 1/Map 1.dat deleted file mode 100644 index 3a4fae3..0000000 Binary files a/eastern flames/datafiles/Map 1/Map 1.dat and /dev/null differ diff --git a/eastern flames/datafiles/Map 1/Map 1.size b/eastern flames/datafiles/Map 1/Map 1.size deleted file mode 100644 index 2931263..0000000 --- a/eastern flames/datafiles/Map 1/Map 1.size +++ /dev/null @@ -1 +0,0 @@ -23.71898078918457 , 16.358203887939453 , 1.5586051940917969 \ No newline at end of file diff --git a/eastern flames/datafiles/Map 1/MapAtlas.png b/eastern flames/datafiles/Map 1/MapAtlas.png deleted file mode 100644 index 0f3996d..0000000 Binary files a/eastern flames/datafiles/Map 1/MapAtlas.png and /dev/null differ diff --git a/eastern flames/datafiles/Test Map/GBA Test.dat b/eastern flames/datafiles/Test Map/GBA Test.dat deleted file mode 100644 index 3cad636..0000000 Binary files a/eastern flames/datafiles/Test Map/GBA Test.dat and /dev/null differ diff --git a/eastern flames/datafiles/Test Map/GBA Test.size b/eastern flames/datafiles/Test Map/GBA Test.size deleted file mode 100644 index d08e900..0000000 --- a/eastern flames/datafiles/Test Map/GBA Test.size +++ /dev/null @@ -1 +0,0 @@ -13.828370094299316 , 11.73211669921875 , 3.921311855316162 \ No newline at end of file diff --git a/eastern flames/datafiles/Test Map/GBATestAtlas.png b/eastern flames/datafiles/Test Map/GBATestAtlas.png deleted file mode 100644 index 34e4712..0000000 Binary files a/eastern flames/datafiles/Test Map/GBATestAtlas.png and /dev/null differ diff --git a/eastern flames/datafiles/map1/map1.dat b/eastern flames/datafiles/map1/map1.dat new file mode 100644 index 0000000..d1d2e49 Binary files /dev/null and b/eastern flames/datafiles/map1/map1.dat differ diff --git a/eastern flames/datafiles/map1/map1.size b/eastern flames/datafiles/map1/map1.size new file mode 100644 index 0000000..430b7aa --- /dev/null +++ b/eastern flames/datafiles/map1/map1.size @@ -0,0 +1 @@ +23.718978881835938 , 16.35820198059082 , 1.6182538270950317 \ No newline at end of file diff --git a/eastern flames/datafiles/map1/mapatlas.png b/eastern flames/datafiles/map1/mapatlas.png new file mode 100644 index 0000000..7cf4a70 Binary files /dev/null and b/eastern flames/datafiles/map1/mapatlas.png differ diff --git a/eastern flames/datafiles/testmap/gbatest.dat b/eastern flames/datafiles/testmap/gbatest.dat new file mode 100644 index 0000000..9babb6c Binary files /dev/null and b/eastern flames/datafiles/testmap/gbatest.dat differ diff --git a/eastern flames/datafiles/testmap/gbatest.size b/eastern flames/datafiles/testmap/gbatest.size new file mode 100644 index 0000000..fb190ec --- /dev/null +++ b/eastern flames/datafiles/testmap/gbatest.size @@ -0,0 +1 @@ +13.828370094299316 , 11.73211669921875 , 3.961841344833374 \ No newline at end of file diff --git a/eastern flames/datafiles/testmap/gbatestatlas.png b/eastern flames/datafiles/testmap/gbatestatlas.png new file mode 100644 index 0000000..ec6990e Binary files /dev/null and b/eastern flames/datafiles/testmap/gbatestatlas.png differ diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index 8ca4536..f52af47 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -177,12 +177,12 @@ "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/map1","resourceVersion":"1.0","name":"map1.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"map1.size","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/map1","resourceVersion":"1.0","name":"mapatlas.png","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatest.size","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles/testmap","resourceVersion":"1.0","name":"gbatestatlas.png","resourceType":"GMIncludedFile",}, ], "MetaData": { "IDEVersion": "2.3.3.574", diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml index be1bc60..48399f8 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -17,6 +17,7 @@ global.gh = 360; global.camerax = 0; global.cameray = 0; state = st_control; +cursor = new vec2(0, 0); //these are functions bc c_2dto3d uses them function getProj(){ return matrix_build_projection_perspective_fov(60,-16/9,1,4000) @@ -37,11 +38,14 @@ function setCam(){ global.turn = ARMY.US; function drawModels(){ - gpu_set_cullmode(cull_counterclockwise); + //gpu_set_cullmode(cull_counterclockwise); gpu_set_ztestenable(true); + gpu_set_alphatestenable(true); + gpu_set_alphatestref(128); for(var i = 0; i < array_length(models);i++){ models[i].draw(); } + gpu_set_alphatestenable(false); gpu_set_cullmode(cull_noculling); gpu_set_ztestenable(false); } @@ -49,7 +53,8 @@ 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); -textbox_create(txt_test); \ No newline at end of file +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(); \ No newline at end of file