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

- [Canvas] Now show background array based on frame index.

Browse source
This commit is contained in:
Tanasart 2024-06-15 09:38:43 +07:00
parent 4d6d06c738
commit 153863a904
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
objects/o_dialog_add_node/Create_0.gml
View file

@ -659,12 +659,14 @@ event_inherited();
} }
if(PREFERENCES.dialog_add_node_grouping) { if(PREFERENCES.dialog_add_node_grouping) {
var len = array_length(group_labels);
if(len) {
gpu_set_blendmode(bm_subtract); gpu_set_blendmode(bm_subtract);
draw_set_color(c_white); draw_set_color(c_white);
draw_rectangle(0, 0, content_pane.surface_w, ui(16 + 24 / 2), false); draw_rectangle(0, 0, content_pane.surface_w, ui(16 + 24 / 2), false);
gpu_set_blendmode(bm_normal); gpu_set_blendmode(bm_normal);
}
var len = array_length(group_labels);
for( var i = 0; i < len; i++ ) { for( var i = 0; i < len; i++ ) {
var lb = group_labels[i]; var lb = group_labels[i];
var _yy = max(lb.y, i == len - 1? ui(8) : min(ui(8), group_labels[i + 1].y - ui(32))); var _yy = max(lb.y, i == len - 1? ui(8) : min(ui(8), group_labels[i + 1].y - ui(32)));

15
scripts/node_canvas/node_canvas.gml
View file

@ -953,7 +953,13 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
var cDep = attrDepth(); var cDep = attrDepth();
if(_bgDim && is_surface(_bg)) _dim = [ surface_get_width_safe(_bg), surface_get_height_safe(_bg) ]; if(_bgDim) {
var _bgDim = _bg;
if(is_array(_bgDim) && !array_empty(_bgDim)) _bgDim = _bg[0];
if(is_surface(_bgDim))
_dim = [ surface_get_width_safe(_bgDim), surface_get_height_safe(_bgDim) ];
}
attributes.dimension = _dim; attributes.dimension = _dim;
apply_surfaces(); apply_surfaces();
@ -965,6 +971,8 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
if(_frames == 1) { if(_frames == 1) {
var _canvas_surface = getCanvasSurface(0); var _canvas_surface = getCanvasSurface(0);
if(is_array(_bg) && !array_empty(_bg)) _bg = _bg[0];
output_surface[0] = surface_verify(output_surface[0], _dim[0], _dim[1], cDep); output_surface[0] = surface_verify(output_surface[0], _dim[0], _dim[1], cDep);
surface_set_shader(output_surface[0], noone,, BLEND.alpha); surface_set_shader(output_surface[0], noone,, BLEND.alpha);
@ -977,11 +985,12 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor
} else { } else {
for( var i = 0; i < _frames; i++ ) { for( var i = 0; i < _frames; i++ ) {
var _canvas_surface = getCanvasSurface(i); var _canvas_surface = getCanvasSurface(i);
var _bgArray = is_array(_bg)? array_safe_get_fast(_bg, i, 0) : _bg;
output_surface[i] = surface_verify(output_surface[i], _dim[0], _dim[1], cDep); output_surface[i] = surface_verify(output_surface[i], _dim[0], _dim[1], cDep);
surface_set_shader(output_surface[i], noone,, BLEND.alpha); surface_set_shader(output_surface[i], noone,, BLEND.alpha);
if(_bgr && is_surface(_bg)) if(_bgr && is_surface(_bgArray))
draw_surface_stretched_ext(_bg, 0, 0, _dim[0], _dim[1], c_white, _bga); draw_surface_stretched_ext(_bgArray, 0, 0, _dim[0], _dim[1], c_white, _bga);
draw_surface_safe(_canvas_surface, 0, 0); draw_surface_safe(_canvas_surface, 0, 0);
surface_reset_shader(); surface_reset_shader();
} }