From 3e30c496a51a8cde325173e1efa19c8bb3d601d9 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Wed, 26 Feb 2025 15:19:10 +0700 Subject: [PATCH] [AreaBox] Fix converting to padding type swap left and right values. --- datafiles/data/Collections.zip | Bin 457776 -> 464102 bytes scripts/areaBox/areaBox.gml | 6 +++-- scripts/globals/globals.gml | 4 +-- scripts/node_collection/node_collection.gml | 5 ++++ scripts/node_data/node_data.gml | 12 ++------- scripts/node_group_input/node_group_input.gml | 13 +++------- scripts/node_shape/node_shape.gml | 24 +++++++++--------- scripts/node_value/node_value.gml | 1 + scripts/panel_animation/panel_animation.gml | 2 +- 9 files changed, 31 insertions(+), 36 deletions(-) diff --git a/datafiles/data/Collections.zip b/datafiles/data/Collections.zip index f5fab95eb752d9dd74ac9f0ade9c32d1d0cf828e..2432071703c5d8e9588b71f49ea999e5feeb114f 100644 GIT binary patch delta 23524 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 L6iUc#{D1!scs!wr delta 17270 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 diff --git a/scripts/areaBox/areaBox.gml b/scripts/areaBox/areaBox.gml index dd149ca33..5b6e36eca 100644 --- a/scripts/areaBox/areaBox.gml +++ b/scripts/areaBox/areaBox.gml @@ -159,9 +159,9 @@ function areaBox(_onModify, _unit = noone) : widget() constructor { break; case AREA_MODE.padding : - onModify(x0, 0); + onModify(ss[0] - x1, 0); onModify(y0, 1); - onModify(ss[0] - x1, 2); + onModify(x0, 2); onModify(ss[1] - y1, 3); break; @@ -232,6 +232,7 @@ function areaBox(_onModify, _unit = noone) : widget() constructor { onModify(cnvt? 0.5 : ss[0] / 2, 2); onModify(cnvt? 0.5 : ss[1] / 2, 3); break; + case AREA_MODE.padding : var ss = onSurfaceSize(); onModify(0, 0); @@ -239,6 +240,7 @@ function areaBox(_onModify, _unit = noone) : widget() constructor { onModify(0, 2); onModify(0, 3); break; + case AREA_MODE.two_point : var ss = onSurfaceSize(); onModify(0, 0); diff --git a/scripts/globals/globals.gml b/scripts/globals/globals.gml index c346a66f3..21184d412 100644 --- a/scripts/globals/globals.gml +++ b/scripts/globals/globals.gml @@ -43,8 +43,8 @@ LATEST_VERSION = 1_18_00_0; VERSION = 1_18_09_0; SAVE_VERSION = 1_18_09_1; - VERSION_STRING = MAC? "1.18.003m" : "1.18.9.1.001"; - BUILD_NUMBER = 118091.001; + VERSION_STRING = MAC? "1.18.003m" : "1.18.10.001"; + BUILD_NUMBER = 118101.001; PREF_VERSION = 1_17_1; var _vsp = string_split(VERSION_STRING, "."); diff --git a/scripts/node_collection/node_collection.gml b/scripts/node_collection/node_collection.gml index 9f4d7ae87..4a067b032 100644 --- a/scripts/node_collection/node_collection.gml +++ b/scripts/node_collection/node_collection.gml @@ -345,6 +345,11 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc if(will_refresh) refreshNodes(); doStepBegin(); + + if(toRefreshNodeDisplay) { + refreshNodeDisplay(); + toRefreshNodeDisplay = false; + } } static step = function() { diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index 510168be9..5cf6c52c0 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -792,7 +792,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { inputDisplayList = []; var iamo = getInputAmount(); - if(iamo && input_display_dynamic != -1) { + if(input_display_dynamic != -1 && iamo) { for(var i = 0; i < array_length(input_display_list_raw); i++) { var ind = input_display_list_raw[i]; @@ -823,7 +823,6 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { } else { var amo = input_display_list == -1? array_length(inputs) : array_length(input_display_list); - // print($"Amo = {amo}"); for(var i = 0; i < amo; i++) { var ind = getInputJunctionIndex(i); @@ -831,21 +830,13 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { var jun = array_safe_get(inputs, ind, noone); if(jun == noone || is_undefined(jun)) continue; - - // print($"{i}: {jun.isVisible()}"); - // print($" {jun.visible_manual}, {jun.visible}, {jun.index}, {jun.visible_in_list}"); - if(!jun.isVisible()) continue; array_push(inputDisplayList, jun); } - - // print($"{inputDisplayList}\n"); } if(auto_input && dummy_input) array_push(inputDisplayList, dummy_input); - - // print(inputDisplayList); } static onValidate = function() { @@ -1467,6 +1458,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { } static refreshNodeDisplay = function() { + updateIO(); setHeight(); getJunctionList(); diff --git a/scripts/node_group_input/node_group_input.gml b/scripts/node_group_input/node_group_input.gml index 2b6b8e7a3..7eb5f00e4 100644 --- a/scripts/node_group_input/node_group_input.gml +++ b/scripts/node_group_input/node_group_input.gml @@ -115,7 +115,7 @@ function Node_Group_Input(_x, _y, _group = noone) : Node(_x, _y, _group) constru newInput(12, nodeValue_Vec2("Gizmo Position", self, [ 0, 0 ])); - newInput(13, nodeValue_Vec2("Gizmo Scale", self, 1)); + newInput(13, nodeValue_Float("Gizmo Scale", self, 1)); inputs[10].setFrom_condition = function(_valueFrom) { if(is_instanceof(_valueFrom.node, Node_Group_Input)) return true; @@ -246,14 +246,7 @@ function Node_Group_Input(_x, _y, _group = noone) : Node(_x, _y, _group) constru case 7 : _vis = _val <= _vto; break; } - var _v = inParent.visible; - if(_v && !_vis) inParent.visible = false; - inParent.show_in_inspector = _vis; - - if(_v != _vis) { - group.setHeight(); - group.getJunctionList(); - } + inParent.setVisible(_vis, _vis); } static onValueUpdate = function(index = 0) { @@ -495,6 +488,8 @@ function Node_Group_Input(_x, _y, _group = noone) : Node(_x, _y, _group) constru __data = noone; static update = function(frame = CURRENT_FRAME) { + visibleCheck(); + if(!is(inParent, NodeValue)) return; outputs[0].setValue(inParent.getValue()); diff --git a/scripts/node_shape/node_shape.gml b/scripts/node_shape/node_shape.gml index f18a16cf7..1f773ff14 100644 --- a/scripts/node_shape/node_shape.gml +++ b/scripts/node_shape/node_shape.gml @@ -205,6 +205,18 @@ function Node_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con } + if(_posMode == 0) { + hv = inputs[3].drawOverlay(_int, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; _int &= !_hov; + + } else if(_posMode == 1) { + _px = _x + _pos[0] * _s; + _py = _y + _pos[1] * _s; + + hv = inputs[16].drawOverlay(_int, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; _int &= !_hov; + hv = inputs[17].drawOverlay(_int, active, _px, _py, _s, _mx, _my, _snx, _sny); _hov |= hv; _int &= !_hov; + + } + if(inputs[9].show_in_inspector && _posMode != 2) { // corner var _px = _x + _pos[0] * _s; var _py = _y + _pos[1] * _s; @@ -234,18 +246,6 @@ function Node_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con hv = inputs[9].drawOverlay(_int, active, _x0, _y0, _s, _mx, _my, _snx, _sny, aa, _max_s, 1); _hov |= hv; _int &= !_hov; } - if(_posMode == 0) { - hv = inputs[3].drawOverlay(_int, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; _int &= !_hov; - - } else if(_posMode == 1) { - _px = _x + _pos[0] * _s; - _py = _y + _pos[1] * _s; - - hv = inputs[16].drawOverlay(_int, active, _x, _y, _s, _mx, _my, _snx, _sny); _hov |= hv; _int &= !_hov; - hv = inputs[17].drawOverlay(_int, active, _px, _py, _s, _mx, _my, _snx, _sny); _hov |= hv; _int &= !_hov; - - } - return _hov; } diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index a62d82416..bbb42b472 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -558,6 +558,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru } if(value_from) return true; + if(!show_in_inspector) return false; if(visible_manual != 0) return visible_manual == 1; if(!visible) return false; if(index == -1) return true; diff --git a/scripts/panel_animation/panel_animation.gml b/scripts/panel_animation/panel_animation.gml index a8da187f4..ae79c6a58 100644 --- a/scripts/panel_animation/panel_animation.gml +++ b/scripts/panel_animation/panel_animation.gml @@ -856,7 +856,7 @@ function Panel_Animation() : PanelContent() constructor { } } - if(pHOVER && point_in_rectangle(mx, my, bar_x, 8, bar_x + bar_w, 8 + 16)) { //top bar + if(pHOVER && point_in_rectangle(mx, my, bar_x, ui(8), bar_x + bar_w, ui(8 + 16))) { //top bar if(mx < bar_int_x && mouse_press(mb_left, pFOCUS) && timeline_draggable) { timeline_scubbing = true; timeline_scub_st = CURRENT_FRAME;