From 65af445712e71545cfc0505628af1d211c4b0bf1 Mon Sep 17 00:00:00 2001 From: Tanasart Date: Fri, 26 Apr 2024 19:38:24 +0700 Subject: [PATCH] 1.17rc4 --- .../node_feedback_inline.gml.backup0 | 6 ++---- .../node_feedback_inline.gml.backup1 | 6 ++---- #backups/scripts/node_line/node_line.gml.backup0 | 8 ++++---- #backups/scripts/node_line/node_line.gml.backup1 | 10 +++++----- #backups/scripts/preferences/preferences.gml.backup0 | 2 +- #backups/scripts/preferences/preferences.gml.backup1 | 2 +- scripts/node_feedback_inline/node_feedback_inline.gml | 4 +--- scripts/node_line/node_line.gml | 6 +++--- 8 files changed, 19 insertions(+), 25 deletions(-) diff --git a/#backups/scripts/node_feedback_inline/node_feedback_inline.gml.backup0 b/#backups/scripts/node_feedback_inline/node_feedback_inline.gml.backup0 index 12727b0e1..2f9b0c757 100644 --- a/#backups/scripts/node_feedback_inline/node_feedback_inline.gml.backup0 +++ b/#backups/scripts/node_feedback_inline/node_feedback_inline.gml.backup0 @@ -1,4 +1,4 @@ -// 2024-04-26 18:21:19 +// 2024-04-26 18:23:00 function Node_Feedback_Inline(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Feedback"; color = COLORS.node_blend_feedback; @@ -75,9 +75,7 @@ function Node_Feedback_Inline(_x, _y, _group = noone) : Node(_x, _y, _group) con static pointIn = function(_x, _y, _mx, _my, _s) { return false; } - static postDeserialize = function() { #region - scanJunc(); - } #endregion + static postDeserialize = function() { scanJunc(); } static onDestroy = function() { #region if(junc_in) junc_in.value_from_loop = noone; diff --git a/#backups/scripts/node_feedback_inline/node_feedback_inline.gml.backup1 b/#backups/scripts/node_feedback_inline/node_feedback_inline.gml.backup1 index e816ad391..849394547 100644 --- a/#backups/scripts/node_feedback_inline/node_feedback_inline.gml.backup1 +++ b/#backups/scripts/node_feedback_inline/node_feedback_inline.gml.backup1 @@ -1,4 +1,4 @@ -// 2024-04-26 18:21:04 +// 2024-04-26 18:22:58 function Node_Feedback_Inline(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Feedback"; color = COLORS.node_blend_feedback; @@ -75,9 +75,7 @@ function Node_Feedback_Inline(_x, _y, _group = noone) : Node(_x, _y, _group) con static pointIn = function(_x, _y, _mx, _my, _s) { return false; } - static postDeserialize = function() { #region - scanJunc(); - } #endregion + static postDeserialize = function() { scanJunc(); } static onDestroy = function() { #region if(junc_in) junc_in.value_from_loop = noone; diff --git a/#backups/scripts/node_line/node_line.gml.backup0 b/#backups/scripts/node_line/node_line.gml.backup0 index 2884650e4..324e4c4cb 100644 --- a/#backups/scripts/node_line/node_line.gml.backup0 +++ b/#backups/scripts/node_line/node_line.gml.backup0 @@ -1,4 +1,4 @@ -// 2024-04-26 14:34:25 +// 2024-04-26 18:48:54 function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Line"; @@ -329,7 +329,7 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons if(_total <= 0) break; - if(_prog_next == _prog_curr && _segIndexPrev == _segIndex) { print("Terminate line not moving"); break; } + if(_prog_next == _prog_curr && _segIndexPrev == _segIndex) { /*print("Terminate line not moving");*/ break; } else if(_prog_next > _prog_curr) { _prog_total += _prog_next - _prog_curr; _total -= _prog_next - _prog_curr; @@ -340,10 +340,10 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons _ox = _nx; _oy = _ny; - if(_total_prev == _total && _segIndexPrev == _segIndex && ++_freeze > 16) { print("Terminate line not moving"); break; } + if(_total_prev == _total && _segIndexPrev == _segIndex && ++_freeze > 16) { /*print("Terminate line not moving");*/ break; } _total_prev = _total; - if(_segIndex >= _segLengthAmo) { print("Terminate line finish last segment"); break; } + if(_segIndex >= _segLengthAmo) { /*print("Terminate line finish last segment");*/ break; } } array_resize(points, pointAmo); diff --git a/#backups/scripts/node_line/node_line.gml.backup1 b/#backups/scripts/node_line/node_line.gml.backup1 index 1477d1900..b38e71032 100644 --- a/#backups/scripts/node_line/node_line.gml.backup1 +++ b/#backups/scripts/node_line/node_line.gml.backup1 @@ -1,4 +1,4 @@ -// 2024-04-26 14:33:39 +// 2024-04-26 18:48:52 function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Line"; @@ -262,7 +262,7 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons } } - print($"===== {_prog_curr} / {_segLength} : {_segIndex} - {_pathLength} ====="); + // print($"===== {_prog_curr} / {_segLength} : {_segIndex} - {_pathLength} ====="); while(true) { wght = 1; @@ -329,7 +329,7 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons if(_total <= 0) break; - if(_prog_next == _prog_curr && _segIndexPrev == _segIndex) { print("Terminate line not moving"); break; } + if(_prog_next == _prog_curr && _segIndexPrev == _segIndex) { /*print("Terminate line not moving");*/ break; } else if(_prog_next > _prog_curr) { _prog_total += _prog_next - _prog_curr; _total -= _prog_next - _prog_curr; @@ -340,10 +340,10 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons _ox = _nx; _oy = _ny; - if(_total_prev == _total && _segIndexPrev == _segIndex && ++_freeze > 16) { print("Terminate line not moving"); break; } + if(_total_prev == _total && _segIndexPrev == _segIndex && ++_freeze > 16) { /*print("Terminate line not moving");*/ break; } _total_prev = _total; - if(_segIndex >= _segLengthAmo) { print("Terminate line finish last segment"); break; } + if(_segIndex >= _segLengthAmo) { /*print("Terminate line finish last segment");*/ break; } } array_resize(points, pointAmo); diff --git a/#backups/scripts/preferences/preferences.gml.backup0 b/#backups/scripts/preferences/preferences.gml.backup0 index baca45674..5388aad8b 100644 --- a/#backups/scripts/preferences/preferences.gml.backup0 +++ b/#backups/scripts/preferences/preferences.gml.backup0 @@ -1,4 +1,4 @@ -// 2024-04-26 12:17:59 +// 2024-04-26 19:16:18 #region preference globalvar PREFERENCES, PREFERENCES_DEF, HOTKEYS_DATA; PREFERENCES = {}; diff --git a/#backups/scripts/preferences/preferences.gml.backup1 b/#backups/scripts/preferences/preferences.gml.backup1 index 4204c1749..dc279a9a6 100644 --- a/#backups/scripts/preferences/preferences.gml.backup1 +++ b/#backups/scripts/preferences/preferences.gml.backup1 @@ -1,4 +1,4 @@ -// 2024-04-26 10:05:24 +// 2024-04-26 19:16:04 #region preference globalvar PREFERENCES, PREFERENCES_DEF, HOTKEYS_DATA; PREFERENCES = {}; diff --git a/scripts/node_feedback_inline/node_feedback_inline.gml b/scripts/node_feedback_inline/node_feedback_inline.gml index 5d6b42af4..d64552fca 100644 --- a/scripts/node_feedback_inline/node_feedback_inline.gml +++ b/scripts/node_feedback_inline/node_feedback_inline.gml @@ -74,9 +74,7 @@ function Node_Feedback_Inline(_x, _y, _group = noone) : Node(_x, _y, _group) con static pointIn = function(_x, _y, _mx, _my, _s) { return false; } - static postDeserialize = function() { #region - scanJunc(); - } #endregion + static postDeserialize = function() { scanJunc(); } static onDestroy = function() { #region if(junc_in) junc_in.value_from_loop = noone; diff --git a/scripts/node_line/node_line.gml b/scripts/node_line/node_line.gml index 2453c2002..d01c61109 100644 --- a/scripts/node_line/node_line.gml +++ b/scripts/node_line/node_line.gml @@ -328,7 +328,7 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons if(_total <= 0) break; - if(_prog_next == _prog_curr && _segIndexPrev == _segIndex) { print("Terminate line not moving"); break; } + if(_prog_next == _prog_curr && _segIndexPrev == _segIndex) { /*print("Terminate line not moving");*/ break; } else if(_prog_next > _prog_curr) { _prog_total += _prog_next - _prog_curr; _total -= _prog_next - _prog_curr; @@ -339,10 +339,10 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons _ox = _nx; _oy = _ny; - if(_total_prev == _total && _segIndexPrev == _segIndex && ++_freeze > 16) { print("Terminate line not moving"); break; } + if(_total_prev == _total && _segIndexPrev == _segIndex && ++_freeze > 16) { /*print("Terminate line not moving");*/ break; } _total_prev = _total; - if(_segIndex >= _segLengthAmo) { print("Terminate line finish last segment"); break; } + if(_segIndex >= _segLengthAmo) { /*print("Terminate line finish last segment");*/ break; } } array_resize(points, pointAmo);