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

Tunnel fix

Browse Source
This commit is contained in:
Tanasart 2023-04-04 13:44:37 +02:00
parent 241f08251d
commit 8ec0e7b9c0
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/globals/globals.gml
View File

@ -33,7 +33,7 @@
globalvar VERSION, SAVEFILE_VERSION, VERSION_STRING; globalvar VERSION, SAVEFILE_VERSION, VERSION_STRING;
VERSION = 1140; VERSION = 1140;
SAVEFILE_VERSION = 1400; SAVEFILE_VERSION = 1400;
VERSION_STRING = "1.14.0pr8.2"; VERSION_STRING = "1.14.0pr8.3";
globalvar NODES, NODE_MAP, APPEND_MAP, HOTKEYS, HOTKEY_CONTEXT, NODE_INSTANCES; globalvar NODES, NODE_MAP, APPEND_MAP, HOTKEYS, HOTKEY_CONTEXT, NODE_INSTANCES;

5
scripts/node_data/node_data.gml
View File

@ -340,7 +340,6 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
if(!active) return false; if(!active) return false;
if(!renderActive) return false; if(!renderActive) return false;
var _startNode = true;
for(var j = 0; j < ds_list_size(inputs); j++) { for(var j = 0; j < ds_list_size(inputs); j++) {
var _in = inputs[| j]; var _in = inputs[| j];
if( _in.type == VALUE_TYPE.node) continue; if( _in.type == VALUE_TYPE.node) continue;
@ -349,8 +348,10 @@ function Node(_x, _y, _group = PANEL_GRAPH.getCurrentContext()) : __Node_Base(_x
if( val_from == noone) continue; if( val_from == noone) continue;
if(!val_from.node.active) continue; if(!val_from.node.active) continue;
if(!val_from.node.renderActive) continue; if(!val_from.node.renderActive) continue;
if(!val_from.node.rendered && !val_from.node.update_on_frame) if(!val_from.node.rendered && !val_from.node.update_on_frame) {
//LOG_LINE_IF(global.RENDER_LOG && name == "Tunnel Out", "Non renderable because: " + string(val_from.node.name));
return false; return false;
}
} }
return true; return true;

3
scripts/node_tunnel_in/node_tunnel_in.gml
View File

@ -126,9 +126,8 @@ function Node_Tunnel_In(_x, _y, _group = noone) : Node(_x, _y, _group) construct
var k = ds_map_find_first(TUNNELS_OUT); var k = ds_map_find_first(TUNNELS_OUT);
repeat(amo) { repeat(amo) {
if(TUNNELS_OUT[? k] == _key) { if(TUNNELS_OUT[? k] == _key)
array_push(nodes, NODE_MAP[? k]); array_push(nodes, NODE_MAP[? k]);
}
k = ds_map_find_next(TUNNELS_OUT, k); k = ds_map_find_next(TUNNELS_OUT, k);
} }

4
scripts/node_tunnel_out/node_tunnel_out.gml
View File

@ -23,7 +23,9 @@ function Node_Tunnel_Out(_x, _y, _group = noone) : Node(_x, _y, _group) construc
static isRenderable = function() { static isRenderable = function() {
var _key = inputs[| 0].getValue(); var _key = inputs[| 0].getValue();
return !ds_map_exists(TUNNELS_IN, _key); if(!ds_map_exists(TUNNELS_IN, _key)) return false;
return TUNNELS_IN[? _key].node.rendered;
} }
static onDrawNodeBehind = function(_x, _y, _mx, _my, _s) { static onDrawNodeBehind = function(_x, _y, _mx, _my, _s) {

9
scripts/render_data/render_data.gml
View File

@ -111,13 +111,12 @@ function Render(partial = false, runAction = false) {
// render forward // render forward
while(!ds_queue_empty(RENDER_QUEUE)) { while(!ds_queue_empty(RENDER_QUEUE)) {
rendering = ds_queue_dequeue(RENDER_QUEUE); rendering = ds_queue_dequeue(RENDER_QUEUE);
var renderable = rendering.isRenderable();
LOG_BLOCK_START(); LOG_BLOCK_START();
LOG_IF(global.RENDER_LOG, "Rendering " + rendering.name + " (" + rendering.display_name + ")"); LOG_IF(global.RENDER_LOG, "Rendering " + rendering.name + " (" + rendering.display_name + ") ");
var txt = rendering.isRenderable()? " [Update]" : " [Skip]";
if(rendering.isRenderable()) { if(renderable) {
rendering.doUpdate(); rendering.doUpdate();
var nextNodes = rendering.getNextNodes(); var nextNodes = rendering.getNextNodes();
@ -128,7 +127,7 @@ function Render(partial = false, runAction = false) {
rendering.inspector1Update(); rendering.inspector1Update();
} }
LOG_IF(global.RENDER_LOG, "Rendered " + rendering.name + " (" + rendering.display_name + ") [" + string(instanceof(rendering)) + "]" + txt); LOG_IF(global.RENDER_LOG, "Rendered " + rendering.name + " (" + rendering.display_name + ") [" + string(instanceof(rendering)) + "]" + (renderable? " [Update]" : " [Skip]"));
LOG_BLOCK_END(); LOG_BLOCK_END();
} }
} catch(e) } catch(e)