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

[Stack] Fix output surface not clearing.

Browse source
This commit is contained in:
Tanasart 2024-12-27 09:04:09 +07:00
parent 5e6983681d
commit 8ae0dc2a57
23 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/__node_value_object/__node_value_object.gml
View file

@ -9,7 +9,7 @@ function __NodeValue_Object_Generic(_name, _node, _type, _value, _tooltip = "")
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
return val; return val;
} }

6
scripts/globals/globals.gml
View file

@ -42,10 +42,10 @@
globalvar HOTKEYS, HOTKEY_CONTEXT; globalvar HOTKEYS, HOTKEY_CONTEXT;
LATEST_VERSION = 1_18_00_0; LATEST_VERSION = 1_18_00_0;
VERSION = 1_18_06_0; VERSION = 1_18_06_2;
SAVE_VERSION = 1_18_05_0; SAVE_VERSION = 1_18_05_0;
VERSION_STRING = MAC? "1.18.003m" : "1.18.6"; VERSION_STRING = MAC? "1.18.003m" : "1.18.6.2";
BUILD_NUMBER = 1_18_06_0; BUILD_NUMBER = 1_18_06_2;
PREF_VERSION = 1_17_1; PREF_VERSION = 1_17_1;
var _vsp = string_split(VERSION_STRING, "."); var _vsp = string_split(VERSION_STRING, ".");

9
scripts/node_stack/node_stack.gml
View file

@ -86,10 +86,13 @@ function Node_Stack(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
var oh = hh + _padd[PADDING.top] + _padd[PADDING.bottom]; var oh = hh + _padd[PADDING.top] + _padd[PADDING.bottom];
var _outSurf = outputs[0].getValue(); var _outSurf = outputs[0].getValue();
_outSurf = surface_verify(_outSurf, ow, oh, attrDepth()); _outSurf = surface_verify(_outSurf, ow, oh, attrDepth());
for( var i = 0, n = array_length(temp_surface); i < n; i++ ) for( var i = 0, n = array_length(temp_surface); i < n; i++ ) {
temp_surface[i] = surface_verify(temp_surface[i], ow, oh, attrDepth()); temp_surface[i] = surface_verify(temp_surface[i], ow, oh, attrDepth());
surface_clear(temp_surface[i]);
}
blend_temp_surface = temp_surface[2]; blend_temp_surface = temp_surface[2];
var atlas = []; var atlas = [];
@ -143,9 +146,7 @@ function Node_Stack(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {
surface_set_target(_outSurf); surface_set_target(_outSurf);
DRAW_CLEAR DRAW_CLEAR
BLEND_OVERRIDE BLEND_OVERRIDE
draw_surface_safe(temp_surface[ppind]); draw_surface_safe(temp_surface[ppind]);
BLEND_NORMAL BLEND_NORMAL
surface_reset_target(); surface_reset_target();

2
scripts/node_value/node_value.gml
View file

@ -1206,7 +1206,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var typ = nod.type; var typ = nod.type;
var dis = nod.display_type; var dis = nod.display_type;

2
scripts/node_value_area/node_value_area.gml
View file

@ -70,7 +70,7 @@ function __NodeValue_Area(_name, _node, _value, _data = {}) : NodeValue(_name, _
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
return valueProcess(val, nod, applyUnit, arrIndex); return valueProcess(val, nod, applyUnit, arrIndex);
} }

2
scripts/node_value_color/node_value_color.gml
View file

@ -7,7 +7,7 @@ function __NodeValue_Color(_name, _node, _value, _tooltip = "") : NodeValue(_nam
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
return val; return val;
} }

2
scripts/node_value_curve/node_value_curve.gml
View file

@ -7,7 +7,7 @@ function __NodeValue_Curve(_name, _node, _value) : NodeValue(_name, _node, CONNE
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
return val; return val;
} }

2
scripts/node_value_d3_material/node_value_d3_material.gml
View file

@ -11,7 +11,7 @@ function __NodeValue_D3Material(_name, _node, _value, _tooltip = "") : NodeValue
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var typ = nod.type; var typ = nod.type;
var dis = nod.display_type; var dis = nod.display_type;

2
scripts/node_value_dimension/node_value_dimension.gml
View file

