1.15.5 fixes

This commit is contained in:
MakhamDev 2023-10-19 16:34:29 +07:00
parent be1d1af2b3
commit 9bca08fd57
4 changed files with 28 additions and 9 deletions

View file

@ -71,6 +71,7 @@ event_inherited();
function filtered(node) { #region function filtered(node) { #region
if(!node_show_connectable) return true; if(!node_show_connectable) return true;
if(node_called == noone && junction_hovering == noone) return true; if(node_called == noone && junction_hovering == noone) return true;
if(!struct_has(node, "node")) return true;
if(!struct_has(global.NODE_GUIDE, node.node)) return true; if(!struct_has(global.NODE_GUIDE, node.node)) return true;
var io = global.NODE_GUIDE[$ node.node]; var io = global.NODE_GUIDE[$ node.node];
@ -396,6 +397,8 @@ event_inherited();
for(var index = 0; index < node_count; index++) { for(var index = 0; index < node_count; index++) {
var _node = _list[| index]; var _node = _list[| index];
if(is_undefined(_node)) continue;
if(is_string(_node)) { if(is_string(_node)) {
if(!PREF_MAP[? "dialog_add_node_grouping"]) if(!PREF_MAP[? "dialog_add_node_grouping"])
continue; continue;
@ -520,6 +523,7 @@ event_inherited();
for(var i = 0; i < node_count; i++) { for(var i = 0; i < node_count; i++) {
var _node = _list[| i]; var _node = _list[| i];
if(is_undefined(_node)) continue;
if(is_string(_node)) { if(is_string(_node)) {
if(!PREF_MAP[? "dialog_add_node_grouping"]) if(!PREF_MAP[? "dialog_add_node_grouping"])

View file

@ -221,8 +221,10 @@ function Node_Collection(_x, _y, _group = noone) : Node(_x, _y, _group) construc
var nodes = []; var nodes = [];
for( var i = 0; i < ds_list_size(outputs); i++ ) { for( var i = 0; i < ds_list_size(outputs); i++ ) {
var _ot = outputs[| i]; var _ot = outputs[| i];
var _tos = _ot.getJunctionTo(); if(!_ot.forward) continue;
if(_ot.type == VALUE_TYPE.node) continue;
var _tos = _ot.getJunctionTo();
for( var j = 0, n = array_length(_tos); j < n; j++ ) { for( var j = 0, n = array_length(_tos); j < n; j++ ) {
var _to = _tos[j]; var _to = _tos[j];
var _node = _to.node; var _node = _to.node;

View file

@ -639,8 +639,6 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
return true; return true;
} #endregion } #endregion
static getNextNodesRaw = function() { return getNextNodes(); }
static getNextNodes = function() { #region static getNextNodes = function() { #region
var nodes = []; var nodes = [];
var nodeNames = []; var nodeNames = [];
@ -652,6 +650,7 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
for(var i = 0; i < ds_list_size(outputs); i++) { for(var i = 0; i < ds_list_size(outputs); i++) {
var _ot = outputs[| i]; var _ot = outputs[| i];
if(!_ot.forward) continue; if(!_ot.forward) continue;
if(_ot.type == VALUE_TYPE.node) continue;
var _tos = _ot.getJunctionTo(); var _tos = _ot.getJunctionTo();
@ -672,6 +671,22 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
return nodes; return nodes;
} #endregion } #endregion
static getNextNodesRaw = function() { #region
var nodes = [];
for(var i = 0; i < ds_list_size(outputs); i++) {
var _ot = outputs[| i];
if(!_ot.forward) continue;
if(_ot.type == VALUE_TYPE.node) continue;
var _tos = _ot.getJunctionTo();
for( var j = 0; j < array_length(_tos); j++ )
array_push(nodes, _tos[j].node);
}
return nodes;
} #endregion
static isTerminal = function() { #region static isTerminal = function() { #region
for( var i = 0; i < ds_list_size(outputs); i++ ) { for( var i = 0; i < ds_list_size(outputs); i++ ) {
var _to = outputs[| i].getJunctionTo(); var _to = outputs[| i].getJunctionTo();
@ -1352,7 +1367,9 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
} }
} #endregion } #endregion
static clearCacheForward = function() { _clearCacheForward(); } static clearCacheForward = function() { #region
_clearCacheForward();
} #endregion
static _clearCacheForward = function() { #region static _clearCacheForward = function() { #region
if(!isRenderActive()) return; if(!isRenderActive()) return;
@ -1361,10 +1378,6 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
var arr = getNextNodesRaw(); var arr = getNextNodesRaw();
for( var i = 0, n = array_length(arr); i < n; i++ ) for( var i = 0, n = array_length(arr); i < n; i++ )
arr[i]._clearCacheForward(); arr[i]._clearCacheForward();
//for( var i = 0; i < ds_list_size(outputs); i++ )
//for( var j = 0; j < ds_list_size(outputs[| i].value_to); j++ )
// outputs[| i].value_to[| j].node._clearCacheForward();
} #endregion } #endregion
static clearInputCache = function() { #region static clearInputCache = function() { #region

View file

@ -22,7 +22,7 @@ function Node_Rigid_Force_Apply(_x, _y, _group = noone) : Node(_x, _y, _group) c
inputs[| 4] = nodeValue("Apply frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0, "Frame index to apply force.") inputs[| 4] = nodeValue("Apply frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0, "Frame index to apply force.")
.rejectArray(); .rejectArray();
inputs[| 5] = nodeValue("Force", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 0 ]) inputs[| 5] = nodeValue("Force", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.1, 0 ])
.setDisplay(VALUE_DISPLAY.vector) .setDisplay(VALUE_DISPLAY.vector)
.rejectArray(); .rejectArray();