mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2025-02-04 01:05:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

p

Browse source
This commit is contained in:
Tanasart 2024-11-14 13:31:57 +07:00
parent f630633daa
commit 0ce3d59290
8 changed files with 39 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
PixelComposer.yyp
View file

@ -785,6 +785,7 @@
{"id":{"name":"o_dialog_output_visibility","path":"objects/o_dialog_output_visibility/o_dialog_output_visibility.yy",},}, {"id":{"name":"o_dialog_output_visibility","path":"objects/o_dialog_output_visibility/o_dialog_output_visibility.yy",},},
{"id":{"name":"o_dialog_palette","path":"objects/o_dialog_palette/o_dialog_palette.yy",},}, {"id":{"name":"o_dialog_palette","path":"objects/o_dialog_palette/o_dialog_palette.yy",},},
{"id":{"name":"o_dialog_panel","path":"objects/o_dialog_panel/o_dialog_panel.yy",},}, {"id":{"name":"o_dialog_panel","path":"objects/o_dialog_panel/o_dialog_panel.yy",},},
{"id":{"name":"o_dialog_patreon","path":"objects/o_dialog_patreon/o_dialog_patreon.yy",},},
{"id":{"name":"o_dialog_preference","path":"objects/o_dialog_preference/o_dialog_preference.yy",},}, {"id":{"name":"o_dialog_preference","path":"objects/o_dialog_preference/o_dialog_preference.yy",},},
{"id":{"name":"o_dialog_preset","path":"objects/o_dialog_preset/o_dialog_preset.yy",},}, {"id":{"name":"o_dialog_preset","path":"objects/o_dialog_preset/o_dialog_preset.yy",},},
{"id":{"name":"o_dialog_release_note","path":"objects/o_dialog_release_note/o_dialog_release_note.yy",},}, {"id":{"name":"o_dialog_release_note","path":"objects/o_dialog_release_note/o_dialog_release_note.yy",},},

9
objects/o_main/Other_2.gml
View file

@ -108,11 +108,20 @@
if(file_exists_empty("icon.png")) if(file_exists_empty("icon.png"))
file_copy("icon.png", DIRECTORY + "icon.png"); file_copy("icon.png", DIRECTORY + "icon.png");
var _prg_path = $"{program_directory}PixelComposer.exe";
// var cmd = ".pxc=\"" + string(program_directory) + "PixelComposer.exe\""; // var cmd = ".pxc=\"" + string(program_directory) + "PixelComposer.exe\"";
// shell_execute_async("assoc", cmd); // shell_execute_async("assoc", cmd);
// var cmd = ".pxcc=\"" + string(program_directory) + "PixelComposer.exe\""; // var cmd = ".pxcc=\"" + string(program_directory) + "PixelComposer.exe\"";
// shell_execute_async("assoc", cmd); // shell_execute_async("assoc", cmd);
// shell_execute_async("reg", "ADD HKCU\\Software\\Classes\\pxc");
// shell_execute_async("reg", "ADD HKCU\\Software\\Classes\\pxc /v \"URL Protocol\" /t REG_SZ");
// shell_execute_async("reg", "ADD HKCU\\Software\\Classes\\pxc\\shell");
// shell_execute_async("reg", "ADD HKCU\\Software\\Classes\\pxc\\shell\\open");
// shell_execute_async("reg", $"DELETE HKCU\\Software\\Classes\\pxc\\shell\\open\\command");
// shell_execute_async("reg", $"ADD HKCU\\Software\\Classes\\pxc\\shell\\open\\command /t REG_SZ /d \"{_prg_path} -m %1\"");
} }
directory_set_current_working(DIRECTORY); directory_set_current_working(DIRECTORY);

2
scripts/globals/globals.gml
View file

@ -42,7 +42,7 @@
LATEST_VERSION = 1_18_00_0; LATEST_VERSION = 1_18_00_0;
VERSION = 1_18_04_0; VERSION = 1_18_04_0;
SAVE_VERSION = 1_18_02_0; SAVE_VERSION = 1_18_02_0;
VERSION_STRING = MAC? "1.18.003m" : "1.18.4.005"; VERSION_STRING = MAC? "1.18.003m" : "1.18.4.006";
BUILD_NUMBER = 1_18_03_1; BUILD_NUMBER = 1_18_03_1;
HOTKEYS = ds_map_create(); HOTKEYS = ds_map_create();

9
scripts/node_armature_bind/node_armature_bind.gml
View file