@ -15,7 +15,7 @@ function __NodeValue_Dimension(_node, value) : NodeValue("Dimension", _node, CON
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var typ = nod.type; var typ = nod.type;
if(typ != VALUE_TYPE.surface) { if(typ != VALUE_TYPE.surface) {

2
scripts/node_value_enum_button/node_value_enum_button.gml
View file

@ -8,7 +8,7 @@ function __NodeValue_Enum_Button(_name, _node, _value, _data) : NodeValue(_name,
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
return val; return val;
} }

2
scripts/node_value_enum_scroll/node_value_enum_scroll.gml
View file

@ -8,7 +8,7 @@ function __NodeValue_Enum_Scroll(_name, _node, _value, _data) : NodeValue(_name,
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
return val; return val;
} }

2
scripts/node_value_float/node_value_float.gml
View file

@ -12,7 +12,7 @@ function __NodeValue_Float(_name, _node, _value, _tooltip = "") : NodeValue(_nam
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var typ = nod.type; var typ = nod.type;
var dis = nod.display_type; var dis = nod.display_type;

2
scripts/node_value_gradient/node_value_gradient.gml
View file

@ -7,7 +7,7 @@ function __NodeValue_Gradient(_name, _node, _value, _tooltip = "") : NodeValue(_
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
if(is_instanceof(val, gradientObject)) return val; if(is_instanceof(val, gradientObject)) return val;
if(nod.type != VALUE_TYPE.color) return val; if(nod.type != VALUE_TYPE.color) return val;

2
scripts/node_value_int/node_value_int.gml
View file

@ -13,7 +13,7 @@ function __NodeValue_Int(_name, _node, _value, _tooltip = "") : NodeValue(_name,
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var typ = nod.type; var typ = nod.type;
var dis = nod.display_type; var dis = nod.display_type;

2
scripts/node_value_padding/node_value_padding.gml
View file

@ -18,7 +18,7 @@ function __NodeValue_Padding(_name, _node, _value, _tooltip = "") : NodeValue(_n
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var _d = array_get_depth(val); var _d = array_get_depth(val);
__nod = nod; __nod = nod;

2
scripts/node_value_palette/node_value_palette.gml
View file

@ -9,7 +9,7 @@ function __NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_n
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
if(!is_array(val)) val = [ val ]; if(!is_array(val)) val = [ val ];
return val; return val;

2
scripts/node_value_quarterion/node_value_quarterion.gml
View file

@ -8,7 +8,7 @@ function __NodeValue_Quaternion(_name, _node, _value, _tooltip = "") : __NodeVal
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var typ = nod.type; var typ = nod.type;
var dis = nod.display_type; var dis = nod.display_type;

2
scripts/node_value_rotation/node_value_rotation.gml
View file

@ -8,7 +8,7 @@ function __NodeValue_Rotation(_name, _node, _value, _tooltip = "") : NodeValue(_
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var typ = nod.type; var typ = nod.type;
if(typ == VALUE_TYPE.text) val = toNumber(val); if(typ == VALUE_TYPE.text) val = toNumber(val);

2
scripts/node_value_rotation_random/node_value_rotation_random.gml
View file

@ -9,7 +9,7 @@ function __NodeValue_Rotation_Random(_name, _node, _value, _tooltip = "") : __No
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) {
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
if(!is_array(val)) return [ 0, val, val, 0, 0 ]; if(!is_array(val)) return [ 0, val, val, 0, 0 ];
if(array_length(val) == 2) return [ 0, val[0], val[1], 0, 0 ]; if(array_length(val) == 2) return [ 0, val[0], val[1], 0, 0 ];

2
scripts/node_value_surface/node_value_surface.gml
View file

@ -9,7 +9,7 @@ function __NodeValue_Surface(_name, _node, _value, _tooltip = "") : NodeValue(_n
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
draw_junction_index = VALUE_TYPE.surface; draw_junction_index = VALUE_TYPE.surface;
if(is_instanceof(val, SurfaceAtlas) || (array_valid(val) && is_instanceof(val[0], SurfaceAtlas))) if(is_instanceof(val, SurfaceAtlas) || (array_valid(val) && is_instanceof(val[0], SurfaceAtlas)))

2
scripts/node_value_text/node_value_text.gml
View file

@ -7,7 +7,7 @@ function __NodeValue_Text(_name, _node, _value, _tooltip = "") : NodeValue(_name
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
return val; return val;
} }

2
scripts/node_value_trigger/node_value_trigger.gml
View file

@ -7,7 +7,7 @@ function __NodeValue_Trigger(_name, _node, _value, _tooltip = "") : NodeValue(_n
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
return val; return val;
} }

2
scripts/node_value_vec2/node_value_vec2.gml
View file

@ -19,7 +19,7 @@ function __NodeValue_Vec2(_name, _node, _value, _data = {}) : NodeValue(_name, _
static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value
getValueRecursive(self.__curr_get_val, _time); getValueRecursive(self.__curr_get_val, _time);
var val = __curr_get_val[0]; var val = __curr_get_val[0];
var nod = __curr_get_val[1]; if(!is(nod, Node)) return val; var nod = __curr_get_val[1]; if(!is(nod, NodeValue)) return val;
var typ = nod.type; var typ = nod.type;
if(typ != VALUE_TYPE.surface) { if(typ != VALUE_TYPE.surface) {