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

- [Graph Panel] Junction array type now always based on raw value.

Browse source
This commit is contained in:
Tanasart 2024-07-27 11:28:23 +07:00
parent 61f69590f9
commit 48b0dda79e
2 changed files with 21 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/node_data/node_data.gml
View file

@ -771,12 +771,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
targ.setFrom(junctionFrom); targ.setFrom(junctionFrom);
} }
static getInputData = function(index, def = 0) { static getInputData = function(index, def = 0) { return array_safe_get_fast(inputs_data, index, def); }
INLINE
var _dat = array_safe_get_fast(inputs_data, index, def);
return _dat;
}
static setInputData = function(index, value) { static setInputData = function(index, value) {
INLINE INLINE
@ -838,6 +833,12 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
} }
} }
for( var i = 0, n = ds_list_size(inputs); i < n; i++ )
inputs[| i].updateColor(getInputData(i));
for( var i = 0, n = ds_list_size(outputs); i < n; i++ )
outputs[| i].updateColor(outputs[| i].getValue());
postUpdate(frame); postUpdate(frame);
cached_manual = false; cached_manual = false;

42
scripts/node_value/node_value.gml
View file

@ -292,7 +292,6 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
type = _type; type = _type;
draw_junction_index = type; draw_junction_index = type;
updateColor();
return true; return true;
} #endregion } #endregion
@ -931,7 +930,6 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
} }
setDropKey(); setDropKey();
updateColor();
} resetDisplay(); #endregion } resetDisplay(); #endregion
/////============ RENDER ============ /////============ RENDER ============
@ -1097,7 +1095,6 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
cache_hit &= unit.reference == noone || unit.mode == VALUE_UNIT.constant; cache_hit &= unit.reference == noone || unit.mode == VALUE_UNIT.constant;
if(cache_hit) { if(cache_hit) {
//global.cache_hit++;
return cache_value[2]; return cache_value[2];
} }
} }
@ -1127,8 +1124,6 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
cache_value[2] = val; cache_value[2] = val;
cache_value[3] = applyUnit; cache_value[3] = applyUnit;
updateColor(val);
return val; return val;
} }
@ -1330,7 +1325,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
return false; return false;
} #endregion } #endregion
static isArray = function(val = undefined) { #region static isArray = function(val = undefined) {
var _cac = val == undefined; var _cac = val == undefined;
if(_cac) { if(_cac) {
@ -1342,7 +1337,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
var _dep = __array_get_depth(val) > array_depth + typeArray(display_type); var _dep = __array_get_depth(val) > array_depth + typeArray(display_type);
if(_cac) cache_array[1] = _dep; if(_cac) cache_array[1] = _dep;
return _dep; return _dep;
} #endregion }
static arrayLength = function(val = undefined) { #region static arrayLength = function(val = undefined) { #region
val ??= getValue(); val ??= getValue();
@ -1615,7 +1610,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
static triggerSetFrom = function() { node.valueUpdate(index); } static triggerSetFrom = function() { node.valueUpdate(index); }
static setFrom = function(_valueFrom, _update = true, checkRecur = true, log = false) { #region ////Set from static setFrom = function(_valueFrom, _update = true, checkRecur = true, log = false) { ////Set from
if(is_dummy && dummy_get != noone) { if(is_dummy && dummy_get != noone) {
var _targ = dummy_get(); var _targ = dummy_get();
@ -1669,9 +1664,9 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
if(_valueFrom.onSetTo != noone) _valueFrom.onSetTo(self); if(_valueFrom.onSetTo != noone) _valueFrom.onSetTo(self);
return true; return true;
} #endregion }
static removeFrom = function(_remove_list = true) { #region static removeFrom = function(_remove_list = true) {
recordAction(ACTION_TYPE.junction_disconnect, self, value_from); recordAction(ACTION_TYPE.junction_disconnect, self, value_from);
if(_remove_list && value_from != noone) if(_remove_list && value_from != noone)
array_remove(value_from.value_to, self); array_remove(value_from.value_to, self);
@ -1684,8 +1679,9 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
PROJECT.modified = true; PROJECT.modified = true;
RENDER_ALL_REORDER RENDER_ALL_REORDER
return false; return false;
} #endregion }
static removeFromLoop = function(_remove_list = true) { #region static removeFromLoop = function(_remove_list = true) { #region
if(value_from_loop != noone) if(value_from_loop != noone)
@ -1729,30 +1725,19 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
/////============= DRAW ============= /////============= DRAW =============
static setColor = function(col) { #region static updateColor = function(val = undefined) {
color = col;
updateColor();
if(value_from != noone)
value_from.setColor(col);
return self;
} #endregion
static updateColor = function(val = undefined) { #region
INLINE INLINE
if(color == -1) { if(color == -1) {
draw_bg = isArray(val)? value_color_bg_array(draw_junction_index) : value_color_bg(draw_junction_index); draw_bg = is_array(val)? value_color_bg_array(draw_junction_index) : value_color_bg(draw_junction_index);
draw_fg = value_color(draw_junction_index); draw_fg = value_color(draw_junction_index);
} else { } else {
draw_bg = isArray(val)? merge_color(color, colorMultiply(color, CDEF.main_dkgrey), 0.5) : value_color_bg(draw_junction_index); draw_bg = is_array(val)? merge_color(color, colorMultiply(color, CDEF.main_dkgrey), 0.5) : value_color_bg(draw_junction_index);
draw_fg = color; draw_fg = color;
} }
color_display = type == VALUE_TYPE.action? #8fde5d : draw_fg; color_display = type == VALUE_TYPE.action? #8fde5d : draw_fg;
} updateColor();
} #endregion
static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region
if(type != VALUE_TYPE.integer && type != VALUE_TYPE.float) return -1; if(type != VALUE_TYPE.integer && type != VALUE_TYPE.float) return -1;
@ -1864,7 +1849,10 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
} }
__draw_sprite_ext(_bgS, draw_junction_index, x, y, _s, _s, 0, _cbg, 1); __draw_sprite_ext(_bgS, draw_junction_index, x, y, _s, _s, 0, _cbg, 1);
gpu_set_blendmode_ext_sepalpha(bm_src_alpha, bm_inv_src_alpha, bm_one, bm_one);
__draw_sprite_ext(_fgS, draw_junction_index, x, y, _s, _s, 0, _cfg, 1); __draw_sprite_ext(_fgS, draw_junction_index, x, y, _s, _s, 0, _cfg, 1);
gpu_set_blendmode(bm_normal);
} }
return is_hover; return is_hover;
@ -2078,8 +2066,6 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
visible = struct_try_get(_map, "visible", visible); visible = struct_try_get(_map, "visible", visible);
color = struct_try_get(_map, "color", -1); color = struct_try_get(_map, "color", -1);
updateColor();
if(connect_type == JUNCTION_CONNECT.output) if(connect_type == JUNCTION_CONNECT.output)
return; return;