diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp index 97bac40..6794fda 100644 --- a/eastern flames/eastern flames.yyp +++ b/eastern flames/eastern flames.yyp @@ -2,6 +2,7 @@ "resources": [ {"id":{"name":"draw_sprite_at","path":"scripts/draw_sprite_at/draw_sprite_at.yy",},"order":8,}, {"id":{"name":"c_inheritunit","path":"scripts/c_inheritunit/c_inheritunit.yy",},"order":5,}, + {"id":{"name":"vertex_format_create_simple","path":"scripts/vertex_format_create_simple/vertex_format_create_simple.yy",},"order":5,}, {"id":{"name":"array_sum","path":"scripts/array_sum/array_sum.yy",},"order":7,}, {"id":{"name":"clampneg","path":"scripts/clampneg/clampneg.yy",},"order":8,}, {"id":{"name":"array_remove","path":"scripts/array_remove/array_remove.yy",},"order":6,}, @@ -26,6 +27,7 @@ {"id":{"name":"draw_settings","path":"scripts/draw_settings/draw_settings.yy",},"order":3,}, {"id":{"name":"draw_circle_curve","path":"scripts/draw_circle_curve/draw_circle_curve.yy",},"order":2,}, {"id":{"name":"s_momijidown","path":"sprites/s_momijidown/s_momijidown.yy",},"order":2,}, + {"id":{"name":"camera_reset","path":"scripts/camera_reset/camera_reset.yy",},"order":0,}, {"id":{"name":"o_unit","path":"objects/o_unit/o_unit.yy",},"order":2,}, {"id":{"name":"combat","path":"scripts/combat/combat.yy",},"order":13,}, {"id":{"name":"mod_negative","path":"scripts/mod_negative/mod_negative.yy",},"order":11,}, @@ -36,6 +38,7 @@ {"id":{"name":"format_time","path":"scripts/format_time/format_time.yy",},"order":12,}, {"id":{"name":"o_screenshake","path":"objects/o_screenshake/o_screenshake.yy",},"order":0,}, {"id":{"name":"ncm","path":"scripts/ncm/ncm.yy",},"order":14,}, + {"id":{"name":"Model","path":"scripts/Model/Model.yy",},"order":2,}, {"id":{"name":"c_gettile","path":"scripts/c_gettile/c_gettile.yy",},"order":11,}, {"id":{"name":"sinmult","path":"scripts/sinmult/sinmult.yy",},"order":16,}, {"id":{"name":"munction","path":"scripts/munction/munction.yy",},"order":12,}, @@ -48,6 +51,7 @@ {"id":{"name":"linear_approach","path":"scripts/linear_approach/linear_approach.yy",},"order":18,}, {"id":{"name":"s_momijiup","path":"sprites/s_momijiup/s_momijiup.yy",},"order":1,}, {"id":{"name":"array_contains","path":"scripts/array_contains/array_contains.yy",},"order":0,}, + {"id":{"name":"model_transform","path":"scripts/model_transform/model_transform.yy",},"order":4,}, {"id":{"name":"song","path":"scripts/song/song.yy",},"order":1,}, {"id":{"name":"cpp","path":"scripts/cpp/cpp.yy",},"order":1,}, {"id":{"name":"log","path":"scripts/log/log.yy",},"order":10,}, @@ -70,7 +74,9 @@ {"id":{"name":"se_play","path":"scripts/se_play/se_play.yy",},"order":5,}, {"id":{"name":"msglang","path":"scripts/msglang/msglang.yy",},"order":15,}, {"id":{"name":"array_front","path":"scripts/array_front/array_front.yy",},"order":2,}, + {"id":{"name":"model_load","path":"scripts/model_load/model_load.yy",},"order":3,}, {"id":{"name":"with_array","path":"scripts/with_array/with_array.yy",},"order":17,}, + {"id":{"name":"matrux_transpose","path":"scripts/matrux_transpose/matrux_transpose.yy",},"order":1,}, {"id":{"name":"point_me","path":"scripts/point_me/point_me.yy",},"order":15,}, {"id":{"name":"draw_hitbox","path":"scripts/draw_hitbox/draw_hitbox.yy",},"order":4,}, {"id":{"name":"ARTICULATOR","path":"objects/ARTICULATOR/ARTICULATOR.yy",},"order":0,}, @@ -120,6 +126,7 @@ {"folderPath":"folders/Scripts/util/drawing/vlambeer.yy","order":1,"resourceVersion":"1.0","name":"vlambeer","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Scripts/util.yy","order":1,"resourceVersion":"1.0","name":"util","tags":[],"resourceType":"GMFolder",}, {"folderPath":"folders/Sprites/momiji.yy","order":2,"resourceVersion":"1.0","name":"momiji","tags":[],"resourceType":"GMFolder",}, + {"folderPath":"folders/Scripts/3d.yy","order":19,"resourceVersion":"1.0","name":"3d","tags":[],"resourceType":"GMFolder",}, ], "AudioGroups": [ {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, @@ -127,7 +134,10 @@ "TextureGroups": [ {"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","resourceVersion":"1.0","name":"shrine thing.dat","resourceType":"GMIncludedFile",}, + {"CopyToMask":-1,"filePath":"datafiles","resourceVersion":"1.0","name":"shrine thing tex.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 9342aee..e9816c0 100644 --- a/eastern flames/objects/ARTICULATOR/Create_0.gml +++ b/eastern flames/objects/ARTICULATOR/Create_0.gml @@ -21,7 +21,6 @@ function getProj(){ function getView(){ var _x = global.camerax; var _y = global.cameray; - var half = (7.5*32)+40; return matrix_build_lookat(_x,_y+100,100,_x,_y,0,0,0,-1); } @@ -30,4 +29,19 @@ function setCam(){ camera_set_proj_mat(cam,getProj()); camera_set_view_mat(cam,getView()) camera_apply(cam); -} \ No newline at end of file +} + +function drawModels(){ + gpu_set_cullmode(cull_counterclockwise); + gpu_set_ztestenable(true); + for(var i = 0; i < array_length(models);i++){ + models[i].draw(); + } + gpu_set_cullmode(cull_noculling); + gpu_set_ztestenable(false); +} + +models = []; + +var spr = sprite_add("./shrine thing tex.png",0,false,false,0,0); +nu Model("./shrine thing.dat",spr); \ No newline at end of file diff --git a/eastern flames/objects/ARTICULATOR/Draw_72.gml b/eastern flames/objects/ARTICULATOR/Draw_72.gml index 2674f11..8cfa964 100644 --- a/eastern flames/objects/ARTICULATOR/Draw_72.gml +++ b/eastern flames/objects/ARTICULATOR/Draw_72.gml @@ -42,4 +42,6 @@ for (i=0; i 0 && argument[0]){ + vertex_format_add_normal(); + } + if(argument_count > 1 && argument[1]){ + vertex_format_add_color(); + } + if(argument_count > 2 && argument[2]){ + vertex_format_add_texcoord(); + } + if(argument_count > 3 && argument[3]){ + vertex_format_add_custom(vertex_type_float3, vertex_usage_texcoord); + vertex_format_add_custom(vertex_type_float3, vertex_usage_texcoord); + } + + return vertex_format_end(); +} diff --git a/eastern flames/scripts/vertex_format_create_simple/vertex_format_create_simple.yy b/eastern flames/scripts/vertex_format_create_simple/vertex_format_create_simple.yy new file mode 100644 index 0000000..4cde8e0 --- /dev/null +++ b/eastern flames/scripts/vertex_format_create_simple/vertex_format_create_simple.yy @@ -0,0 +1,12 @@ +{ + "isDnD": false, + "isCompatibility": false, + "parent": { + "name": "3d", + "path": "folders/Scripts/3d.yy", + }, + "resourceVersion": "1.0", + "name": "vertex_format_create_simple", + "tags": [], + "resourceType": "GMScript", +} \ No newline at end of file