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

- [Composite] Fix error when resizing surface array.

Browse source
This commit is contained in:
Tanasart 2024-05-10 07:59:58 +07:00
parent 03e601cbda
commit d461ac15cd
4 changed files with 18 additions and 11 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

@ -549,8 +549,8 @@ event_inherited();
} else if(PREFERENCES.dialog_add_node_view == 1) { #region list } else if(PREFERENCES.dialog_add_node_view == 1) { #region list
var list_width = content_pane.surface_w; var list_width = content_pane.surface_w;
var list_height = ui(28); var list_height = ui(28);
var yy = _y + list_height / 2; var yy = _y + list_height / 2;
var bg_ind = 0; var bg_ind = 0;
hh += list_height; hh += list_height;
for(var i = 0; i < node_count; i++) { for(var i = 0; i < node_count; i++) {

6
scripts/globals/globals.gml
View file

@ -36,10 +36,10 @@
globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION; globalvar VERSION, SAVE_VERSION, VERSION_STRING, BUILD_NUMBER, LATEST_VERSION;
LATEST_VERSION = 11600; LATEST_VERSION = 11600;
VERSION = 11702; VERSION = 11703;
SAVE_VERSION = 11690; SAVE_VERSION = 11690;
VERSION_STRING = "1.17.0.2"; VERSION_STRING = "1.17.0.3";
BUILD_NUMBER = 11707; BUILD_NUMBER = 11708;
globalvar HOTKEYS, HOTKEY_CONTEXT; globalvar HOTKEYS, HOTKEY_CONTEXT;
HOTKEYS = ds_map_create(); HOTKEYS = ds_map_create();

13
scripts/node_composite/node_composite.gml
View file

@ -389,6 +389,7 @@ function Node_Composite(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
if(inputs[| input_dragging].setValue([ pos_x, pos_y ])) if(inputs[| input_dragging].setValue([ pos_x, pos_y ]))
UNDO_HOLDING = true; UNDO_HOLDING = true;
} else if(drag_type == NODE_COMPOSE_DRAG.rotate) { } else if(drag_type == NODE_COMPOSE_DRAG.rotate) {
var aa = point_direction(rot_anc_x, rot_anc_y, _mx, _my); var aa = point_direction(rot_anc_x, rot_anc_y, _mx, _my);
var da = angle_difference(dragging_mx, aa); var da = angle_difference(dragging_mx, aa);
@ -401,11 +402,12 @@ function Node_Composite(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
if(inputs[| input_dragging].setValue(sa)) if(inputs[| input_dragging].setValue(sa))
UNDO_HOLDING = true; UNDO_HOLDING = true;
} else if(drag_type == NODE_COMPOSE_DRAG.scale) { } else if(drag_type == NODE_COMPOSE_DRAG.scale) {
var _surf = getInputData(surf_dragging + 0); var _surf = current_data[surf_dragging + 0];
var _rot = getInputData(surf_dragging + 2); var _rot = current_data[surf_dragging + 2];
var _sw = surface_get_width_safe(_surf); var _sw = surface_get_width_safe(_surf);
var _sh = surface_get_height_safe(_surf); var _sh = surface_get_height_safe(_surf);
var _p = point_rotate(_mx - dragging_mx, _my - dragging_my, 0, 0, -_rot); var _p = point_rotate(_mx - dragging_mx, _my - dragging_my, 0, 0, -_rot);
var sca_x = _p[0] / _s / _sw * 2; var sca_x = _p[0] / _s / _sw * 2;
@ -417,7 +419,8 @@ function Node_Composite(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
} }
if(inputs[| input_dragging].setValue([ sca_x, sca_y ])) if(inputs[| input_dragging].setValue([ sca_x, sca_y ]))
UNDO_HOLDING = true; UNDO_HOLDING = true;
} }
if(mouse_release(mb_left)) { if(mouse_release(mb_left)) {

6
scripts/node_mk_tile/node_mk_tile.gml
View file

@ -35,12 +35,14 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c
inputs[| 13] = nodeValue("Edge transform", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) inputs[| 13] = nodeValue("Edge transform", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0)
.setDisplay(VALUE_DISPLAY.enum_button, [ "Flip", "Rotate" ] ); .setDisplay(VALUE_DISPLAY.enum_button, [ "Flip", "Rotate" ] );
inputs[| 14] = nodeValue("Sort array by bit", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true)
input_display_list = [ new Inspector_Sprite(s_MKFX), input_display_list = [ new Inspector_Sprite(s_MKFX),
["Surfaces", true], 0, 1, ["Surfaces", true], 0, 1,
["Tile set", false], 2, 4, ["Tile set", false], 2, 4,
["Edge", false], 5, 12, 13, 10, 11, ["Edge", false], 5, 12, 13, 10, 11,
["Edge Textures", true], 6, 7, 8, 9, ["Edge Textures", true], 6, 7, 8, 9,
["Output", false], 3, ["Output", false], 3, 14,
]; ];
outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone);
@ -141,6 +143,7 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c
} #endregion } #endregion
static step = function() { #region static step = function() { #region
var _outType = getSingleValue( 3);
var _edgType = getSingleValue( 5); var _edgType = getSingleValue( 5);
var _edgFull = getSingleValue(11); var _edgFull = getSingleValue(11);
@ -149,6 +152,7 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c
inputs[| 8].setVisible(_edgType == 1, _edgType == 1); inputs[| 8].setVisible(_edgType == 1, _edgType == 1);
inputs[| 9].setVisible(_edgType == 1, _edgType == 1); inputs[| 9].setVisible(_edgType == 1, _edgType == 1);
inputs[| 13].setVisible(_edgType == 0); inputs[| 13].setVisible(_edgType == 0);
inputs[| 14].setVisible(_outType == 1);
} #endregion } #endregion
static generateFull = function(_data, _tex0, _tex1, _edge, _crop, indMain, indEdge_et, indEdge_eb, indEdge_el, indEdge_er) { #region static generateFull = function(_data, _tex0, _tex1, _edge, _crop, indMain, indEdge_et, indEdge_eb, indEdge_el, indEdge_er) { #region