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

[Inspector Panel] Fix error when modifying io using custom inspector.

Browse source
This commit is contained in:
Tanasart 2024-09-04 11:40:02 +07:00
parent 1bdbad4604
commit 6dedae85df
2 changed files with 79 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
scripts/node_struct/node_struct.gml
View file

@ -22,87 +22,83 @@ function Node_Struct(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
newOutput(0, nodeValue_Output("Struct", self, VALUE_TYPE.struct, {}));
#region //////////////////////////////// Dynamic IO ////////////////////////////////
static createNewInput = function(list = inputs) {
var index = array_length(list);
var bDel = button(function() { node.deleteInput(index); })
.setIcon(THEME.minus_16, 0, COLORS._main_icon);
list[index + 0] = nodeValue_Text("Key", self, "" )
.setDisplay(VALUE_DISPLAY.text_box, { side_button : bDel })
.setAnimable(false);
bDel.setContext(list[index + 0]);
list[index + 1] = nodeValue("value", self, CONNECT_TYPE.input, VALUE_TYPE.any, 0 )
.setVisible(false, false);
return list[index + 0];
}
static createNewInput = function(list = inputs) {
var index = array_length(list);
var bDel = button(function() { node.deleteInput(index); })
.setIcon(THEME.minus_16, 0, COLORS._main_icon);
list[index + 0] = nodeValue_Text("Key", self, "" )
.setDisplay(VALUE_DISPLAY.text_box, { side_button : bDel })
.setAnimable(false);
bDel.setContext(list[index + 0]);
list[index + 1] = nodeValue("value", self, CONNECT_TYPE.input, VALUE_TYPE.any, 0 )
.setVisible(false, false);
return list[index + 0];
}
setDynamicInput(2, false);
static addInput = function() {
var index = array_length(inputs);
setDynamicInput(2, false);
attributes.size++;
createNewInput();
static addInput = function() {
var index = array_length(inputs);
attributes.size++;
createNewInput();
if(!UNDO_HOLDING) {
var _inputs = array_create(data_length);
for(var i = 0; i < data_length; i++)
_inputs[i] = inputs[index + i];
recordAction(ACTION_TYPE.custom, function(data, undo) {
if(undo) deleteInput(data.index);
else insertInput(data.index, data.inputs);
}, { index, inputs : _inputs });
}
onInputResize();
}
static deleteInput = function(index) {
if(!UNDO_HOLDING) {
var _inputs = array_create(data_length);
for(var i = 0; i < data_length; i++)
_inputs[i] = inputs[index + i];
recordAction(ACTION_TYPE.custom, function(data, undo) {
if(undo) insertInput(data.index, data.inputs);
else deleteInput(data.index);
}, { index, inputs : _inputs });
}
attributes.size--;
for(var i = data_length - 1; i >= 0; i--)
array_delete(inputs, index + i, 1);
onInputResize();
}
static insertInput = function(index, _inputs) {
attributes.size++;
if(!UNDO_HOLDING) {
var _inputs = array_create(data_length);
for(var i = 0; i < data_length; i++)
array_insert(inputs, index + i, _inputs[i]);
_inputs[i] = inputs[index + i];
onInputResize();
recordAction(ACTION_TYPE.custom, function(data, undo) {
if(undo) deleteInput(data.index);
else insertInput(data.index, data.inputs);
}, { index, inputs : _inputs });
}
static refreshDynamicInput = function() {
input_display_list = array_clone(input_display_list_raw);
for( var i = 0; i < array_length(inputs); i++ ) {
inputs[i].index = i;
array_push(input_display_list, i);
}
getJunctionList();
}
onInputResize();
}
#endregion //////////////////////////////// Dynamic IO ////////////////////////////////
static deleteInput = function(index) {
if(!UNDO_HOLDING) {
var _inputs = array_create(data_length);
for(var i = 0; i < data_length; i++)
_inputs[i] = inputs[index + i];
recordAction(ACTION_TYPE.custom, function(data, undo) {
if(undo) insertInput(data.index, data.inputs);
else deleteInput(data.index);
}, { index, inputs : _inputs });
}
attributes.size--;
for(var i = data_length - 1; i >= 0; i--)
array_delete(inputs, index + i, 1);
onInputResize();
}
static insertInput = function(index, _inputs) {
attributes.size++;
for(var i = 0; i < data_length; i++)
array_insert(inputs, index + i, _inputs[i]);
onInputResize();
}
static refreshDynamicInput = function() {
input_display_list = array_clone(input_display_list_raw);
for( var i = 0; i < array_length(inputs); i++ ) {
inputs[i].index = i;
array_push(input_display_list, i);
}
getJunctionList();
}
static onValueUpdate = function(index = 0) {
if(LOADING || APPENDING) return;
if(index < 0) return;

17
scripts/panel_inspector/panel_inspector.gml
View file

@ -722,9 +722,12 @@ function Panel_Inspector() : PanelContent() constructor {
var yy = hh + _y;
if(i < amoIn) { // inputs
if(!is_array(_inspecting.input_display_list)) jun = _inspecting.inputs[i];
else if(is_real(_inspecting.input_display_list[i])) jun = _inspecting.inputs[_inspecting.input_display_list[i]];
else jun = _inspecting.input_display_list[i];
var _dsl = _inspecting.input_display_list;
var _dsp = array_safe_get_fast(_dsl, i);
if(!is_array(_dsl)) jun = array_safe_get_fast(_inspecting.inputs, i);
else if(is_real(_dsp)) jun = array_safe_get_fast(_inspecting.inputs, _dsp);
else jun = _dsp;
} else if(i == amoIn) { // output label
hh += ui(8 + 32 + 8);
@ -736,10 +739,12 @@ function Panel_Inspector() : PanelContent() constructor {
} else { // outputs
var _oi = i - amoIn - 1;
var _dsl = _inspecting.output_display_list;
var _dsp = array_safe_get_fast(_dsl, _oi);
if(!is_array(_inspecting.output_display_list)) jun = _inspecting.outputs[_oi];
else if(is_real(_inspecting.output_display_list[_oi])) jun = _inspecting.outputs[_inspecting.output_display_list[_oi]];
else jun = _inspecting.output_display_list[_oi];
if(!is_array(_dsl)) jun = array_safe_get_fast(_inspecting.outputs, _oi);
else if(is_real(_dsp)) jun = array_safe_get_fast(_inspecting.outputs, _dsp);
else jun = _dsp;
}
if(is_instanceof(jun, Inspector_Spacer)) { // SPACER