From fb2065f004243bb6b035d7c82ac9ad93b2e39f39 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Sat, 27 Jul 2024 10:46:16 +0700 Subject: [PATCH] - [HLSL] Fix color value does not work. --- PixelComposer.resource_order | 2 + PixelComposer.yyp | 2 + fonts/_f_code_s/_f_code.old.png | Bin 0 -> 11082 bytes fonts/_f_code_s/_f_code.old.yy | 141 +++++++++++++++++ fonts/_f_code_s/_f_code.png | Bin 0 -> 9416 bytes fonts/_f_code_s/_f_code_s.old.png | Bin 0 -> 7134 bytes fonts/_f_code_s/_f_code_s.old.yy | 143 ++++++++++++++++++ fonts/_f_code_s/_f_code_s.png | Bin 0 -> 8534 bytes fonts/_f_code_s/_f_code_s.yy | 143 ++++++++++++++++++ objects/_p_dialog/Create_0.gml | 4 +- objects/o_dialog_preference/Create_0.gml | 2 +- objects/o_dialog_preset/Create_0.gml | 25 ++- objects/o_dialog_preset/Draw_64.gml | 4 +- objects/o_dialog_preset/o_dialog_preset.yy | 4 +- .../dialog_management/dialog_management.gml | 13 +- scripts/node_hlsl/node_hlsl.gml | 73 ++++----- scripts/panel_data/panel_data.gml | 1 + scripts/panel_function/panel_function.gml | 2 +- scripts/panel_globalvar/panel_globalvar.gml | 4 +- scripts/panel_gradient/panel_gradient.gml | 2 +- scripts/panel_inspector/panel_inspector.gml | 4 +- scripts/panel_nodes/panel_nodes.gml | 2 +- .../panel_notification/panel_notification.gml | 2 +- scripts/panel_presets/panel_presets.gml | 129 ++++++++++++++++ scripts/panel_presets/panel_presets.yy | 13 ++ scripts/panel_tunnels/panel_tunnels.gml | 2 +- scripts/textArea/textArea.gml | 2 +- scripts/textBox/textBox.gml | 4 +- 28 files changed, 658 insertions(+), 65 deletions(-) create mode 100644 fonts/_f_code_s/_f_code.old.png create mode 100644 fonts/_f_code_s/_f_code.old.yy create mode 100644 fonts/_f_code_s/_f_code.png create mode 100644 fonts/_f_code_s/_f_code_s.old.png create mode 100644 fonts/_f_code_s/_f_code_s.old.yy create mode 100644 fonts/_f_code_s/_f_code_s.png create mode 100644 fonts/_f_code_s/_f_code_s.yy create mode 100644 scripts/panel_presets/panel_presets.gml create mode 100644 scripts/panel_presets/panel_presets.yy diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 40453d7c5..d3f77472f 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -240,6 +240,7 @@ {"name":"Steamworks","order":2,"path":"extensions/Steamworks/Steamworks.yy",}, {"name":"TabletStuff","order":15,"path":"extensions/TabletStuff/TabletStuff.yy",}, {"name":"YYFirebaseFirestore","order":1,"path":"extensions/YYFirebaseFirestore/YYFirebaseFirestore.yy",}, + {"name":"_f_code_s","order":18,"path":"fonts/_f_code_s/_f_code_s.yy",}, {"name":"_f_code","order":9,"path":"fonts/_f_code/_f_code.yy",}, {"name":"_f_h1","order":11,"path":"fonts/_f_h1/_f_h1.yy",}, {"name":"_f_h2","order":12,"path":"fonts/_f_h2/_f_h2.yy",}, @@ -1217,6 +1218,7 @@ {"name":"panel_notification","order":2,"path":"scripts/panel_notification/panel_notification.yy",}, {"name":"panel_palette_mixer","order":3,"path":"scripts/panel_palette_mixer/panel_palette_mixer.yy",}, {"name":"panel_patreon","order":2,"path":"scripts/panel_patreon/panel_patreon.yy",}, + {"name":"panel_presets","order":4,"path":"scripts/panel_presets/panel_presets.yy",}, {"name":"panel_preview_3d_sdf_setting","order":10,"path":"scripts/panel_preview_3d_sdf_setting/panel_preview_3d_sdf_setting.yy",}, {"name":"panel_preview_3d_setting","order":2,"path":"scripts/panel_preview_3d_setting/panel_preview_3d_setting.yy",}, {"name":"panel_preview_grid_setting","order":4,"path":"scripts/panel_preview_grid_setting/panel_preview_grid_setting.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index fb075081a..702c71add 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -689,6 +689,7 @@ {"id":{"name":"Steamworks","path":"extensions/Steamworks/Steamworks.yy",},}, {"id":{"name":"TabletStuff","path":"extensions/TabletStuff/TabletStuff.yy",},}, {"id":{"name":"YYFirebaseFirestore","path":"extensions/YYFirebaseFirestore/YYFirebaseFirestore.yy",},}, + {"id":{"name":"_f_code_s","path":"fonts/_f_code_s/_f_code_s.yy",},}, {"id":{"name":"_f_code","path":"fonts/_f_code/_f_code.yy",},}, {"id":{"name":"_f_h1","path":"fonts/_f_h1/_f_h1.yy",},}, {"id":{"name":"_f_h2","path":"fonts/_f_h2/_f_h2.yy",},}, @@ -1821,6 +1822,7 @@ {"id":{"name":"panel_palette_mixer","path":"scripts/panel_palette_mixer/panel_palette_mixer.yy",},}, {"id":{"name":"panel_palette","path":"scripts/panel_palette/panel_palette.yy",},}, {"id":{"name":"panel_patreon","path":"scripts/panel_patreon/panel_patreon.yy",},}, + {"id":{"name":"panel_presets","path":"scripts/panel_presets/panel_presets.yy",},}, {"id":{"name":"panel_preview_3d_sdf_setting","path":"scripts/panel_preview_3d_sdf_setting/panel_preview_3d_sdf_setting.yy",},}, {"id":{"name":"panel_preview_3d_setting","path":"scripts/panel_preview_3d_setting/panel_preview_3d_setting.yy",},}, {"id":{"name":"panel_preview_grid_setting","path":"scripts/panel_preview_grid_setting/panel_preview_grid_setting.yy",},}, diff --git a/fonts/_f_code_s/_f_code.old.png b/fonts/_f_code_s/_f_code.old.png new file mode 100644 index 0000000000000000000000000000000000000000..6a7f35f537f49a84fbd27aa18d66fe4f7e26b2e6 GIT binary patch literal 11082 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 E0B>jH$^ZZW literal 0 HcmV?d00001 diff --git a/fonts/_f_code_s/_f_code.old.yy b/fonts/_f_code_s/_f_code.old.yy new file mode 100644 index 000000000..2e02f7630 --- /dev/null +++ b/fonts/_f_code_s/_f_code.old.yy @@ -0,0 +1,141 @@ +{ + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "_f_code", + "AntiAlias": 1, + "applyKerning": 0, + "ascender": 15, + "ascenderOffset": 0, + "bold": false, + "canGenerateBitmap": true, + "charset": 0, + "first": 0, + "fontName": "Fira Code Medium", + "glyphOperations": 0, + "glyphs": { + "32": {"character":32,"h":21,"offset":0,"shift":10,"w":10,"x":2,"y":2,}, + "33": {"character":33,"h":21,"offset":3,"shift":19,"w":4,"x":205,"y":48,}, + "34": {"character":34,"h":21,"offset":2,"shift":19,"w":6,"x":197,"y":48,}, + "35": {"character":35,"h":21,"offset":0,"shift":19,"w":9,"x":186,"y":48,}, + "36": {"character":36,"h":21,"offset":0,"shift":19,"w":9,"x":175,"y":48,}, + "37": {"character":37,"h":21,"offset":0,"shift":19,"w":10,"x":163,"y":48,}, + "38": {"character":38,"h":21,"offset":0,"shift":19,"w":10,"x":151,"y":48,}, + "39": {"character":39,"h":21,"offset":3,"shift":19,"w":3,"x":146,"y":48,}, + "40": {"character":40,"h":21,"offset":1,"shift":19,"w":6,"x":138,"y":48,}, + "41": {"character":41,"h":21,"offset":2,"shift":19,"w":6,"x":130,"y":48,}, + "42": {"character":42,"h":21,"offset":0,"shift":19,"w":9,"x":211,"y":48,}, + "43": {"character":43,"h":21,"offset":0,"shift":19,"w":9,"x":119,"y":48,}, + "44": {"character":44,"h":21,"offset":3,"shift":19,"w":4,"x":103,"y":48,}, + "45": {"character":45,"h":21,"offset":1,"shift":19,"w":8,"x":93,"y":48,}, + "46": {"character":46,"h":21,"offset":3,"shift":19,"w":4,"x":87,"y":48,}, + "47": {"character":47,"h":21,"offset":0,"shift":19,"w":9,"x":76,"y":48,}, + "48": {"character":48,"h":21,"offset":1,"shift":19,"w":8,"x":66,"y":48,}, + "49": {"character":49,"h":21,"offset":1,"shift":19,"w":8,"x":56,"y":48,}, + "50": {"character":50,"h":21,"offset":0,"shift":19,"w":9,"x":45,"y":48,}, + "51": {"character":51,"h":21,"offset":0,"shift":19,"w":9,"x":34,"y":48,}, + "52": {"character":52,"h":21,"offset":0,"shift":19,"w":9,"x":23,"y":48,}, + "53": {"character":53,"h":21,"offset":1,"shift":19,"w":8,"x":109,"y":48,}, + "54": {"character":54,"h":21,"offset":1,"shift":19,"w":8,"x":222,"y":48,}, + "55": {"character":55,"h":21,"offset":1,"shift":19,"w":8,"x":232,"y":48,}, + "56": {"character":56,"h":21,"offset":0,"shift":19,"w":9,"x":242,"y":48,}, + "57": {"character":57,"h":21,"offset":0,"shift":19,"w":9,"x":204,"y":71,}, + "58": {"character":58,"h":21,"offset":3,"shift":19,"w":4,"x":198,"y":71,}, + "59": {"character":59,"h":21,"offset":3,"shift":19,"w":4,"x":192,"y":71,}, + "60": {"character":60,"h":21,"offset":1,"shift":19,"w":8,"x":182,"y":71,}, + "61": {"character":61,"h":21,"offset":1,"shift":19,"w":8,"x":172,"y":71,}, + "62": {"character":62,"h":21,"offset":1,"shift":19,"w":8,"x":162,"y":71,}, + "63": {"character":63,"h":21,"offset":1,"shift":19,"w":8,"x":152,"y":71,}, + "64": {"character":64,"h":21,"offset":0,"shift":19,"w":10,"x":140,"y":71,}, + "65": {"character":65,"h":21,"offset":0,"shift":19,"w":10,"x":128,"y":71,}, + "66": {"character":66,"h":21,"offset":1,"shift":19,"w":8,"x":118,"y":71,}, + "67": {"character":67,"h":21,"offset":0,"shift":19,"w":10,"x":106,"y":71,}, + "68": {"character":68,"h":21,"offset":1,"shift":19,"w":8,"x":96,"y":71,}, + "69": {"character":69,"h":21,"offset":1,"shift":19,"w":8,"x":86,"y":71,}, + "70": {"character":70,"h":21,"offset":2,"shift":19,"w":7,"x":77,"y":71,}, + "71": {"character":71,"h":21,"offset":0,"shift":19,"w":9,"x":66,"y":71,}, + "72": {"character":72,"h":21,"offset":1,"shift":19,"w":8,"x":56,"y":71,}, + "73": {"character":73,"h":21,"offset":1,"shift":19,"w":8,"x":46,"y":71,}, + "74": {"character":74,"h":21,"offset":0,"shift":19,"w":9,"x":35,"y":71,}, + "75": {"character":75,"h":21,"offset":1,"shift":19,"w":9,"x":24,"y":71,}, + "76": {"character":76,"h":21,"offset":1,"shift":19,"w":8,"x":14,"y":71,}, + "77": {"character":77,"h":21,"offset":0,"shift":19,"w":10,"x":2,"y":71,}, + "78": {"character":78,"h":21,"offset":1,"shift":19,"w":8,"x":13,"y":48,}, + "79": {"character":79,"h":21,"offset":0,"shift":19,"w":9,"x":2,"y":48,}, + "80": {"character":80,"h":21,"offset":1,"shift":19,"w":9,"x":235,"y":25,}, + "81": {"character":81,"h":21,"offset":0,"shift":19,"w":10,"x":236,"y":2,}, + "82": {"character":82,"h":21,"offset":1,"shift":19,"w":9,"x":217,"y":2,}, + "83": {"character":83,"h":21,"offset":0,"shift":19,"w":9,"x":206,"y":2,}, + "84": {"character":84,"h":21,"offset":0,"shift":19,"w":10,"x":194,"y":2,}, + "85": {"character":85,"h":21,"offset":0,"shift":19,"w":9,"x":183,"y":2,}, + "86": {"character":86,"h":21,"offset":0,"shift":19,"w":10,"x":171,"y":2,}, + "87": {"character":87,"h":21,"offset":0,"shift":19,"w":10,"x":159,"y":2,}, + "88": {"character":88,"h":21,"offset":0,"shift":19,"w":10,"x":147,"y":2,}, + "89": {"character":89,"h":21,"offset":0,"shift":19,"w":10,"x":135,"y":2,}, + "90": {"character":90,"h":21,"offset":0,"shift":19,"w":9,"x":124,"y":2,}, + "91": {"character":91,"h":21,"offset":2,"shift":19,"w":6,"x":228,"y":2,}, + "92": {"character":92,"h":21,"offset":0,"shift":19,"w":9,"x":113,"y":2,}, + "93": {"character":93,"h":21,"offset":2,"shift":19,"w":5,"x":95,"y":2,}, + "94": {"character":94,"h":21,"offset":0,"shift":19,"w":9,"x":84,"y":2,}, + "95": {"character":95,"h":21,"offset":0,"shift":19,"w":9,"x":73,"y":2,}, + "96": {"character":96,"h":21,"offset":2,"shift":19,"w":5,"x":66,"y":2,}, + "97": {"character":97,"h":21,"offset":0,"shift":19,"w":9,"x":55,"y":2,}, + "98": {"character":98,"h":21,"offset":1,"shift":19,"w":8,"x":45,"y":2,}, + "99": {"character":99,"h":21,"offset":1,"shift":19,"w":8,"x":35,"y":2,}, + "100": {"character":100,"h":21,"offset":0,"shift":19,"w":9,"x":24,"y":2,}, + "101": {"character":101,"h":21,"offset":1,"shift":19,"w":8,"x":14,"y":2,}, + "102": {"character":102,"h":21,"offset":1,"shift":19,"w":9,"x":102,"y":2,}, + "103": {"character":103,"h":21,"offset":0,"shift":19,"w":10,"x":2,"y":25,}, + "104": {"character":104,"h":21,"offset":1,"shift":19,"w":8,"x":111,"y":25,}, + "105": {"character":105,"h":21,"offset":1,"shift":19,"w":8,"x":14,"y":25,}, + "106": {"character":106,"h":21,"offset":1,"shift":19,"w":7,"x":216,"y":25,}, + "107": {"character":107,"h":21,"offset":1,"shift":19,"w":9,"x":205,"y":25,}, + "108": {"character":108,"h":21,"offset":0,"shift":19,"w":9,"x":194,"y":25,}, + "109": {"character":109,"h":21,"offset":0,"shift":19,"w":9,"x":183,"y":25,}, + "110": {"character":110,"h":21,"offset":1,"shift":19,"w":8,"x":173,"y":25,}, + "111": {"character":111,"h":21,"offset":0,"shift":19,"w":9,"x":162,"y":25,}, + "112": {"character":112,"h":21,"offset":1,"shift":19,"w":8,"x":152,"y":25,}, + "113": {"character":113,"h":21,"offset":0,"shift":19,"w":9,"x":141,"y":25,}, + "114": {"character":114,"h":21,"offset":1,"shift":19,"w":8,"x":131,"y":25,}, + "115": {"character":115,"h":21,"offset":1,"shift":19,"w":8,"x":225,"y":25,}, + "116": {"character":116,"h":21,"offset":1,"shift":19,"w":8,"x":121,"y":25,}, + "117": {"character":117,"h":21,"offset":1,"shift":19,"w":8,"x":101,"y":25,}, + "118": {"character":118,"h":21,"offset":0,"shift":19,"w":9,"x":90,"y":25,}, + "119": {"character":119,"h":21,"offset":0,"shift":19,"w":10,"x":78,"y":25,}, + "120": {"character":120,"h":21,"offset":0,"shift":19,"w":9,"x":67,"y":25,}, + "121": {"character":121,"h":21,"offset":0,"shift":19,"w":9,"x":56,"y":25,}, + "122": {"character":122,"h":21,"offset":1,"shift":19,"w":8,"x":46,"y":25,}, + "123": {"character":123,"h":21,"offset":1,"shift":19,"w":7,"x":37,"y":25,}, + "124": {"character":124,"h":21,"offset":3,"shift":19,"w":3,"x":32,"y":25,}, + "125": {"character":125,"h":21,"offset":2,"shift":19,"w":6,"x":24,"y":25,}, + "126": {"character":126,"h":21,"offset":0,"shift":19,"w":10,"x":215,"y":71,}, + "9647": {"character":9647,"h":21,"offset":2,"shift":19,"w":5,"x":227,"y":71,}, + }, + "hinting": 0, + "includeTTF": false, + "interpreter": 0, + "italic": false, + "kerningPairs": [], + "last": 0, + "lineHeight": 0, + "maintainGms1Font": false, + "parent": { + "name": "font", + "path": "folders/font.yy", + }, + "pointRounding": 0, + "ranges": [ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap": false, + "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread": 8, + "size": 12.0, + "styleName": "Light", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "TTFName": "", + "usesSDF": false, +} \ No newline at end of file diff --git a/fonts/_f_code_s/_f_code.png b/fonts/_f_code_s/_f_code.png new file mode 100644 index 0000000000000000000000000000000000000000..660fc3e0c0a1de0cd27c39378e3a79b46d6a48ff GIT binary patch literal 9416 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 JS`BE-e*iZztgiq7 literal 0 HcmV?d00001 diff --git a/fonts/_f_code_s/_f_code_s.old.yy b/fonts/_f_code_s/_f_code_s.old.yy new file mode 100644 index 000000000..b30a669c5 --- /dev/null +++ b/fonts/_f_code_s/_f_code_s.old.yy @@ -0,0 +1,143 @@ +{ + "$GMFont":"", + "%Name":"_f_code_s", + "AntiAlias":1, + "applyKerning":0, + "ascender":10, + "ascenderOffset":0, + "bold":false, + "canGenerateBitmap":true, + "charset":0, + "first":0, + "fontName":"Fira Code Medium", + "glyphOperations":0, + "glyphs":{ + "32":{"character":32,"h":14,"offset":0,"shift":6,"w":6,"x":2,"y":2,}, + "33":{"character":33,"h":14,"offset":2,"shift":6,"w":2,"x":42,"y":66,}, + "34":{"character":34,"h":14,"offset":1,"shift":6,"w":4,"x":36,"y":66,}, + "35":{"character":35,"h":14,"offset":0,"shift":6,"w":6,"x":28,"y":66,}, + "36":{"character":36,"h":14,"offset":0,"shift":6,"w":6,"x":20,"y":66,}, + "37":{"character":37,"h":14,"offset":0,"shift":6,"w":7,"x":11,"y":66,}, + "38":{"character":38,"h":14,"offset":0,"shift":6,"w":7,"x":2,"y":66,}, + "39":{"character":39,"h":14,"offset":2,"shift":6,"w":2,"x":120,"y":50,}, + "40":{"character":40,"h":14,"offset":1,"shift":6,"w":4,"x":114,"y":50,}, + "41":{"character":41,"h":14,"offset":1,"shift":6,"w":5,"x":107,"y":50,}, + "42":{"character":42,"h":14,"offset":0,"shift":6,"w":6,"x":46,"y":66,}, + "43":{"character":43,"h":14,"offset":0,"shift":6,"w":6,"x":99,"y":50,}, + "44":{"character":44,"h":14,"offset":2,"shift":6,"w":3,"x":86,"y":50,}, + "45":{"character":45,"h":14,"offset":1,"shift":6,"w":5,"x":79,"y":50,}, + "46":{"character":46,"h":14,"offset":2,"shift":6,"w":3,"x":74,"y":50,}, + "47":{"character":47,"h":14,"offset":0,"shift":6,"w":6,"x":66,"y":50,}, + "48":{"character":48,"h":14,"offset":0,"shift":6,"w":6,"x":58,"y":50,}, + "49":{"character":49,"h":14,"offset":0,"shift":6,"w":6,"x":50,"y":50,}, + "50":{"character":50,"h":14,"offset":0,"shift":6,"w":6,"x":42,"y":50,}, + "51":{"character":51,"h":14,"offset":0,"shift":6,"w":6,"x":34,"y":50,}, + "52":{"character":52,"h":14,"offset":0,"shift":6,"w":6,"x":26,"y":50,}, + "53":{"character":53,"h":14,"offset":0,"shift":6,"w":6,"x":91,"y":50,}, + "54":{"character":54,"h":14,"offset":0,"shift":6,"w":6,"x":54,"y":66,}, + "55":{"character":55,"h":14,"offset":0,"shift":6,"w":6,"x":62,"y":66,}, + "56":{"character":56,"h":14,"offset":0,"shift":6,"w":6,"x":70,"y":66,}, + "57":{"character":57,"h":14,"offset":0,"shift":6,"w":6,"x":108,"y":82,}, + "58":{"character":58,"h":14,"offset":2,"shift":6,"w":3,"x":103,"y":82,}, + "59":{"character":59,"h":14,"offset":2,"shift":6,"w":3,"x":98,"y":82,}, + "60":{"character":60,"h":14,"offset":0,"shift":6,"w":6,"x":90,"y":82,}, + "61":{"character":61,"h":14,"offset":1,"shift":6,"w":5,"x":83,"y":82,}, + "62":{"character":62,"h":14,"offset":0,"shift":6,"w":6,"x":75,"y":82,}, + "63":{"character":63,"h":14,"offset":0,"shift":6,"w":6,"x":67,"y":82,}, + "64":{"character":64,"h":14,"offset":0,"shift":6,"w":7,"x":58,"y":82,}, + "65":{"character":65,"h":14,"offset":0,"shift":6,"w":7,"x":49,"y":82,}, + "66":{"character":66,"h":14,"offset":0,"shift":6,"w":6,"x":41,"y":82,}, + "67":{"character":67,"h":14,"offset":0,"shift":6,"w":7,"x":32,"y":82,}, + "68":{"character":68,"h":14,"offset":0,"shift":6,"w":6,"x":24,"y":82,}, + "69":{"character":69,"h":14,"offset":1,"shift":6,"w":5,"x":17,"y":82,}, + "70":{"character":70,"h":14,"offset":1,"shift":6,"w":5,"x":10,"y":82,}, + "71":{"character":71,"h":14,"offset":0,"shift":6,"w":6,"x":2,"y":82,}, + "72":{"character":72,"h":14,"offset":0,"shift":6,"w":6,"x":119,"y":66,}, + "73":{"character":73,"h":14,"offset":0,"shift":6,"w":6,"x":111,"y":66,}, + "74":{"character":74,"h":14,"offset":0,"shift":6,"w":6,"x":103,"y":66,}, + "75":{"character":75,"h":14,"offset":0,"shift":6,"w":7,"x":94,"y":66,}, + "76":{"character":76,"h":14,"offset":1,"shift":6,"w":5,"x":87,"y":66,}, + "77":{"character":77,"h":14,"offset":0,"shift":6,"w":7,"x":78,"y":66,}, + "78":{"character":78,"h":14,"offset":0,"shift":6,"w":6,"x":18,"y":50,}, + "79":{"character":79,"h":14,"offset":0,"shift":6,"w":6,"x":10,"y":50,}, + "80":{"character":80,"h":14,"offset":1,"shift":6,"w":6,"x":2,"y":50,}, + "81":{"character":81,"h":14,"offset":0,"shift":6,"w":7,"x":60,"y":18,}, + "82":{"character":82,"h":14,"offset":0,"shift":6,"w":7,"x":45,"y":18,}, + "83":{"character":83,"h":14,"offset":0,"shift":6,"w":6,"x":37,"y":18,}, + "84":{"character":84,"h":14,"offset":0,"shift":6,"w":7,"x":28,"y":18,}, + "85":{"character":85,"h":14,"offset":0,"shift":6,"w":6,"x":20,"y":18,}, + "86":{"character":86,"h":14,"offset":0,"shift":6,"w":7,"x":11,"y":18,}, + "87":{"character":87,"h":14,"offset":0,"shift":6,"w":7,"x":2,"y":18,}, + "88":{"character":88,"h":14,"offset":0,"shift":6,"w":7,"x":112,"y":2,}, + "89":{"character":89,"h":14,"offset":0,"shift":6,"w":7,"x":103,"y":2,}, + "90":{"character":90,"h":14,"offset":0,"shift":6,"w":6,"x":95,"y":2,}, + "91":{"character":91,"h":14,"offset":1,"shift":6,"w":4,"x":54,"y":18,}, + "92":{"character":92,"h":14,"offset":0,"shift":6,"w":6,"x":87,"y":2,}, + "93":{"character":93,"h":14,"offset":1,"shift":6,"w":4,"x":72,"y":2,}, + "94":{"character":94,"h":14,"offset":0,"shift":6,"w":6,"x":64,"y":2,}, + "95":{"character":95,"h":14,"offset":0,"shift":6,"w":6,"x":56,"y":2,}, + "96":{"character":96,"h":14,"offset":1,"shift":6,"w":4,"x":50,"y":2,}, + "97":{"character":97,"h":14,"offset":0,"shift":6,"w":6,"x":42,"y":2,}, + "98":{"character":98,"h":14,"offset":0,"shift":6,"w":6,"x":34,"y":2,}, + "99":{"character":99,"h":14,"offset":0,"shift":6,"w":6,"x":26,"y":2,}, + "100":{"character":100,"h":14,"offset":0,"shift":6,"w":6,"x":18,"y":2,}, + "101":{"character":101,"h":14,"offset":0,"shift":6,"w":6,"x":10,"y":2,}, + "102":{"character":102,"h":14,"offset":0,"shift":6,"w":7,"x":78,"y":2,}, + "103":{"character":103,"h":14,"offset":0,"shift":6,"w":7,"x":69,"y":18,}, + "104":{"character":104,"h":14,"offset":0,"shift":6,"w":6,"x":27,"y":34,}, + "105":{"character":105,"h":14,"offset":1,"shift":6,"w":5,"x":78,"y":18,}, + "106":{"character":106,"h":14,"offset":0,"shift":6,"w":5,"x":107,"y":34,}, + "107":{"character":107,"h":14,"offset":0,"shift":6,"w":7,"x":98,"y":34,}, + "108":{"character":108,"h":14,"offset":0,"shift":6,"w":6,"x":90,"y":34,}, + "109":{"character":109,"h":14,"offset":0,"shift":6,"w":6,"x":82,"y":34,}, + "110":{"character":110,"h":14,"offset":0,"shift":6,"w":6,"x":74,"y":34,}, + "111":{"character":111,"h":14,"offset":0,"shift":6,"w":6,"x":66,"y":34,}, + "112":{"character":112,"h":14,"offset":0,"shift":6,"w":6,"x":58,"y":34,}, + "113":{"character":113,"h":14,"offset":0,"shift":6,"w":6,"x":50,"y":34,}, + "114":{"character":114,"h":14,"offset":1,"shift":6,"w":5,"x":43,"y":34,}, + "115":{"character":115,"h":14,"offset":0,"shift":6,"w":6,"x":114,"y":34,}, + "116":{"character":116,"h":14,"offset":0,"shift":6,"w":6,"x":35,"y":34,}, + "117":{"character":117,"h":14,"offset":0,"shift":6,"w":6,"x":19,"y":34,}, + "118":{"character":118,"h":14,"offset":0,"shift":6,"w":6,"x":11,"y":34,}, + "119":{"character":119,"h":14,"offset":0,"shift":6,"w":7,"x":2,"y":34,}, + "120":{"character":120,"h":14,"offset":0,"shift":6,"w":6,"x":118,"y":18,}, + "121":{"character":121,"h":14,"offset":0,"shift":6,"w":6,"x":110,"y":18,}, + "122":{"character":122,"h":14,"offset":0,"shift":6,"w":6,"x":102,"y":18,}, + "123":{"character":123,"h":14,"offset":1,"shift":6,"w":4,"x":96,"y":18,}, + "124":{"character":124,"h":14,"offset":2,"shift":6,"w":2,"x":92,"y":18,}, + "125":{"character":125,"h":14,"offset":1,"shift":6,"w":5,"x":85,"y":18,}, + "126":{"character":126,"h":14,"offset":0,"shift":6,"w":7,"x":116,"y":82,}, + "9647":{"character":9647,"h":14,"offset":1,"shift":6,"w":4,"x":2,"y":98,}, + }, + "hinting":0, + "includeTTF":false, + "interpreter":0, + "italic":false, + "kerningPairs":[], + "last":0, + "lineHeight":14, + "maintainGms1Font":false, + "name":"_f_code_s", + "parent":{ + "name":"font", + "path":"folders/font.yy", + }, + "pointRounding":2, + "ranges":[ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap":false, + "resourceType":"GMFont", + "resourceVersion":"2.0", + "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread":8, + "size":8.0, + "styleName":"Light", + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "TTFName":"", + "usesSDF":false, +} \ No newline at end of file diff --git a/fonts/_f_code_s/_f_code_s.png b/fonts/_f_code_s/_f_code_s.png new file mode 100644 index 0000000000000000000000000000000000000000..956f68219abae00877e1018b2780727921afb48f GIT binary patch literal 8534 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 literal 0 HcmV?d00001 diff --git a/fonts/_f_code_s/_f_code_s.yy b/fonts/_f_code_s/_f_code_s.yy new file mode 100644 index 000000000..8789b8aff --- /dev/null +++ b/fonts/_f_code_s/_f_code_s.yy @@ -0,0 +1,143 @@ +{ + "$GMFont":"", + "%Name":"_f_code_s", + "AntiAlias":1, + "applyKerning":0, + "ascender":12, + "ascenderOffset":0, + "bold":false, + "canGenerateBitmap":true, + "charset":0, + "first":0, + "fontName":"Fira Code Medium", + "glyphOperations":0, + "glyphs":{ + "32":{"character":32,"h":16,"offset":0,"shift":7,"w":7,"x":2,"y":2,}, + "33":{"character":33,"h":16,"offset":2,"shift":7,"w":3,"x":65,"y":38,}, + "34":{"character":34,"h":16,"offset":1,"shift":7,"w":5,"x":58,"y":38,}, + "35":{"character":35,"h":16,"offset":0,"shift":7,"w":7,"x":49,"y":38,}, + "36":{"character":36,"h":16,"offset":0,"shift":7,"w":7,"x":40,"y":38,}, + "37":{"character":37,"h":16,"offset":0,"shift":7,"w":8,"x":30,"y":38,}, + "38":{"character":38,"h":16,"offset":0,"shift":7,"w":7,"x":21,"y":38,}, + "39":{"character":39,"h":16,"offset":2,"shift":7,"w":3,"x":16,"y":38,}, + "40":{"character":40,"h":16,"offset":1,"shift":7,"w":5,"x":9,"y":38,}, + "41":{"character":41,"h":16,"offset":1,"shift":7,"w":5,"x":2,"y":38,}, + "42":{"character":42,"h":16,"offset":0,"shift":7,"w":7,"x":70,"y":38,}, + "43":{"character":43,"h":16,"offset":0,"shift":7,"w":7,"x":246,"y":20,}, + "44":{"character":44,"h":16,"offset":2,"shift":7,"w":3,"x":232,"y":20,}, + "45":{"character":45,"h":16,"offset":1,"shift":7,"w":6,"x":224,"y":20,}, + "46":{"character":46,"h":16,"offset":2,"shift":7,"w":3,"x":219,"y":20,}, + "47":{"character":47,"h":16,"offset":0,"shift":7,"w":7,"x":210,"y":20,}, + "48":{"character":48,"h":16,"offset":0,"shift":7,"w":7,"x":201,"y":20,}, + "49":{"character":49,"h":16,"offset":0,"shift":7,"w":7,"x":192,"y":20,}, + "50":{"character":50,"h":16,"offset":0,"shift":7,"w":7,"x":183,"y":20,}, + "51":{"character":51,"h":16,"offset":0,"shift":7,"w":7,"x":174,"y":20,}, + "52":{"character":52,"h":16,"offset":0,"shift":7,"w":7,"x":165,"y":20,}, + "53":{"character":53,"h":16,"offset":0,"shift":7,"w":7,"x":237,"y":20,}, + "54":{"character":54,"h":16,"offset":0,"shift":7,"w":7,"x":79,"y":38,}, + "55":{"character":55,"h":16,"offset":1,"shift":7,"w":6,"x":88,"y":38,}, + "56":{"character":56,"h":16,"offset":0,"shift":7,"w":7,"x":96,"y":38,}, + "57":{"character":57,"h":16,"offset":0,"shift":7,"w":7,"x":21,"y":56,}, + "58":{"character":58,"h":16,"offset":2,"shift":7,"w":3,"x":16,"y":56,}, + "59":{"character":59,"h":16,"offset":2,"shift":7,"w":3,"x":11,"y":56,}, + "60":{"character":60,"h":16,"offset":0,"shift":7,"w":7,"x":2,"y":56,}, + "61":{"character":61,"h":16,"offset":1,"shift":7,"w":6,"x":247,"y":38,}, + "62":{"character":62,"h":16,"offset":0,"shift":7,"w":7,"x":238,"y":38,}, + "63":{"character":63,"h":16,"offset":0,"shift":7,"w":7,"x":229,"y":38,}, + "64":{"character":64,"h":16,"offset":0,"shift":7,"w":8,"x":219,"y":38,}, + "65":{"character":65,"h":16,"offset":0,"shift":7,"w":8,"x":209,"y":38,}, + "66":{"character":66,"h":16,"offset":0,"shift":7,"w":7,"x":200,"y":38,}, + "67":{"character":67,"h":16,"offset":0,"shift":7,"w":7,"x":191,"y":38,}, + "68":{"character":68,"h":16,"offset":0,"shift":7,"w":7,"x":182,"y":38,}, + "69":{"character":69,"h":16,"offset":1,"shift":7,"w":6,"x":174,"y":38,}, + "70":{"character":70,"h":16,"offset":1,"shift":7,"w":6,"x":166,"y":38,}, + "71":{"character":71,"h":16,"offset":0,"shift":7,"w":7,"x":157,"y":38,}, + "72":{"character":72,"h":16,"offset":0,"shift":7,"w":7,"x":148,"y":38,}, + "73":{"character":73,"h":16,"offset":1,"shift":7,"w":6,"x":140,"y":38,}, + "74":{"character":74,"h":16,"offset":0,"shift":7,"w":7,"x":131,"y":38,}, + "75":{"character":75,"h":16,"offset":1,"shift":7,"w":7,"x":122,"y":38,}, + "76":{"character":76,"h":16,"offset":1,"shift":7,"w":6,"x":114,"y":38,}, + "77":{"character":77,"h":16,"offset":0,"shift":7,"w":7,"x":105,"y":38,}, + "78":{"character":78,"h":16,"offset":0,"shift":7,"w":7,"x":156,"y":20,}, + "79":{"character":79,"h":16,"offset":0,"shift":7,"w":7,"x":147,"y":20,}, + "80":{"character":80,"h":16,"offset":1,"shift":7,"w":6,"x":139,"y":20,}, + "81":{"character":81,"h":16,"offset":0,"shift":7,"w":8,"x":192,"y":2,}, + "82":{"character":82,"h":16,"offset":1,"shift":7,"w":7,"x":177,"y":2,}, + "83":{"character":83,"h":16,"offset":0,"shift":7,"w":7,"x":168,"y":2,}, + "84":{"character":84,"h":16,"offset":0,"shift":7,"w":7,"x":159,"y":2,}, + "85":{"character":85,"h":16,"offset":0,"shift":7,"w":7,"x":150,"y":2,}, + "86":{"character":86,"h":16,"offset":0,"shift":7,"w":8,"x":140,"y":2,}, + "87":{"character":87,"h":16,"offset":0,"shift":7,"w":8,"x":130,"y":2,}, + "88":{"character":88,"h":16,"offset":0,"shift":7,"w":7,"x":121,"y":2,}, + "89":{"character":89,"h":16,"offset":0,"shift":7,"w":8,"x":111,"y":2,}, + "90":{"character":90,"h":16,"offset":0,"shift":7,"w":7,"x":102,"y":2,}, + "91":{"character":91,"h":16,"offset":2,"shift":7,"w":4,"x":186,"y":2,}, + "92":{"character":92,"h":16,"offset":0,"shift":7,"w":7,"x":93,"y":2,}, + "93":{"character":93,"h":16,"offset":1,"shift":7,"w":5,"x":78,"y":2,}, + "94":{"character":94,"h":16,"offset":0,"shift":7,"w":7,"x":69,"y":2,}, + "95":{"character":95,"h":16,"offset":0,"shift":7,"w":7,"x":60,"y":2,}, + "96":{"character":96,"h":16,"offset":2,"shift":7,"w":4,"x":54,"y":2,}, + "97":{"character":97,"h":16,"offset":0,"shift":7,"w":7,"x":45,"y":2,}, + "98":{"character":98,"h":16,"offset":1,"shift":7,"w":6,"x":37,"y":2,}, + "99":{"character":99,"h":16,"offset":1,"shift":7,"w":6,"x":29,"y":2,}, + "100":{"character":100,"h":16,"offset":0,"shift":7,"w":7,"x":20,"y":2,}, + "101":{"character":101,"h":16,"offset":0,"shift":7,"w":7,"x":11,"y":2,}, + "102":{"character":102,"h":16,"offset":1,"shift":7,"w":6,"x":85,"y":2,}, + "103":{"character":103,"h":16,"offset":0,"shift":7,"w":7,"x":202,"y":2,}, + "104":{"character":104,"h":16,"offset":1,"shift":7,"w":6,"x":38,"y":20,}, + "105":{"character":105,"h":16,"offset":1,"shift":7,"w":6,"x":211,"y":2,}, + "106":{"character":106,"h":16,"offset":1,"shift":7,"w":5,"x":123,"y":20,}, + "107":{"character":107,"h":16,"offset":1,"shift":7,"w":6,"x":115,"y":20,}, + "108":{"character":108,"h":16,"offset":0,"shift":7,"w":7,"x":106,"y":20,}, + "109":{"character":109,"h":16,"offset":0,"shift":7,"w":7,"x":97,"y":20,}, + "110":{"character":110,"h":16,"offset":1,"shift":7,"w":6,"x":89,"y":20,}, + "111":{"character":111,"h":16,"offset":0,"shift":7,"w":7,"x":80,"y":20,}, + "112":{"character":112,"h":16,"offset":1,"shift":7,"w":6,"x":72,"y":20,}, + "113":{"character":113,"h":16,"offset":0,"shift":7,"w":7,"x":63,"y":20,}, + "114":{"character":114,"h":16,"offset":1,"shift":7,"w":6,"x":55,"y":20,}, + "115":{"character":115,"h":16,"offset":0,"shift":7,"w":7,"x":130,"y":20,}, + "116":{"character":116,"h":16,"offset":0,"shift":7,"w":7,"x":46,"y":20,}, + "117":{"character":117,"h":16,"offset":1,"shift":7,"w":6,"x":30,"y":20,}, + "118":{"character":118,"h":16,"offset":0,"shift":7,"w":7,"x":21,"y":20,}, + "119":{"character":119,"h":16,"offset":0,"shift":7,"w":8,"x":11,"y":20,}, + "120":{"character":120,"h":16,"offset":0,"shift":7,"w":7,"x":2,"y":20,}, + "121":{"character":121,"h":16,"offset":0,"shift":7,"w":7,"x":246,"y":2,}, + "122":{"character":122,"h":16,"offset":1,"shift":7,"w":6,"x":238,"y":2,}, + "123":{"character":123,"h":16,"offset":1,"shift":7,"w":5,"x":231,"y":2,}, + "124":{"character":124,"h":16,"offset":2,"shift":7,"w":3,"x":226,"y":2,}, + "125":{"character":125,"h":16,"offset":1,"shift":7,"w":5,"x":219,"y":2,}, + "126":{"character":126,"h":16,"offset":0,"shift":7,"w":7,"x":30,"y":56,}, + "9647":{"character":9647,"h":16,"offset":1,"shift":7,"w":5,"x":39,"y":56,}, + }, + "hinting":0, + "includeTTF":false, + "interpreter":0, + "italic":false, + "kerningPairs":[], + "last":0, + "lineHeight":16, + "maintainGms1Font":false, + "name":"_f_code_s", + "parent":{ + "name":"font", + "path":"folders/font.yy", + }, + "pointRounding":2, + "ranges":[ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap":false, + "resourceType":"GMFont", + "resourceVersion":"2.0", + "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread":8, + "size":9.0, + "styleName":"Light", + "textureGroupId":{ + "name":"Default", + "path":"texturegroups/Default", + }, + "TTFName":"", + "usesSDF":false, +} \ No newline at end of file diff --git a/objects/_p_dialog/Create_0.gml b/objects/_p_dialog/Create_0.gml index 0b99cc293..573b9a3b5 100644 --- a/objects/_p_dialog/Create_0.gml +++ b/objects/_p_dialog/Create_0.gml @@ -19,7 +19,7 @@ dialog_y = 0; title_height = 64; - padding = 24; + padding = 20; children = []; parent = noone; @@ -172,7 +172,7 @@ } function onFocusBegin() {} - function onFocusEnd() {} + function onFocusEnd() {} function resetPosition() { if(!active) return; diff --git a/objects/o_dialog_preference/Create_0.gml b/objects/o_dialog_preference/Create_0.gml index 9052bb8e1..bb1b6dc0b 100644 --- a/objects/o_dialog_preference/Create_0.gml +++ b/objects/o_dialog_preference/Create_0.gml @@ -148,7 +148,7 @@ event_inherited(); ds_list_add(pref_global, __txt("Save/Load")); - ds_list_add(pref_appr, new __Panel_Linear_Setting_Item_Preference( + ds_list_add(pref_global, new __Panel_Linear_Setting_Item_Preference( __txtx("pref_auto_save_time", "Autosave delay (-1 to disable)"), "auto_save_time", new textBox(TEXTBOX_INPUT.number, function(val) /*=>*/ { PREFERENCES.auto_save_time = val; PREF_SAVE(); }) diff --git a/objects/o_dialog_preset/Create_0.gml b/objects/o_dialog_preset/Create_0.gml index 3e03a9109..db18e1657 100644 --- a/objects/o_dialog_preset/Create_0.gml +++ b/objects/o_dialog_preset/Create_0.gml @@ -9,12 +9,26 @@ event_inherited(); destroy_on_click_out = true; anchor = ANCHOR.left | ANCHOR.top; + + adding = false; + add_txt = ""; + tb_add = new textBox(TEXTBOX_INPUT.text, function(txt) /*=>*/ { add_txt = txt; newPresetFromNode(txt); adding = false; }); #endregion #region content sc_presets = new scrollPane(dialog_w - ui(padding + padding), dialog_h - ui(title_height + padding), function(_y, _m) { draw_clear_alpha(COLORS.panel_bg_clear, 0); - if(node == noone) return 0; + + var _h = 0; + if(node == noone) return _h; + + if(adding) { + tb_add.setFocusHover(sc_presets.active, sc_presets.hover); + var _wh = tb_add.draw(0, _y, sc_presets.surface_w, TEXTBOX_HEIGHT, add_txt); + + _h += _wh + ui(4); + _y += _wh + ui(4); + } var folder = instanceof(node); if(!ds_map_exists(global.PRESETS_MAP, folder)) return 0; @@ -22,14 +36,15 @@ event_inherited(); var pres = global.PRESETS_MAP[? folder]; var amo = array_length(pres); var hh = line_get_height() + ui(8); - var _h = amo * (hh + ui(4)) + ui(32); + _h += amo * (hh + ui(4)) + ui(32); for( var i = 0; i < amo; i++ ) { var preset = pres[i]; var _yy = _y + (hh + ui(4)) * i; if(sHOVER && sc_presets.hover && point_in_rectangle(_m[0], _m[1], 0, _yy, sc_presets.w, _yy + hh)) { - draw_sprite_stretched(THEME.node_bg, 0, 0, _yy, sc_presets.w - ui(12), hh); + draw_sprite_stretched_ext(THEME.ui_panel_bg, 0, 0, _yy, sc_presets.w - ui(12), hh, COLORS._main_icon, 0.85); + if(mouse_click(mb_left, sFOCUS)) { node.deserialize(preset.content, true, true); instance_destroy(); @@ -47,11 +62,11 @@ event_inherited(); } draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); - draw_text(ui(8), _yy + hh / 2, preset.name); + draw_text_add(ui(8), _yy + hh / 2, preset.name); } return _h; - }) + }); #endregion #region new preset diff --git a/objects/o_dialog_preset/Draw_64.gml b/objects/o_dialog_preset/Draw_64.gml index 34c9c24d5..963b42c70 100644 --- a/objects/o_dialog_preset/Draw_64.gml +++ b/objects/o_dialog_preset/Draw_64.gml @@ -24,7 +24,7 @@ if !ready exit; var by = dialog_y + ui(16); if(buttonInstant(THEME.button_hide, bx, by, ui(32), ui(32), mouse_ui, sFOCUS, sHOVER, __txtx("preset_new", "New preset"), THEME.add, 1) == 2) { - var dia = dialogCall(o_dialog_file_name, mouse_mx + ui(8), mouse_my + ui(8)); - dia.onModify = newPresetFromNode; + adding = !adding; + if(adding) tb_add.activate(); } #endregion \ No newline at end of file diff --git a/objects/o_dialog_preset/o_dialog_preset.yy b/objects/o_dialog_preset/o_dialog_preset.yy index 1fce54bad..ed5affd7e 100644 --- a/objects/o_dialog_preset/o_dialog_preset.yy +++ b/objects/o_dialog_preset/o_dialog_preset.yy @@ -2,8 +2,8 @@ "$GMObject":"", "%Name":"o_dialog_preset", "eventList":[ - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"o_dialog_preset", diff --git a/scripts/dialog_management/dialog_management.gml b/scripts/dialog_management/dialog_management.gml index e2106f49a..b15ba03f0 100644 --- a/scripts/dialog_management/dialog_management.gml +++ b/scripts/dialog_management/dialog_management.gml @@ -1,4 +1,4 @@ -function dialogCall(_dia, _x = noone, _y = noone, param = {}, create = false) { #region +function dialogCall(_dia, _x = noone, _y = noone, param = {}, create = false) { if(_x == noone) _x = WIN_SW / 2; if(_y == noone) _y = WIN_SH / 2; @@ -16,9 +16,9 @@ function dialogCall(_dia, _x = noone, _y = noone, param = {}, create = false) { setFocus(dia.id, "Dialog"); return dia; -} #endregion +} -function dialogPanelCall(_panel, _x = noone, _y = noone, params = {}) { #region +function dialogPanelCall(_panel, _x = noone, _y = noone, params = {}) { if(_x == noone) _x = WIN_SW / 2; if(_y == noone) _y = WIN_SH / 2; @@ -30,14 +30,15 @@ function dialogPanelCall(_panel, _x = noone, _y = noone, params = {}) { #region dia.y = _y; dia.xstart = _x; dia.ystart = _y; + dia.anchor = _panel.anchor; dia.resetPosition(); if(struct_try_get(params, "focus", true)) setFocus(dia.id, "Dialog"); return dia; -} #endregion +} -function colorSelectorCall(defColor, onApply) { #region +function colorSelectorCall(defColor, onApply) { var dialog = dialogCall(o_dialog_color_selector); dialog.setDefault(defColor); @@ -45,4 +46,4 @@ function colorSelectorCall(defColor, onApply) { #region dialog.onApply = onApply; return dialog; -} #endregion \ No newline at end of file +} \ No newline at end of file diff --git a/scripts/node_hlsl/node_hlsl.gml b/scripts/node_hlsl/node_hlsl.gml index e16995930..d49a25910 100644 --- a/scripts/node_hlsl/node_hlsl.gml +++ b/scripts/node_hlsl/node_hlsl.gml @@ -91,11 +91,11 @@ void main(in VertexShaderOutput _input, out PixelShaderOutput output) { fs_preString = _fs_preString; fs_postString = "}"; - preLabel = new Inspector_Label(fs_preString); + preLabel = new Inspector_Label(fs_preString, _f_code_s); input_display_list = [ 2, - ["Vertex Shader [read only]", true], new Inspector_Label(vs_string), - ["Shader", false], preLabel, 1, new Inspector_Label(fs_postString), + ["Vertex Shader [read only]", true], new Inspector_Label(vs_string, _f_code_s), + ["Shader", false], preLabel, 1, new Inspector_Label(fs_postString, _f_code_s), ["Arguments", false], argument_renderer, ["Values", true], ]; @@ -241,7 +241,7 @@ void main(in VertexShaderOutput _input, out PixelShaderOutput output) { var vs = vs_string; file_text_write_all(_dir + "vout.shader", vs); - var fs_param = "cbuffer Data : register(b10) {"; + var fs_param = "cbuffer Data : register(b10) {\n"; var fs_sample = ""; var sampler_slot = 1; @@ -252,20 +252,20 @@ void main(in VertexShaderOutput _input, out PixelShaderOutput output) { var _arg_type = getInputData(i + 1); switch(_arg_type) { - case 0 : fs_param += $"float {_arg_name};\n"; break; // u_float - case 1 : fs_param += $"int {_arg_name};\n"; break; // u_int - case 2 : fs_param += $"float2 {_arg_name};\n"; break; // u_vec2 - case 3 : fs_param += $"float3 {_arg_name};\n"; break; // u_vec3 - case 4 : fs_param += $"float4 {_arg_name};\n"; break; // u_vec4 - case 5 : fs_param += $"float3x3 {_arg_name};\n"; break; // u_mat3 - case 6 : fs_param += $"float4x4 {_arg_name};\n"; break; // u_mat4 - case 7 : // u_sampler2D + case 0 : fs_param += $" float {_arg_name};\n"; break; // u_float + case 1 : fs_param += $" int {_arg_name};\n"; break; // u_int + case 2 : fs_param += $" float2 {_arg_name};\n"; break; // u_vec2 + case 3 : fs_param += $" float3 {_arg_name};\n"; break; // u_vec3 + case 4 : fs_param += $" float4 {_arg_name};\n"; break; // u_vec4 + case 5 : fs_param += $" float3x3 {_arg_name};\n"; break; // u_mat3 + case 6 : fs_param += $" float4x4 {_arg_name};\n"; break; // u_mat4 + case 7 : // u_sampler2D fs_sample += $"Texture2D {_arg_name}Object : register(t{sampler_slot});\n"; fs_sample += $"SamplerState {_arg_name} : register(s{sampler_slot});\n"; sampler_slot++; break; - case 8 : fs_param += $"float4 {_arg_name};\n"; break; // u_vec4 + case 8 : fs_param += $" float4 {_arg_name};\n"; break; // u_vec4 color } } @@ -333,44 +333,47 @@ void main(in VertexShaderOutput _input, out PixelShaderOutput output) { var _uni = shader_get_uniform(shader.fs, _arg_name); switch(_arg_type) { - case 1 : - d3d11_cbuffer_add_int(1); - _cbSize++; - - buffer_write(_buffer, buffer_s32, _arg_valu); - break; - case 0 : + case 0 : // u_float d3d11_cbuffer_add_float(1); _cbSize++; buffer_write(_buffer, buffer_f32, _arg_valu); break; - case 2 : - case 3 : - case 4 : - case 5 : - case 6 : + case 1 : // u_int + d3d11_cbuffer_add_int(1); + _cbSize++; + + buffer_write(_buffer, buffer_s32, _arg_valu); + break; + + case 2 : // u_vec2 + case 3 : // u_vec3 + case 4 : // u_vec4 + case 5 : // u_mat3 + case 6 : // u_mat4 if(is_array(_arg_valu)) { d3d11_cbuffer_add_float(array_length(_arg_valu)); _cbSize += array_length(_arg_valu); for( var j = 0, m = array_length(_arg_valu); j < m; j++ ) - buffer_write(_buffer, buffer_f32, _arg_valu[j]); + buffer_write(_buffer, buffer_f32, _arg_valu[j]); } break; - case 8 : - var _clr = colToVec4(_arg_valu); - d3d11_cbuffer_add_float(4); - _cbSize += 4; - - for( var j = 0, m = 4; j < m; j++ ) - buffer_write(_buffer, buffer_f32, _clr[i]); - break; - case 7 : + + case 7 : // u_sampler2D if(is_surface(_arg_valu)) d3d11_texture_set_stage_ps(sampler_slot, surface_get_texture(_arg_valu)); sampler_slot++; break; + + case 8 : // u_vec4 color + var _clr = colToVec4(_arg_valu); + d3d11_cbuffer_add_float(4); + _cbSize += 4; + + for( var j = 0; j < 4; j++ ) + buffer_write(_buffer, buffer_f32, _clr[j]); + break; } } diff --git a/scripts/panel_data/panel_data.gml b/scripts/panel_data/panel_data.gml index 1912f6b0b..06107ad95 100644 --- a/scripts/panel_data/panel_data.gml +++ b/scripts/panel_data/panel_data.gml @@ -881,6 +881,7 @@ function PanelContent() constructor { expandable = true; resizable = true; + anchor = ANCHOR.none; auto_pin = false; panel = noone; diff --git a/scripts/panel_function/panel_function.gml b/scripts/panel_function/panel_function.gml index f7367e329..4c9e173f0 100644 --- a/scripts/panel_function/panel_function.gml +++ b/scripts/panel_function/panel_function.gml @@ -21,7 +21,7 @@ collection } - #macro PANEL_PADDING padding = in_dialog? ui(24) : ui(16); \ + #macro PANEL_PADDING padding = in_dialog? ui(20) : ui(16); \ title_height = in_dialog? ui(64) : ui(56); #macro PANEL_TITLE draw_set_text(f_p0, fa_left, fa_center, COLORS._main_text); \ diff --git a/scripts/panel_globalvar/panel_globalvar.gml b/scripts/panel_globalvar/panel_globalvar.gml index 9a4025744..1be1680e4 100644 --- a/scripts/panel_globalvar/panel_globalvar.gml +++ b/scripts/panel_globalvar/panel_globalvar.gml @@ -1,10 +1,10 @@ function Panel_Globalvar() : PanelContent() constructor { - title = __txtx("panel_globalvar", "Global Variables"); + title = __txtx("panel_globalvar", "Global Variables"); context_str = "Globalvar"; showHeader = false; title_height = 64; - padding = 24; + padding = 20; w = ui(320); h = ui(480); diff --git a/scripts/panel_gradient/panel_gradient.gml b/scripts/panel_gradient/panel_gradient.gml index ff4c42bc3..f68653162 100644 --- a/scripts/panel_gradient/panel_gradient.gml +++ b/scripts/panel_gradient/panel_gradient.gml @@ -2,7 +2,7 @@ function Panel_Gradient() : PanelContent() constructor { title = __txt("Gradients"); showHeader = false; title_height = 64; - padding = 24; + padding = 20; w = ui(320); h = ui(480); diff --git a/scripts/panel_inspector/panel_inspector.gml b/scripts/panel_inspector/panel_inspector.gml index 05690a6cd..7a650f84c 100644 --- a/scripts/panel_inspector/panel_inspector.gml +++ b/scripts/panel_inspector/panel_inspector.gml @@ -661,7 +661,7 @@ function Panel_Inspector() : PanelContent() constructor { draw_set_text(jun_disp.font, fa_left, fa_top, COLORS._main_text_sub); var _sh = string_height_ext(_txt, -1, con_w - ui(16)) + ui(16); draw_sprite_stretched_ext(THEME.ui_panel_bg, 1, 0, yy, con_w, _sh, COLORS._main_icon_light); - draw_text_ext(ui(8), yy + ui(8), _txt, -1, con_w - ui(16)); + draw_text_ext_add(ui(8), yy + ui(8), _txt, -1, con_w - ui(16)); hh += _sh + ui(8); continue; @@ -1001,7 +1001,7 @@ function Panel_Inspector() : PanelContent() constructor { locked = !locked; if(buttonInstant(THEME.button_hide, bx, by, ui(32), ui(32), [mx, my], pFOCUS, pHOVER, __txt("Presets"), THEME.preset, 1) == 2) - dialogCall(o_dialog_preset, x + bx, y + by + ui(36), { "node": inspecting }); + dialogPanelCall(new Panel_Presets(inspecting), x + bx, y + by + ui(36)); } else { draw_sprite_ui_uniform(THEME.preset, 1, bx + ui(32) / 2, by + ui(32) / 2, 1, COLORS._main_icon_dark); } diff --git a/scripts/panel_nodes/panel_nodes.gml b/scripts/panel_nodes/panel_nodes.gml index 6649ff4ae..c7be53052 100644 --- a/scripts/panel_nodes/panel_nodes.gml +++ b/scripts/panel_nodes/panel_nodes.gml @@ -7,7 +7,7 @@ function Panel_Nodes() : PanelContent() constructor { h = ui(480); title_height = 64; - padding = 24; + padding = 20; search_string = ""; diff --git a/scripts/panel_notification/panel_notification.gml b/scripts/panel_notification/panel_notification.gml index 1637527c3..45f049324 100644 --- a/scripts/panel_notification/panel_notification.gml +++ b/scripts/panel_notification/panel_notification.gml @@ -4,7 +4,7 @@ function Panel_Notification() : PanelContent() constructor { h = ui(480); title_height = 64; - padding = 24; + padding = 20; current_page = 0; filter = NOTI_TYPE.log | NOTI_TYPE.warning | NOTI_TYPE.error; diff --git a/scripts/panel_presets/panel_presets.gml b/scripts/panel_presets/panel_presets.gml new file mode 100644 index 000000000..1be420bba --- /dev/null +++ b/scripts/panel_presets/panel_presets.gml @@ -0,0 +1,129 @@ +function Panel_Presets(_node) : PanelContent() constructor { + title = __txt("Presets"); + padding = 8; + + w = ui(240); + h = ui(400); + anchor = ANCHOR.left | ANCHOR.top; + + node = _node; + adding = false; + add_txt = ""; + tb_add = new textBox(TEXTBOX_INPUT.text, function(txt) /*=>*/ { add_txt = txt; newPresetFromNode(txt); adding = false; }); + + selecting_preset = noone; + + context_menu_item_add = menuItem(__txt("New preset"), function() { if(!adding) tb_add.activate(); adding = true; }); + context_menu_empty = [ context_menu_item_add ]; + + context_menu = [ + context_menu_item_add, + menuItem(__txt("Delete"), function() { file_delete(selecting_preset.path); __initPresets(); }, THEME.cross), + ]; + + function newPresetFromNode(name) { + if(node == noone) return; + var dir = $"{DIRECTORY}Presets/{instanceof(node)}/"; + directory_verify(dir); + + var pth = dir + name + ".json"; + var map = node.serialize(true, true); + json_save_struct(pth, map); + __initPresets(); + + adding = false; + } + + function onResize() { + sc_presets.resize(w - ui(padding + padding), h - ui(padding + padding)); + } + + sc_presets = new scrollPane(w - ui(padding + padding), h - ui(padding + padding), function(_y, _m) { + draw_clear_alpha(COLORS.panel_bg_clear, 0); + + var _ww = sc_presets.surface_w; + var _h = 0; + if(node == noone) return _h; + + if(adding) { + tb_add.setFocusHover(sc_presets.active, sc_presets.hover); + var _wh = tb_add.draw(0, _y, _ww, TEXTBOX_HEIGHT, add_txt); + + _h += _wh + ui(4); + _y += _wh + ui(4); + + } else { + var _add_h = ui(24); + var _hov = pHOVER && point_in_rectangle(_m[0], _m[1], 0, _y, _ww, _y + _add_h); + + draw_sprite_stretched_ext(THEME.timeline_node, 0, 0, _y, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .3 + _hov * .1); + draw_sprite_stretched_ext(THEME.timeline_node, 1, 0, _y, _ww, _add_h, _hov? COLORS._main_value_positive : COLORS._main_icon, .6 + _hov * .25); + draw_set_text(f_p2, fa_center, fa_center, _hov? COLORS._main_value_positive : COLORS._main_icon); + draw_text_add(_ww / 2, _y + _add_h / 2, __txt("New preset")); + + if(_hov && mouse_press(mb_left, pFOCUS)) { + if(!adding) tb_add.activate(); + adding = true; + } + + _h += _add_h + ui(4); + _y += _add_h + ui(4); + + } + + var folder = instanceof(node); + if(!ds_map_exists(global.PRESETS_MAP, folder)) return 0; + + draw_set_text(f_p1, fa_left, fa_center, COLORS._main_text); + + var _hov = false; + var pres = global.PRESETS_MAP[? folder]; + var amo = array_length(pres); + var _hh = line_get_height() + ui(10); + _h += amo * (_hh + ui(4)) + ui(32); + + for( var i = 0; i < amo; i++ ) { + var preset = pres[i]; + var _yy = _y + (_hh + ui(3)) * i; + + draw_sprite_stretched(THEME.ui_panel_bg, 3, 0, _yy, _ww, _hh); + + if(pHOVER && sc_presets.hover && point_in_rectangle(_m[0], _m[1], 0, _yy, _ww, _yy + _hh)) { + draw_sprite_stretched_ext(THEME.node_active, 1, 0, _yy, _ww, _hh, COLORS._main_accent, 1); + _hov = true; + + if(mouse_press(mb_left, pFOCUS)) { + node.deserialize(preset.content, true, true); + if(in_dialog && panel.destroy_on_click_out) close(); + } + + if(mouse_press(mb_right, pFOCUS)) { + selecting_preset = preset; + dia = menuCall("preset_window_menu",,, context_menu); + } + } + + draw_set_text(f_p1, fa_left, fa_center, COLORS._main_text); + draw_text_add(ui(8), _yy + _hh / 2, preset.name); + } + + if(pHOVER && !_hov && mouse_press(mb_right)) dia = menuCall("preset_window_menu",,, context_menu_empty); + + return _h; + }); + + function drawContent(panel) { + draw_clear_alpha(COLORS.panel_bg_clear, 0); + + var px = ui(padding); + var py = ui(padding); + var pw = w - ui(padding + padding); + var ph = h - ui(padding + padding); + + draw_sprite_stretched(THEME.ui_panel_bg, 1, px - ui(8), py - ui(8), pw + ui(16), ph + ui(16)); + + sc_presets.setFocusHover(pFOCUS, pHOVER); + sc_presets.draw(px, py, mx - px, my - py); + + } +} \ No newline at end of file diff --git a/scripts/panel_presets/panel_presets.yy b/scripts/panel_presets/panel_presets.yy new file mode 100644 index 000000000..4f562bb77 --- /dev/null +++ b/scripts/panel_presets/panel_presets.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"", + "%Name":"panel_presets", + "isCompatibility":false, + "isDnD":false, + "name":"panel_presets", + "parent":{ + "name":"inspectors", + "path":"folders/panels/inspectors.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/panel_tunnels/panel_tunnels.gml b/scripts/panel_tunnels/panel_tunnels.gml index d96885e3b..49014eb80 100644 --- a/scripts/panel_tunnels/panel_tunnels.gml +++ b/scripts/panel_tunnels/panel_tunnels.gml @@ -2,7 +2,7 @@ function Panel_Tunnels() : PanelContent() constructor { title = __txt("Tunnels"); showHeader = false; title_height = 64; - padding = 24; + padding = 20; #region data w = ui(320); diff --git a/scripts/textArea/textArea.gml b/scripts/textArea/textArea.gml index a3162e0c5..70cbe66fe 100644 --- a/scripts/textArea/textArea.gml +++ b/scripts/textArea/textArea.gml @@ -920,7 +920,7 @@ function textArea(_input, _onModify) : textInput(_input, _onModify) constructor if(cursor_pos_y != 0 && cursor_pos_x != 0) { draw_set_color(COLORS._main_text_accent); - draw_set_alpha(typing || current_time % (PREFERENCES.caret_blink * 2000) > PREFERENCES.caret_blink * 1000); + draw_set_alpha((typing || current_time % (PREFERENCES.caret_blink * 2000) > PREFERENCES.caret_blink * 1000) * 0.75 + 0.25); draw_line_width(cursor_pos_x, cursor_pos_y, cursor_pos_x, cursor_pos_y + c_h, 2); draw_set_alpha(1); } diff --git a/scripts/textBox/textBox.gml b/scripts/textBox/textBox.gml index ff613c11c..279d37725 100644 --- a/scripts/textBox/textBox.gml +++ b/scripts/textBox/textBox.gml @@ -115,7 +115,7 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor { cursor_select = 0; click_block = 1; - KEYBOARD_STRING = ""; + KEYBOARD_STRING = ""; keyboard_lastkey = -1; if(PEN_USE) keyboard_virtual_show(input == TEXTBOX_INPUT.number? kbv_type_numbers : kbv_type_default, kbv_returnkey_default, kbv_autocapitalize_none, true); @@ -735,7 +735,7 @@ function textBox(_input, _onModify) : textInput(_input, _onModify) constructor { BLEND_NORMAL draw_set_color(COLORS._main_text_accent); - draw_set_alpha(typing || current_time % (PREFERENCES.caret_blink * 2000) > PREFERENCES.caret_blink * 1000); + draw_set_alpha((typing || current_time % (PREFERENCES.caret_blink * 2000) > PREFERENCES.caret_blink * 1000) * 0.75 + 0.25); draw_line_width(cursor_pos, c_y0, cursor_pos, c_y1, 2); draw_set_alpha(1);