@ -311,9 +311,12 @@ function Node_Armature_Bind(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr
_tx += 22; _tx += 22;
} }
draw_set_text(f_p2, fa_left, fa_center, tc); var _nam = inputs[_inp].name;
draw_set_alpha(aa); if(inputs[_inp].value_from != noone)
draw_text_add(_tx, _ty, inputs[_inp].name); _nam = inputs[_inp].value_from.node.getDisplayName();
draw_set_text(f_p2, fa_left, fa_center, tc, aa);
draw_text_add(_tx, _ty, _nam);
draw_set_alpha(1); draw_set_alpha(1);
if(_hover && point_in_rectangle(_m[0], _m[1], _x, _cy, _x + _w, _cy + lh)) { if(_hover && point_in_rectangle(_m[0], _m[1], _x, _cy, _x + _w, _cy + lh)) {

25
scripts/node_websocket_receiver/node_websocket_receiver.gml
View file

@ -25,7 +25,7 @@ function Node_Websocket_Receiver(_x, _y, _group = noone) : Node(_x, _y, _group)
socket = noone; socket = noone;
client = noone; client = noone;
function setPort() { #region function setPort() {
var _port = getInputData(0); var _port = getInputData(0);
var _mode = getInputData(2); var _mode = getInputData(2);
@ -55,11 +55,11 @@ function Node_Websocket_Receiver(_x, _y, _group = noone) : Node(_x, _y, _group)
socket = network_create_server_raw(network_socket_ws, port, 16); socket = network_create_server_raw(network_socket_ws, port, 16);
if(socket) NETWORK_SERVERS[? port] = socket; if(socket) NETWORK_SERVERS[? port] = socket;
} }
} #endregion }
setInspector(1, __txt("Refresh Server"), [ THEME.refresh_icon, 1, COLORS._main_value_positive ], function() { setPort(); }); setInspector(1, __txt("Refresh Server"), [ THEME.refresh_icon, 1, COLORS._main_value_positive ], function() { setPort(); });
static asyncPackets = function(_async_load) { #region static asyncPackets = function(_async_load) {
if(!active) return; if(!active) return;
var _active = getInputData(1); var _active = getInputData(1);
@ -95,9 +95,9 @@ function Node_Websocket_Receiver(_x, _y, _group = noone) : Node(_x, _y, _group)
network_trigger = true; network_trigger = true;
break; break;
} }
} #endregion }
static step = function() { #region static step = function() {
var _mode = getInputData(2); var _mode = getInputData(2);
inputs[3].setVisible(_mode == 0); inputs[3].setVisible(_mode == 0);
@ -109,14 +109,14 @@ function Node_Websocket_Receiver(_x, _y, _group = noone) : Node(_x, _y, _group)
outputs[1].setValue(0); outputs[1].setValue(0);
network_trigger = 0; network_trigger = 0;
} }
} #endregion }
static update = function(frame = CURRENT_FRAME) { #region static update = function(frame = CURRENT_FRAME) {
if(CLONING) return; if(CLONING) return;
setPort(); setPort();
} #endregion }
static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { #region static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) {
var _active = getInputData(1); var _active = getInputData(1);
var bbox = drawGetBbox(xx, yy, _s); var bbox = drawGetBbox(xx, yy, _s);
var network = ds_map_try_get(NETWORK_SERVERS, port, noone); var network = ds_map_try_get(NETWORK_SERVERS, port, noone);
@ -129,13 +129,14 @@ function Node_Websocket_Receiver(_x, _y, _group = noone) : Node(_x, _y, _group)
var _y1 = bbox.y1 - ui(16); var _y1 = bbox.y1 - ui(16);
var _ts = _s * 0.75; var _ts = _s * 0.75;
draw_set_text(f_code, fa_center, fa_top, COLORS._main_text); draw_set_text(f_code, fa_center, fa_top, COLORS._main_text, 0.75);
draw_set_alpha(0.75);
draw_text_add(bbox.xc, bbox.y0, $"Port {port}", _ts); draw_text_add(bbox.xc, bbox.y0, $"Port {port}", _ts);
draw_set_valign(fa_bottom) draw_set_valign(fa_bottom)
draw_text_add(bbox.xc, bbox.y1, $"{connected_device} " + __txt("Connected"), _ts); draw_text_add(bbox.xc, bbox.y1, $"{connected_device} " + __txt("Connected"), _ts);
draw_set_alpha(1); draw_set_alpha(1);
draw_sprite_fit(THEME.node_websocket_receive, 0, bbox.xc, (_y0 + _y1) / 2, bbox.w, _y1 - _y0, cc, aa); draw_sprite_fit(THEME.node_websocket_receive, 0, bbox.xc, (_y0 + _y1) / 2, bbox.w, _y1 - _y0, cc, aa);
} #endregion }
} }

2
scripts/panel_menu/panel_menu.gml
View file

@ -147,7 +147,7 @@ function Panel_Menu() : PanelContent() constructor {
zip_unzip("data/Assets.zip", DIRECTORY + "Assets"); zip_unzip("data/Assets.zip", DIRECTORY + "Assets");
}), }),
-1, -1,
menuItem(__txtx("panel_menu_connect_patreon", "Connect to Patreon"), function() { dialogPanelCall(new Panel_Patreon()); }, THEME.patreon), menuItem(__txtx("panel_menu_connect_patreon", "Connect to Patreon"), function() { dialogCall(o_dialog_patreon); /*dialogPanelCall(new Panel_Patreon());*/ }, THEME.patreon),
]; ];
menuItem_undo = MENU_ITEMS.undo; menuItem_undo = MENU_ITEMS.undo;

1
scripts/panel_patreon/panel_patreon.gml
View file

@ -166,3 +166,4 @@ function Panel_Patreon() : PanelContent() constructor {
draw_text(w / 2, _yy, result); draw_text(w / 2, _yy, result);
} }
} }

11
scripts/patreon_email_check/patreon_email_check.gml
View file

@ -24,13 +24,12 @@ function __initPatreon() {
if(!file_exists_empty(_path)) return; if(!file_exists_empty(_path)) return;
var _map = ds_map_secure_load(_path); // var _map = ds_map_secure_load(_path);
// var _mail = ds_map_try_get(_map, "mail", "");
// if(_mail == "") return;
var _mail = ds_map_try_get(_map, "mail", ""); // var _code = _map[? "code"];
if(_mail == "") return; // var _keyTarget = patreon_generate_activation_key(_mail);
var _code = _map[? "code"];
var _keyTarget = patreon_generate_activation_key(_mail);
IS_PATREON = _code == _keyTarget; IS_PATREON = _code == _keyTarget;
} }