Fix adding some node create 2 nodes.

This commit is contained in:
Tanasart 2025-01-25 13:45:14 +07:00
parent 28c6e15a4a
commit 23df6accbc
34 changed files with 135 additions and 75 deletions

View file

@ -92,6 +92,7 @@
{"name":"blend","order":2,"path":"folders/nodes/data/compose/blend.yy",},
{"name":"dynasurf","order":3,"path":"folders/nodes/data/dynasurf.yy",},
{"name":"filter","order":4,"path":"folders/nodes/data/filter.yy",},
{"name":"blur zoom","order":23,"path":"folders/nodes/data/filter/blur/blur zoom.yy",},
{"name":"colors","order":1,"path":"folders/nodes/data/filter/colors.yy",},
{"name":"normalize","order":37,"path":"folders/nodes/data/filter/colors/normalize.yy",},
{"name":"threshold","order":23,"path":"folders/nodes/data/filter/colors/threshold.yy",},
@ -268,7 +269,6 @@
{"name":"rotator","order":2,"path":"folders/widgets/rotator.yy",},
{"name":"sliders","order":3,"path":"folders/widgets/sliders.yy",},
{"name":"text","order":4,"path":"folders/widgets/text.yy",},
{"name":"blur zoom","order":23,"path":"folders/nodes/data/filter/blur/blur zoom.yy",},
],
"ResourceOrderSettings":[
{"name":"ac_disappear","order":2,"path":"animcurves/ac_disappear/ac_disappear.yy",},
@ -676,6 +676,7 @@
{"name":"node_3d_depth","order":4,"path":"scripts/node_3d_depth/node_3d_depth.yy",},
{"name":"node_3d_displace","order":8,"path":"scripts/node_3d_displace/node_3d_displace.yy",},
{"name":"node_3d_instancer","order":3,"path":"scripts/node_3d_instancer/node_3d_instancer.yy",},
{"name":"node_3d_light_directional","order":1,"path":"scripts/node_3d_light_directional/node_3d_light_directional.yy",},
{"name":"node_3d_light_point","order":2,"path":"scripts/node_3d_light_point/node_3d_light_point.yy",},
{"name":"node_3d_material","order":12,"path":"scripts/node_3d_material/node_3d_material.yy",},
{"name":"node_3d_mesh_cone","order":11,"path":"scripts/node_3d_mesh_cone/node_3d_mesh_cone.yy",},
@ -944,7 +945,6 @@
{"name":"node_lua_global","order":1,"path":"scripts/node_lua_global/node_lua_global.yy",},
{"name":"node_lua_surface","order":2,"path":"scripts/node_lua_surface/node_lua_surface.yy",},
{"name":"node_math","order":2,"path":"scripts/node_math/node_math.yy",},
{"name":"sh_blur_slope","order":21,"path":"shaders/sh_blur_slope/sh_blur_slope.yy",},
{"name":"node_matrix_color_apply","order":7,"path":"scripts/node_matrix_color_apply/node_matrix_color_apply.yy",},
{"name":"node_matrix_det","order":2,"path":"scripts/node_matrix_det/node_matrix_det.yy",},
{"name":"node_matrix_invert","order":3,"path":"scripts/node_matrix_invert/node_matrix_invert.yy",},
@ -1378,7 +1378,6 @@
{"name":"png_reader","order":9,"path":"scripts/png_reader/png_reader.yy",},
{"name":"point_direction_positive","order":4,"path":"scripts/point_direction_positive/point_direction_positive.yy",},
{"name":"point_rect_overlap","order":2,"path":"scripts/point_rect_overlap/point_rect_overlap.yy",},
{"name":"sh_d3d_unlit","order":4,"path":"shaders/sh_d3d_unlit/sh_d3d_unlit.yy",},
{"name":"point_rotate","order":1,"path":"scripts/point_rotate/point_rotate.yy",},
{"name":"polygon_points","order":2,"path":"scripts/polygon_points/polygon_points.yy",},
{"name":"preferences","order":5,"path":"scripts/preferences/preferences.yy",},
@ -1523,6 +1522,8 @@
{"name":"sh_blur_radial","order":16,"path":"shaders/sh_blur_radial/sh_blur_radial.yy",},
{"name":"sh_blur_shape","order":18,"path":"shaders/sh_blur_shape/sh_blur_shape.yy",},
{"name":"sh_blur_simple","order":20,"path":"shaders/sh_blur_simple/sh_blur_simple.yy",},
{"name":"sh_blur_slope","order":21,"path":"shaders/sh_blur_slope/sh_blur_slope.yy",},
{"name":"sh_blur_zoom_step","order":1,"path":"shaders/sh_blur_zoom_step/sh_blur_zoom_step.yy",},
{"name":"sh_box_pattern","order":23,"path":"shaders/sh_box_pattern/sh_box_pattern.yy",},
{"name":"sh_brush_linear","order":47,"path":"shaders/sh_brush_linear/sh_brush_linear.yy",},
{"name":"sh_brush_outline","order":7,"path":"shaders/sh_brush_outline/sh_brush_outline.yy",},
@ -1585,6 +1586,7 @@
{"name":"sh_d3d_shadow_depth","order":11,"path":"shaders/sh_d3d_shadow_depth/sh_d3d_shadow_depth.yy",},
{"name":"sh_d3d_silhouette","order":7,"path":"shaders/sh_d3d_silhouette/sh_d3d_silhouette.yy",},
{"name":"sh_d3d_ssao_blur","order":1,"path":"shaders/sh_d3d_ssao_blur/sh_d3d_ssao_blur.yy",},
{"name":"sh_d3d_unlit","order":4,"path":"shaders/sh_d3d_unlit/sh_d3d_unlit.yy",},
{"name":"sh_d3d_wireframe","order":9,"path":"shaders/sh_d3d_wireframe/sh_d3d_wireframe.yy",},
{"name":"sh_de_corner","order":1,"path":"shaders/sh_de_corner/sh_de_corner.yy",},
{"name":"sh_de_stray","order":3,"path":"shaders/sh_de_stray/sh_de_stray.yy",},
@ -1894,13 +1896,11 @@
{"name":"s_node_3d_light_directional","order":18,"path":"sprites/s_node_3d_light_directional/s_node_3d_light_directional.yy",},
{"name":"s_node_3d_light_point","order":19,"path":"sprites/s_node_3d_light_point/s_node_3d_light_point.yy",},
{"name":"s_node_3d_material","order":13,"path":"sprites/s_node_3d_material/s_node_3d_material.yy",},
{"name":"sh_blur_zoom_step","order":1,"path":"shaders/sh_blur_zoom_step/sh_blur_zoom_step.yy",},
{"name":"s_node_3d_mesh_cone","order":9,"path":"sprites/s_node_3d_mesh_cone/s_node_3d_mesh_cone.yy",},
{"name":"s_node_3d_mesh_cylinder","order":1,"path":"sprites/s_node_3d_mesh_cylinder/s_node_3d_mesh_cylinder.yy",},
{"name":"s_node_3d_mesh_export","order":31,"path":"sprites/s_node_3d_mesh_export/s_node_3d_mesh_export.yy",},
{"name":"s_node_3d_mesh_extrude","order":2,"path":"sprites/s_node_3d_mesh_extrude/s_node_3d_mesh_extrude.yy",},
{"name":"s_node_3d_mesh_obj","order":3,"path":"sprites/s_node_3d_mesh_obj/s_node_3d_mesh_obj.yy",},
{"name":"node_3d_light_directional","order":1,"path":"scripts/node_3d_light_directional/node_3d_light_directional.yy",},
{"name":"s_node_3d_mesh_path_extrude","order":32,"path":"sprites/s_node_3d_mesh_path_extrude/s_node_3d_mesh_path_extrude.yy",},
{"name":"s_node_3d_mesh_plane","order":6,"path":"sprites/s_node_3d_mesh_plane/s_node_3d_mesh_plane.yy",},
{"name":"s_node_3d_mesh_sphere_ico","order":16,"path":"sprites/s_node_3d_mesh_sphere_ico/s_node_3d_mesh_sphere_ico.yy",},

View file

@ -143,6 +143,7 @@
{"$GMFolder":"","%Name":"dynasurf","folderPath":"folders/nodes/data/dynasurf.yy","name":"dynasurf","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"filter","folderPath":"folders/nodes/data/filter.yy","name":"filter","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"blur","folderPath":"folders/nodes/data/filter/blur.yy","name":"blur","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"blur zoom","folderPath":"folders/nodes/data/filter/blur/blur zoom.yy","name":"blur zoom","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"colors","folderPath":"folders/nodes/data/filter/colors.yy","name":"colors","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"normalize","folderPath":"folders/nodes/data/filter/colors/normalize.yy","name":"normalize","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"threshold","folderPath":"folders/nodes/data/filter/colors/threshold.yy","name":"threshold","resourceType":"GMFolder","resourceVersion":"2.0",},
@ -346,7 +347,6 @@
{"$GMFolder":"","%Name":"rotator","folderPath":"folders/widgets/rotator.yy","name":"rotator","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"sliders","folderPath":"folders/widgets/sliders.yy","name":"sliders","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"text","folderPath":"folders/widgets/text.yy","name":"text","resourceType":"GMFolder","resourceVersion":"2.0",},
{"$GMFolder":"","%Name":"blur zoom","folderPath":"folders/nodes/data/filter/blur/blur zoom.yy","name":"blur zoom","resourceType":"GMFolder","resourceVersion":"2.0",},
],
"IncludedFiles":[
{"$GMIncludedFile":"","%Name":"Addons.zip","CopyToMask":-1,"filePath":"datafiles/data","name":"Addons.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
@ -1307,7 +1307,11 @@
{"$GMIncludedFile":"","%Name":"Canvas.png","CopyToMask":-1,"filePath":"datafiles/data/Welcome files/Templates","name":"Canvas.png","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"Canvas.pxc","CopyToMask":-1,"filePath":"datafiles/data/Welcome files/Templates","name":"Canvas.pxc","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"Welcome files.zip","CopyToMask":-1,"filePath":"datafiles/data/Welcome files","name":"Welcome files.zip","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"dllcredits.txt","ConfigValues":{"Itch":{"CopyToMask":"0",},},"CopyToMask":0,"filePath":"datafiles","name":"dllcredits.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"dllcredits.txt","ConfigValues":{
"Itch":{
"CopyToMask":"0",
},
},"CopyToMask":0,"filePath":"datafiles","name":"dllcredits.txt","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"dlltest1.dll","CopyToMask":-1,"filePath":"datafiles","name":"dlltest1.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"ffmpeg.exe","CopyToMask":-1,"filePath":"datafiles/ffmpeg/bin","name":"ffmpeg.exe","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"LICENSE","CopyToMask":-1,"filePath":"datafiles/ffmpeg","name":"LICENSE","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
@ -1326,7 +1330,11 @@
{"$GMIncludedFile":"","%Name":"mf.dll","CopyToMask":-1,"filePath":"datafiles","name":"mf.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"mfcore.dll","CopyToMask":-1,"filePath":"datafiles","name":"mfcore.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"mfplat.dll","CopyToMask":-1,"filePath":"datafiles","name":"mfplat.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"PixelComposer_profile-2.provisionprofile","ConfigValues":{"Itch":{"CopyToMask":"2",},},"CopyToMask":-1,"filePath":"datafiles","name":"PixelComposer_profile-2.provisionprofile","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"PixelComposer_profile-2.provisionprofile","ConfigValues":{
"Itch":{
"CopyToMask":"2",
},
},"CopyToMask":-1,"filePath":"datafiles","name":"PixelComposer_profile-2.provisionprofile","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"data.win","CopyToMask":-1,"filePath":"datafiles/report","name":"data.win","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"execute_shell_simple_ext_x64.dll","CopyToMask":-1,"filePath":"datafiles/report","name":"execute_shell_simple_ext_x64.dll","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
{"$GMIncludedFile":"","%Name":"options.ini","CopyToMask":-1,"filePath":"datafiles/report","name":"options.ini","resourceType":"GMIncludedFile","resourceVersion":"2.0",},
@ -2322,7 +2330,6 @@
{"id":{"name":"node_scatter_points","path":"scripts/node_scatter_points/node_scatter_points.yy",},},
{"id":{"name":"node_scatter","path":"scripts/node_scatter/node_scatter.yy",},},
{"id":{"name":"node_sdf","path":"scripts/node_sdf/node_sdf.yy",},},
{"id":{"name":"sh_d3d_unlit","path":"shaders/sh_d3d_unlit/sh_d3d_unlit.yy",},},
{"id":{"name":"node_segment_filter","path":"scripts/node_segment_filter/node_segment_filter.yy",},},
{"id":{"name":"node_separate_color","path":"scripts/node_separate_color/node_separate_color.yy",},},
{"id":{"name":"node_seperate_shape","path":"scripts/node_seperate_shape/node_seperate_shape.yy",},},
@ -2778,6 +2785,7 @@
{"id":{"name":"sh_blur_shape","path":"shaders/sh_blur_shape/sh_blur_shape.yy",},},
{"id":{"name":"sh_blur_simple","path":"shaders/sh_blur_simple/sh_blur_simple.yy",},},
{"id":{"name":"sh_blur_slope","path":"shaders/sh_blur_slope/sh_blur_slope.yy",},},
{"id":{"name":"sh_blur_zoom_step","path":"shaders/sh_blur_zoom_step/sh_blur_zoom_step.yy",},},
{"id":{"name":"sh_blur_zoom","path":"shaders/sh_blur_zoom/sh_blur_zoom.yy",},},
{"id":{"name":"sh_box_pattern","path":"shaders/sh_box_pattern/sh_box_pattern.yy",},},
{"id":{"name":"sh_brush_linear","path":"shaders/sh_brush_linear/sh_brush_linear.yy",},},
@ -2849,6 +2857,7 @@
{"id":{"name":"sh_d3d_silhouette","path":"shaders/sh_d3d_silhouette/sh_d3d_silhouette.yy",},},
{"id":{"name":"sh_d3d_ssao_blur","path":"shaders/sh_d3d_ssao_blur/sh_d3d_ssao_blur.yy",},},
{"id":{"name":"sh_d3d_ssao","path":"shaders/sh_d3d_ssao/sh_d3d_ssao.yy",},},
{"id":{"name":"sh_d3d_unlit","path":"shaders/sh_d3d_unlit/sh_d3d_unlit.yy",},},
{"id":{"name":"sh_d3d_wireframe","path":"shaders/sh_d3d_wireframe/sh_d3d_wireframe.yy",},},
{"id":{"name":"sh_de_corner","path":"shaders/sh_de_corner/sh_de_corner.yy",},},
{"id":{"name":"sh_de_stray","path":"shaders/sh_de_stray/sh_de_stray.yy",},},
@ -3519,7 +3528,6 @@
{"id":{"name":"s_node_mk_saber","path":"sprites/s_node_mk_saber/s_node_mk_saber.yy",},},
{"id":{"name":"s_node_mk_sparkle","path":"sprites/s_node_mk_sparkle/s_node_mk_sparkle.yy",},},
{"id":{"name":"s_node_mk_subpixel","path":"sprites/s_node_mk_subpixel/s_node_mk_subpixel.yy",},},
{"id":{"name":"sh_blur_zoom_step","path":"shaders/sh_blur_zoom_step/sh_blur_zoom_step.yy",},},
{"id":{"name":"s_node_mk_tile","path":"sprites/s_node_mk_tile/s_node_mk_tile.yy",},},
{"id":{"name":"s_node_monitor_capture","path":"sprites/s_node_monitor_capture/s_node_monitor_capture.yy",},},
{"id":{"name":"s_node_morph_surface","path":"sprites/s_node_morph_surface/s_node_morph_surface.yy",},},

Binary file not shown.

View file

@ -41,10 +41,10 @@
globalvar HOTKEYS, HOTKEY_CONTEXT;
LATEST_VERSION = 1_18_00_0;
VERSION = 1_18_08_0;
VERSION = 1_18_07_2;
SAVE_VERSION = 1_18_05_0;
VERSION_STRING = MAC? "1.18.003m" : "1.18.8.001";
BUILD_NUMBER = 118071.001;
VERSION_STRING = MAC? "1.18.003m" : "1.18.7.2";
BUILD_NUMBER = 118072;
PREF_VERSION = 1_17_1;
var _vsp = string_split(VERSION_STRING, ".");

View file

@ -6,7 +6,8 @@ function Node_create_3D_Obj(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_3D_Mesh_Obj(_x, _y, _group).skipDefault();
var node = new Node_3D_Mesh_Obj(_x, _y, _group);
node.skipDefault();
node.setPath(path);
return node;
}
@ -14,7 +15,8 @@ function Node_create_3D_Obj(_x, _y, _group = noone) {
function Node_create_3D_Obj_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_3D_Mesh_Obj(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_3D_Mesh_Obj(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.setPath(path);
return node;
}

View file

@ -6,7 +6,8 @@ function Node_create_ASE_File_Read(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_ASE_File_Read(_x, _y, _group).skipDefault();
var node = new Node_ASE_File_Read(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
if(NODE_NEW_MANUAL) node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_ASE_File_Read(_x, _y, _group = noone) {
function Node_create_ASE_File_Read_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_ASE_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_ASE_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();

View file

@ -1,12 +1,12 @@
#region create
function Node_create_Blend(_x, _y, _group = noone, _param = {}) {
var node = new Node_Blend(_x, _y, _group).skipDefault();
var query = struct_try_get(_param, "query", "");
var node = new Node_Blend(_x, _y, _group);
node.skipDefault();
var query = struct_try_get(_param, "query", "");
var ind = array_find(global.node_blend_keys, query);
if(ind >= 0) node.inputs[2].setValue(ind);
return node;
}

View file

@ -14,7 +14,9 @@ enum COMPARE_OPERATOR {
function Node_create_Compare(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_Compare(_x, _y, _group).skipDefault();
var node = new Node_Compare(_x, _y, _group);
node.skipDefault();
var ind = -1;
switch(query) {

View file

@ -6,7 +6,8 @@ function Node_create_CSV_File_Read(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_CSV_File_Read(_x, _y, _group).skipDefault();
var node = new Node_CSV_File_Read(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_CSV_File_Read(_x, _y, _group = noone) {
function Node_create_CSV_File_Read_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_CSV_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_CSV_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();

View file

@ -1,7 +1,8 @@
function Node_create_CSV_File_Write(_x, _y, _group = noone) {
var path = "";
var node = new Node_CSV_File_Write(_x, _y, _group).skipDefault();
var node = new Node_CSV_File_Write(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();

View file

@ -6,7 +6,8 @@ function Node_create_Directory_Search(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_Directory_Search(_x, _y, _group).skipDefault();
var node = new Node_Directory_Search(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
if(NODE_NEW_MANUAL) node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_Directory_Search(_x, _y, _group = noone) {
function Node_create_Directory_path(_x, _y, path) {
if(!directory_exists(path)) return noone;
var node = new Node_Directory_Search(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_Directory_Search(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
return node;

View file

@ -6,7 +6,8 @@ function Node_create_Display_Image(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_Display_Image(_x, _y, _group).skipDefault();
var node = new Node_Display_Image(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
return node;
@ -15,11 +16,11 @@ function Node_create_Display_Image(_x, _y, _group = noone) {
function Node_create_Display_Image_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_Display_Image(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_Display_Image(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
return node;
return node;
}
function Node_Display_Image(_x, _y, _group = noone) : Node(_x, _y, _group) constructor {

View file

@ -1,6 +1,8 @@
function Node_create_Equation(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_Equation(_x, _y, _group).skipDefault();
var node = new Node_Equation(_x, _y, _group);
node.skipDefault();
if(query == "") return node;
node.inputs[0].setValue(query);

View file

@ -11,7 +11,8 @@ MPEG-4 (.mp4)|*.mp4",
key_release();
}
var node = new Node_Export(_x, _y, _group).skipDefault();
var node = new Node_Export(_x, _y, _group);
node.skipDefault();
node.inputs[1].setValue(path);
if(NODE_NEW_MANUAL) node.extensionCheck();

View file

@ -6,7 +6,8 @@ function Node_create_Image(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_Image(_x, _y, _group).skipDefault();
var node = new Node_Image(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
if(NODE_NEW_MANUAL) node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_Image(_x, _y, _group = noone) {
function Node_create_Image_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_Image(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_Image(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
return node;

View file

@ -6,17 +6,20 @@ function Node_create_Image_Animated(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_Image_Animated(_x, _y, _group).skipDefault();
var node = new Node_Image_Animated(_x, _y, _group);
node.skipDefault();
var paths = string_splice(path, "\n");
node.inputs[0].setValue(paths);
if(NODE_NEW_MANUAL) node.doUpdate();
return node;
}
function Node_create_Image_Animated_path(_x, _y, _path) {
var node = new Node_Image_Animated(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_Image_Animated(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(_path);
node.doUpdate();

View file

@ -6,7 +6,8 @@ function Node_create_Image_gif(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_Image_gif(_x, _y, _group).skipDefault();
var node = new Node_Image_gif(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
if(NODE_NEW_MANUAL) node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_Image_gif(_x, _y, _group = noone) {
function Node_create_Image_gif_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_Image_gif(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_Image_gif(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();

View file

@ -6,19 +6,22 @@ function Node_create_Image_Sequence(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_Image_Sequence(_x, _y, _group).skipDefault();
var paths = string_splice(path, "\n");
var node = new Node_Image_Sequence(_x, _y, _group);
node.skipDefault();
var paths = string_splice(path, "\n");
node.inputs[0].setValue(paths);
if(NODE_NEW_MANUAL) node.doUpdate();
return node;
}
function Node_create_Image_Sequence_path(_x, _y, _path) {
var node = new Node_Image_Sequence(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
node.inputs[0].setValue(_path);
node.doUpdate();
var node = new Node_Image_Sequence(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(_path);
node.doUpdate();
return node;
}

View file

@ -6,7 +6,8 @@ function Node_create_Json_File_Read(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_Json_File_Read(_x, _y, _group).skipDefault();
var node = new Node_Json_File_Read(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_Json_File_Read(_x, _y, _group = noone) {
function Node_create_Json_File_Read_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_Json_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_Json_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();

View file

@ -13,7 +13,9 @@ enum LOGIC_OPERATOR {
function Node_create_Logic(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_Logic(_x, _y, _group).skipDefault();
var node = new Node_Logic(_x, _y, _group);
node.skipDefault();
var ind = -1;
switch(query) {

View file

@ -47,7 +47,8 @@ global.node_math_scroll = array_create_ext(array_length(global.node_math_names
function Node_create_Math(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_Math(_x, _y, _group).skipDefault();
var node = new Node_Math(_x, _y, _group);
node.skipDefault();
var ind = array_find(global.node_math_keys, query);
if(ind != -1) node.inputs[0].setValue(global.node_math_keys_map[ind]);

View file

@ -1,6 +1,7 @@
function Node_create_Pixel_Math(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_Pixel_Math(_x, _y, _group).skipDefault();
var node = new Node_Pixel_Math(_x, _y, _group);
node.skipDefault();
var ind = array_find(global.node_math_keys, query);
if(ind != -1) node.inputs[7].setValue(global.node_math_keys_map[ind]);

View file

@ -2,7 +2,9 @@
global.node_plot_linear_keys = [ "plot", "bar chart", "graph", "waveform" ];
function Node_create_Plot_Linear(_x, _y, _group = noone, _param = {}) {
var node = new Node_Plot_Linear(_x, _y, _group).skipDefault();
var node = new Node_Plot_Linear(_x, _y, _group);
node.skipDefault();
var query = struct_try_get(_param, "query", "");
switch(query) {

View file

@ -38,6 +38,7 @@ function NodeObject(_name, _node, _tooltip = "") constructor {
nodekey = "";
nodeName = script_get_name(node);
usecreateFn = false;
createFn = noone;
createParam = noone;
@ -82,8 +83,8 @@ function NodeObject(_name, _node, _tooltip = "") constructor {
static setTags = function(_tags) { tags = _tags; return self; }
static setSpr = function(_spr) { spr = _spr; return self; }
static setTooltip = function(_tool) { tooltip = _tool; return self; }
static setBuild = function(_fn) { createFn = _fn; return self; }
static setParam = function(_par) { createParam = _par; return self; }
static setBuild = function(_fn) { createFn = method(self, _fn); usecreateFn = true; return self; }
static setIO = function(t) {
for(var i = 0; i < argument_count; i++) {
@ -163,9 +164,10 @@ function NodeObject(_name, _node, _tooltip = "") constructor {
_param.iname = nodekey;
}
var _node;
if(createFn == noone) _node = new node(_x, _y, _group, _param);
else _node = createFn(_x, _y, _group, _param);
var _node = noone;
if(usecreateFn) _node = createFn(_x, _y, _group, _param);
else _node = new node(_x, _y, _group, _param);
if(_node == noone) return _node;
_node.name = name;
_node.postBuild();

View file

@ -1,19 +1,21 @@
global.node_repeat_keys = [ "repeat polar", "repeat circular" ];
function Node_create_Repeat(_x, _y, _group = noone, _param = {}) {
var _node = new Node_Repeat(_x, _y, _group).skipDefault();
var node = new Node_Repeat(_x, _y, _group);
node.skipDefault();
var query = struct_try_get(_param, "query", "");
switch(query) {
case "repeat polar" :
case "repeat circular" :
_node.inputs[3].setValue(2);
_node.inputs[9].unit.setMode(VALUE_UNIT.reference);
_node.inputs[9].setValueDirect([ 0.5, 0.5 ]);
node.inputs[3].setValue(2);
node.inputs[9].unit.setMode(VALUE_UNIT.reference);
node.inputs[9].setValueDirect([ 0.5, 0.5 ]);
break;
}
return _node;
return node;
}
function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor {

View file

@ -7,12 +7,12 @@ global.node_rm_primitive_keys = [
function Node_create_RM_Primitive(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_RM_Primitive(_x, _y, _group).skipDefault();
var node = new Node_RM_Primitive(_x, _y, _group);
node.skipDefault();
switch(query) {
case "cube" : ind = array_find_string(node.shape_types, "box"); break;
default : ind = array_find_string(node.shape_types, query);
case "cube" : ind = array_find_string(node.shape_types, "box"); break;
default : ind = array_find_string(node.shape_types, query);
}
if(ind >= 0) node.inputs[1].setValue(ind);

View file

@ -1,6 +1,7 @@
function Node_create_Scale_Algo(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_Scale_Algo(_x, _y, _group).skipDefault();
var node = new Node_Scale_Algo(_x, _y, _group);
node.skipDefault();
switch(query) {
case "scale2x" : node.inputs[1].setValue(0); break;

View file

@ -8,7 +8,9 @@ global.node_shape_keys = [
function Node_create_Shape(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_Shape(_x, _y, _group).skipDefault();
var node = new Node_Shape(_x, _y, _group);
node.skipDefault();
var ind = -1;
switch(query) {

View file

@ -12,7 +12,9 @@ enum STAT_OPERATOR {
function Node_create_Statistic(_x, _y, _group = noone, _param = {}) {
var query = struct_try_get(_param, "query", "");
var node = new Node_Statistic(_x, _y, _group).skipDefault();
var node = new Node_Statistic(_x, _y, _group);
node.skipDefault();
var ind = -1;
switch(query) {

View file

@ -1,7 +1,8 @@
function Node_create_SVG_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_SVG(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_SVG(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
return node;

View file

@ -6,7 +6,8 @@ function Node_create_Text_File_Read(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_Text_File_Read(_x, _y, _group).skipDefault();
var node = new Node_Text_File_Read(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_Text_File_Read(_x, _y, _group = noone) {
function Node_create_Text_File_Read_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_Text_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_Text_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();

View file

@ -6,7 +6,8 @@ function Node_create_WAV_File_Read(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_WAV_File_Read(_x, _y, _group).skipDefault();
var node = new Node_WAV_File_Read(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
if(NODE_NEW_MANUAL) node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_WAV_File_Read(_x, _y, _group = noone) {
function Node_create_WAV_File_Read_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_WAV_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_WAV_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();

View file

@ -6,7 +6,8 @@ function Node_create_XML_File_Read(_x, _y, _group = noone) {
if(path == "") return noone;
}
var node = new Node_XML_File_Read(_x, _y, _group).skipDefault();
var node = new Node_XML_File_Read(_x, _y, _group);
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();
@ -16,7 +17,8 @@ function Node_create_XML_File_Read(_x, _y, _group = noone) {
function Node_create_XML_File_Read_path(_x, _y, path) {
if(!file_exists_empty(path)) return noone;
var node = new Node_XML_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
var node = new Node_XML_File_Read(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault();
node.inputs[0].setValue(path);
node.doUpdate();

View file

@ -2986,7 +2986,9 @@ function Panel_Graph(project = PROJECT) : PanelContent() constructor {
var path = $"{TEMPDIR}url_pasted_{seed_random()}.png";
var img = http_get_file(txt, path);
var node = new Node_Image(0, 0).skipDefault();
var node = new Node_Image(0, 0);
node.skipDefault();
var args = [ node, path ];
global.FILE_LOAD_ASYNC[? img] = [ function(a) /*=>*/ { a[0].inputs[0].setValue(a[1]); }, args];
@ -3586,7 +3588,8 @@ function load_file_path(path, _x = undefined, _y = undefined) {
case "hex" :
case "gpl" :
case "pal" :
node = new Node_Palette(_x, _y, PANEL_GRAPH.getCurrentContext()).skipDefault();
node = new Node_Palette(_x, _y, PANEL_GRAPH.getCurrentContext());
node.skipDefault()
node.inputs[0].setValue(loadPalette(p));
break;