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

- [Transform] Fix error when animating position.

Browse Source
This commit is contained in:
Tanasart 2024-08-24 08:25:27 +07:00
parent 5625b70ba2
commit 766f6bd39d
3 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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;
globalvar HOTKEYS, HOTKEY_CONTEXT; globalvar HOTKEYS, HOTKEY_CONTEXT;
LATEST_VERSION = 1_16_00_0; LATEST_VERSION = 1_16_00;
VERSION = 1_17_11_0; VERSION = 1_17_11_0;
SAVE_VERSION = 1_17_10_0; SAVE_VERSION = 1_17_10_0;
VERSION_STRING = "1.17.11.002"; VERSION_STRING = "1.17.11.003";
BUILD_NUMBER = 1_17_11_0; BUILD_NUMBER = 1_17_11_0;
HOTKEYS = ds_map_create(); HOTKEYS = ds_map_create();

2
scripts/node_registry/node_registry.gml
View File

@ -1034,7 +1034,7 @@ function __initNodes() {
ds_list_add(node, "Groups"); ds_list_add(node, "Groups");
addNodeObject(node, "Group", s_node_group, "Node_Group", [1, Node_Group]); addNodeObject(node, "Group", s_node_group, "Node_Group", [1, Node_Group]);
addNodeObject(node, "Feedback", s_node_feedback, "Node_Feedback", [1, Node_Feedback],, "Create a group that reuse output from last frame to the current one."); addNodeObject(node, "Feedback", s_node_feedback, "Node_Feedback", [1, Node_Feedback],, "Create a group that reuse output from last frame to the current one.").isDeprecated();
addNodeObject(node, "Loop", s_node_loop, "Node_Iterate", [1, Node_Iterate], ["iterate", "for"], "Create group that reuse output as input repeatedly in one frame.").isDeprecated(); addNodeObject(node, "Loop", s_node_loop, "Node_Iterate", [1, Node_Iterate], ["iterate", "for"], "Create group that reuse output as input repeatedly in one frame.").isDeprecated();
addNodeObject(node, "Loop Array", s_node_loop_array, "Node_Iterate_Each_Inline", [1, Node_Iterate_Each_Inline], ["iterate each", "for each", "array loop"], "Create group that iterate to each member in an array."); addNodeObject(node, "Loop Array", s_node_loop_array, "Node_Iterate_Each_Inline", [1, Node_Iterate_Each_Inline], ["iterate each", "for each", "array loop"], "Create group that iterate to each member in an array.");
addNodeObject(node, "Filter Array", s_node_filter_array, "Node_Iterate_Filter_Inline", [1, Node_Iterate_Filter_Inline],, "Filter array using condition.").setVersion(1140); addNodeObject(node, "Filter Array", s_node_filter_array, "Node_Iterate_Filter_Inline", [1, Node_Iterate_Filter_Inline],, "Filter array using condition.").setVersion(1140);

55
scripts/node_transform/node_transform.gml
View File

@ -588,39 +588,40 @@ function Node_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _group)
} }
} }
#region path if(inputs[2].is_anim && inputs[2].value_from == noone && !inputs[2].sep_axis) { // draw path
if(inputs[2].is_anim && inputs[2].value_from == noone && !inputs[2].sep_axis) { var posInp = inputs[2];
var posInp = inputs[2]; var allPos = posInp.animator.values;
var allPos = posInp.animator.values; var ox, oy, nx, ny;
var ox, oy, nx, ny; var _val, _px, _py;
draw_set_color(COLORS._main_accent); draw_set_color(COLORS._main_accent);
for( var i = 0; i < ds_list_size(allPos); i++ ) { for( var i = 0, n = array_length(allPos); i < n; i++ ) {
var pos = allPos[| i].value; _val = allPos[i].value;
var _pos = [ pos[0], pos[1] ]; _px = _val[0];
_py = _val[1];
if(posInp.unit.mode == VALUE_UNIT.reference) { if(posInp.unit.mode == VALUE_UNIT.reference) {
_pos[0] *= ow; _px *= ow;
_pos[1] *= oh; _py *= oh;
}
nx = _x + _pos[0] * _s;
ny = _y + _pos[1] * _s;
draw_set_alpha(1);
draw_circle_prec(nx, ny, 4, false);
if(i) {
draw_set_alpha(0.5);
draw_line_dashed(ox, oy, nx, ny);
}
ox = nx;
oy = ny;
} }
nx = _x + _px * _s;
ny = _y + _py * _s;
draw_set_alpha(1); draw_set_alpha(1);
draw_circle_prec(nx, ny, 4, false);
if(i) {
draw_set_alpha(0.5);
draw_line_dashed(ox, oy, nx, ny);
}
ox = nx;
oy = ny;
} }
#endregion
draw_set_alpha(1);
}
} }
} }