mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-12-25 06:26:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix crash on color selector

Browse source
This commit is contained in:
Tanasart 2023-05-05 08:58:56 +02:00
parent 13157605ac
commit 35db049a89
4 changed files with 57 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/buttonColor/buttonColor.gml
View file

@ -19,7 +19,7 @@ function buttonColor(_onApply, dialog = noone) : widget() constructor {
function apply(value) {
if(!interactable) return;
current_value = value();
current_value = value;
triggered = true;
onApply(value);
}

4
scripts/globals/globals.gml
View file

@ -33,11 +33,11 @@
globalvar VERSION, SAVEFILE_VERSION, VERSION_STRING;
globalvar COLLECTION_VERSION, THEME_VERSION;
VERSION = 1143;
VERSION = 1144;
SAVEFILE_VERSION = 1420;
COLLECTION_VERSION = 1140.090;
THEME_VERSION = 1140.090;
VERSION_STRING = "1.14.3.1";
VERSION_STRING = "1.14.4";
globalvar NODES, NODE_MAP, APPEND_MAP, NODE_NAME_MAP;
globalvar HOTKEYS, HOTKEY_CONTEXT, NODE_INSTANCES;

78
scripts/node_path/node_path.gml
View file

@ -153,7 +153,7 @@ function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
} else if(drag_point > -1) {
var dx = value_snap(drag_point_sx + (_mx - drag_point_mx) / _s, _snx);
var dy = value_snap(drag_point_sy + (_my - drag_point_my) / _s, _sny);
if(drag_type < 2) {
var inp = inputs[| input_fix_len + drag_point];
var anc = inp.getValue();
@ -397,8 +397,7 @@ function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
}
}
if(_edited)
UNDO_HOLDING = true;
if(_edited) UNDO_HOLDING = true;
if(mouse_release(mb_left)) {
drag_point = -1;
@ -407,43 +406,45 @@ function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
}
}
var line_hover = -1;
var points = [];
var _a0, _a1;
#region draw control anchor
var line_hover = -1;
var points = [];
var _a0, _a1;
var minx = 99999, miny = 99999;
var maxx = 0 , maxy = 0;
var minx = 99999, miny = 99999;
var maxx = 0 , maxy = 0;
for(var i = loop? 0 : 1; i < ansize; i++) {
if(i) {
_a0 = inputs[| input_fix_len + i - 1].getValue();
_a1 = inputs[| input_fix_len + i].getValue();
} else {
_a0 = inputs[| input_fix_len + ansize - 1].getValue();
_a1 = inputs[| input_fix_len + 0].getValue();
for(var i = loop? 0 : 1; i < ansize; i++) {
if(i) {
_a0 = inputs[| input_fix_len + i - 1].getValue();
_a1 = inputs[| input_fix_len + i].getValue();
} else {
_a0 = inputs[| input_fix_len + ansize - 1].getValue();
_a1 = inputs[| input_fix_len + 0].getValue();
}
var _ox = 0, _oy = 0, _nx = 0, _ny = 0, p = 0, pnt = [];
for(var j = 0; j < sample; j++) {
if(array_length(_a0) < 6) continue;
p = eval_bezier(j / (sample - 1), _a0[0], _a0[1], _a1[0], _a1[1], _a0[0] + _a0[4], _a0[1] + _a0[5], _a1[0] + _a1[2], _a1[1] + _a1[3]);
_nx = _x + p[0] * _s;
_ny = _y + p[1] * _s;
minx = min(minx, _nx); miny = min(miny, _ny);
maxx = max(maxx, _nx); maxy = max(maxy, _ny);
array_push(pnt, [ _nx, _ny ]);
if(j && (key_mod_press(CTRL) || isUsingTool(1)) && distance_to_line(_mx, _my, _ox, _oy, _nx, _ny) < 4)
line_hover = i;
_ox = _nx;
_oy = _ny;
}
array_push(points, pnt);
}
var _ox = 0, _oy = 0, _nx = 0, _ny = 0, p = 0, pnt = [];
for(var j = 0; j < sample; j++) {
if(array_length(_a0) < 6) continue;
p = eval_bezier(j / (sample - 1), _a0[0], _a0[1], _a1[0], _a1[1], _a0[0] + _a0[4], _a0[1] + _a0[5], _a1[0] + _a1[2], _a1[1] + _a1[3]);
_nx = _x + p[0] * _s;
_ny = _y + p[1] * _s;
minx = min(minx, _nx); miny = min(miny, _ny);
maxx = max(maxx, _nx); maxy = max(maxy, _ny);
array_push(pnt, [ _nx, _ny ]);
if(j && (key_mod_press(CTRL) || isUsingTool(1)) && distance_to_line(_mx, _my, _ox, _oy, _nx, _ny) < 4)
line_hover = i;
_ox = _nx;
_oy = _ny;
}
array_push(points, pnt);
}
#endregion
draw_set_color(isUsingTool(0)? c_white : COLORS._main_accent);
var ind = 0;
@ -622,11 +623,12 @@ function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
}
}
}
} else if(key_mod_press(CTRL) || isUsingTool(1)) {
} else if(key_mod_press(CTRL) || isUsingTool(1)) { //anchor edit
draw_sprite_ui_uniform(THEME.cursor_path_add, 0, _mx + 16, _my + 16);
if(mouse_press(mb_left, active)) {
var anc = createAnchor(value_snap((_mx - _x) / _s, _snx), value_snap((_my - _y) / _s, _sny));
UNDO_HOLDING = true;
if(line_hover == -1) {
drag_point = ds_list_size(inputs) - input_fix_len - 1;

27
scripts/string_eval_tree/string_eval_tree.gml
View file

@ -88,27 +88,28 @@
//print("v2 : " + string(v2));
//print("====================");
print($"{string(v1)} {symbol} {string(v2)}");
//print($"{string(v1)} {symbol} {string(v2)}");
switch(symbol) {
case "+": return v1 + v2;
case "-": return v1 - v2;
case "*": return v1 * v2;
case "^": return power(v1, v2);
case "/": return v1 / v2;
case "+": return (is_real(v1) && is_real(v2))? v1 + v2 : 0;
case "-": return (is_real(v1) && is_real(v2))? v1 - v2 : 0;
case "*": return (is_real(v1) && is_real(v2))? v1 * v2 : 0;
case "^": return (is_real(v1) && is_real(v2))? power(v1, v2) : 0;
case "/": return (is_real(v1) && is_real(v2))? v1 / v2 : 0;
case "|":
var val = is_real(v2)? array_safe_get(v1, v2) : ds_map_try_get(v1, v2);
if(is_struct(val) && instanceof(val) == "NodeValue")
val = val.getValue();
return val;
case "sin" : return sin(v1);
case "cos" : return cos(v1);
case "tan" : return tan(v1);
case "abs" : return abs(v1);
case "round" : return round(v1);
case "ceil" : return ceil(v1);
case "floor" : return floor(v1);
case "sin" : return is_real(v1)? sin(v1) : 0;
case "cos" : return is_real(v1)? cos(v1) : 0;
case "tan" : return is_real(v1)? tan(v1) : 0;
case "abs" : return is_real(v1)? abs(v1) : 0;
case "round" : return is_real(v1)? round(v1) : 0;
case "ceil" : return is_real(v1)? ceil(v1) : 0;
case "floor" : return is_real(v1)? floor(v1) : 0;
}
return v1;