diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 6d0eb9c57..56208dc5f 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -34,9 +34,8 @@ {"name":"main","order":147,"path":"folders/main.yy",}, {"name":"misc","order":148,"path":"folders/misc.yy",}, {"name":"nodes","order":149,"path":"folders/nodes.yy",}, - {"name":"__base__","order":11,"path":"folders/nodes/data/__base__.yy",}, - {"name":"collections","order":21,"path":"folders/nodes/data/__base__/collections.yy",}, - {"name":"values","order":20,"path":"folders/nodes/data/__base__/values.yy",}, + {"name":"__base__","order":2,"path":"folders/nodes/__base__.yy",}, + {"name":"collections","order":14,"path":"folders/nodes/__base__/collections.yy",}, {"name":"3D","order":12,"path":"folders/nodes/data/3D.yy",}, {"name":"2d_effects","order":1,"path":"folders/nodes/data/3D/2d_effects.yy",}, {"name":"d3d_camera","order":2,"path":"folders/nodes/data/3D/d3d_camera.yy",}, @@ -116,6 +115,7 @@ {"name":"surface","order":10,"path":"folders/nodes/data/value/surface.yy",}, {"name":"text","order":11,"path":"folders/nodes/data/value/text.yy",}, {"name":"trigger","order":13,"path":"folders/nodes/data/value/trigger.yy",}, + {"name":"icons","order":1,"path":"folders/nodes/icons.yy",}, {"name":"animation","order":1,"path":"folders/nodes/icons/animation.yy",}, {"name":"filter","order":2,"path":"folders/nodes/icons/filter.yy",}, {"name":"blur","order":60,"path":"folders/nodes/icons/filter/blur.yy",}, @@ -142,6 +142,8 @@ {"name":"surface","order":7,"path":"folders/nodes/icons/value/surface.yy",}, {"name":"texts","order":8,"path":"folders/nodes/icons/value/texts.yy",}, {"name":"VFX","order":16,"path":"folders/nodes/icons/VFX.yy",}, + {"name":"values","order":3,"path":"folders/nodes/values.yy",}, + {"name":"types","order":4,"path":"folders/nodes/values/types.yy",}, {"name":"panels","order":150,"path":"folders/panels.yy",}, {"name":"video_banner","order":11,"path":"folders/panels/_others/video_banner.yy",}, {"name":"components","order":3,"path":"folders/panels/inspectors/components.yy",}, @@ -327,7 +329,7 @@ {"name":"slider_Slider","order":1,"path":"objects/slider_Slider/slider_Slider.yy",}, {"name":"__3d_particle","order":1,"path":"scripts/__3d_particle/__3d_particle.yy",}, {"name":"__3D","order":6,"path":"scripts/__3D/__3D.yy",}, - {"name":"__add_node_item","order":13,"path":"scripts/__add_node_item/__add_node_item.yy",}, + {"name":"__add_node_item","order":11,"path":"scripts/__add_node_item/__add_node_item.yy",}, {"name":"__background_get_element","order":1,"path":"scripts/__background_get_element/__background_get_element.yy",}, {"name":"__background_get_internal","order":2,"path":"scripts/__background_get_internal/__background_get_internal.yy",}, {"name":"__background_set_element","order":3,"path":"scripts/__background_set_element/__background_set_element.yy",}, @@ -362,17 +364,17 @@ {"name":"__node_3d_repeat","order":7,"path":"scripts/__node_3d_repeat/__node_3d_repeat.yy",}, {"name":"__node_3d_transform","order":8,"path":"scripts/__node_3d_transform/__node_3d_transform.yy",}, {"name":"__node_3d","order":8,"path":"scripts/__node_3d/__node_3d.yy",}, - {"name":"__node_controller","order":15,"path":"scripts/__node_controller/__node_controller.yy",}, + {"name":"__node_controller","order":13,"path":"scripts/__node_controller/__node_controller.yy",}, {"name":"__node_custom","order":12,"path":"scripts/__node_custom/__node_custom.yy",}, {"name":"__node_iterator_inline","order":1,"path":"scripts/__node_iterator_inline/__node_iterator_inline.yy",}, - {"name":"__node_module","order":14,"path":"scripts/__node_module/__node_module.yy",}, + {"name":"__node_module","order":12,"path":"scripts/__node_module/__node_module.yy",}, {"name":"__node_process_template","order":1,"path":"scripts/__node_process_template/__node_process_template.yy",}, {"name":"__node_shader_generator","order":4,"path":"scripts/__node_shader_generator/__node_shader_generator.yy",}, {"name":"__node_shader_processor","order":5,"path":"scripts/__node_shader_processor/__node_shader_processor.yy",}, {"name":"__node_shader","order":3,"path":"scripts/__node_shader/__node_shader.yy",}, - {"name":"__node_value_processor","order":6,"path":"scripts/__node_value_processor/__node_value_processor.yy",}, + {"name":"__node_value_processor","order":4,"path":"scripts/__node_value_processor/__node_value_processor.yy",}, {"name":"__node_VFX_effector","order":8,"path":"scripts/__node_VFX_effector/__node_VFX_effector.yy",}, - {"name":"__node","order":8,"path":"scripts/__node/__node.yy",}, + {"name":"__node","order":6,"path":"scripts/__node/__node.yy",}, {"name":"__panel_empty","order":7,"path":"scripts/__panel_empty/__panel_empty.yy",}, {"name":"__panel_linear_setting","order":8,"path":"scripts/__panel_linear_setting/__panel_linear_setting.yy",}, {"name":"__path","order":1,"path":"scripts/__path/__path.yy",}, @@ -735,7 +737,7 @@ {"name":"node_atlas_set","order":2,"path":"scripts/node_atlas_set/node_atlas_set.yy",}, {"name":"node_atlas_to_struct","order":3,"path":"scripts/node_atlas_to_struct/node_atlas_to_struct.yy",}, {"name":"node_atlas","order":1,"path":"scripts/node_atlas/node_atlas.yy",}, - {"name":"node_attributes","order":12,"path":"scripts/node_attributes/node_attributes.yy",}, + {"name":"node_attributes","order":10,"path":"scripts/node_attributes/node_attributes.yy",}, {"name":"node_audio_loudness","order":1,"path":"scripts/node_audio_loudness/node_audio_loudness.yy",}, {"name":"node_base_convert","order":7,"path":"scripts/node_base_convert/node_base_convert.yy",}, {"name":"node_bend","order":18,"path":"scripts/node_bend/node_bend.yy",}, @@ -790,7 +792,6 @@ {"name":"node_csv_file_read","order":8,"path":"scripts/node_csv_file_read/node_csv_file_read.yy",}, {"name":"node_csv_file_write","order":12,"path":"scripts/node_csv_file_write/node_csv_file_write.yy",}, {"name":"node_curve_hsv","order":18,"path":"scripts/node_curve_hsv/node_curve_hsv.yy",}, - {"name":"node_data","order":1,"path":"scripts/node_data/node_data.yy",}, {"name":"node_de_stray","order":1,"path":"scripts/node_de_stray/node_de_stray.yy",}, {"name":"node_delay","order":5,"path":"scripts/node_delay/node_delay.yy",}, {"name":"node_diffuse","order":2,"path":"scripts/node_diffuse/node_diffuse.yy",}, @@ -838,11 +839,11 @@ {"name":"node_fn","order":2,"path":"scripts/node_fn/node_fn.yy",}, {"name":"node_fold_noise","order":14,"path":"scripts/node_fold_noise/node_fold_noise.yy",}, {"name":"node_frame","order":1,"path":"scripts/node_frame/node_frame.yy",}, - {"name":"node_functions","order":2,"path":"scripts/node_functions/node_functions.yy",}, + {"name":"node_functions","order":1,"path":"scripts/node_functions/node_functions.yy",}, {"name":"node_FXAA","order":11,"path":"scripts/node_FXAA/node_FXAA.yy",}, {"name":"node_gabor_noise","order":11,"path":"scripts/node_gabor_noise/node_gabor_noise.yy",}, {"name":"node_gamma_map","order":15,"path":"scripts/node_gamma_map/node_gamma_map.yy",}, - {"name":"node_global","order":3,"path":"scripts/node_global/node_global.yy",}, + {"name":"node_global","order":2,"path":"scripts/node_global/node_global.yy",}, {"name":"node_glow","order":10,"path":"scripts/node_glow/node_glow.yy",}, {"name":"node_gradient_extract","order":13,"path":"scripts/node_gradient_extract/node_gradient_extract.yy",}, {"name":"node_gradient_out","order":5,"path":"scripts/node_gradient_out/node_gradient_out.yy",}, @@ -862,7 +863,7 @@ {"name":"node_group_input","order":1,"path":"scripts/node_group_input/node_group_input.yy",}, {"name":"node_group_output","order":2,"path":"scripts/node_group_output/node_group_output.yy",}, {"name":"node_group_thumbnail","order":3,"path":"scripts/node_group_thumbnail/node_group_thumbnail.yy",}, - {"name":"node_guide","order":10,"path":"scripts/node_guide/node_guide.yy",}, + {"name":"node_guide","order":8,"path":"scripts/node_guide/node_guide.yy",}, {"name":"node_herringbone_tile","order":7,"path":"scripts/node_herringbone_tile/node_herringbone_tile.yy",}, {"name":"node_hlsl","order":11,"path":"scripts/node_hlsl/node_hlsl.yy",}, {"name":"node_honey_noise","order":20,"path":"scripts/node_honey_noise/node_honey_noise.yy",}, @@ -898,7 +899,7 @@ {"name":"node_jpeg","order":23,"path":"scripts/node_jpeg/node_jpeg.yy",}, {"name":"node_json_file_read","order":7,"path":"scripts/node_json_file_read/node_json_file_read.yy",}, {"name":"node_json_file_write","order":11,"path":"scripts/node_json_file_write/node_json_file_write.yy",}, - {"name":"node_keyframe","order":4,"path":"scripts/node_keyframe/node_keyframe.yy",}, + {"name":"node_keyframe","order":3,"path":"scripts/node_keyframe/node_keyframe.yy",}, {"name":"node_kuwahara","order":21,"path":"scripts/node_kuwahara/node_kuwahara.yy",}, {"name":"node_lerp","order":2,"path":"scripts/node_lerp/node_lerp.yy",}, {"name":"node_level_selector","order":8,"path":"scripts/node_level_selector/node_level_selector.yy",}, @@ -1026,7 +1027,7 @@ {"name":"node_polar","order":4,"path":"scripts/node_polar/node_polar.yy",}, {"name":"node_posterize","order":12,"path":"scripts/node_posterize/node_posterize.yy",}, {"name":"node_print","order":8,"path":"scripts/node_print/node_print.yy",}, - {"name":"node_processor","order":7,"path":"scripts/node_processor/node_processor.yy",}, + {"name":"node_processor","order":5,"path":"scripts/node_processor/node_processor.yy",}, {"name":"node_project_data","order":21,"path":"scripts/node_project_data/node_project_data.yy",}, {"name":"node_pytagorean_tile","order":6,"path":"scripts/node_pytagorean_tile/node_pytagorean_tile.yy",}, {"name":"node_quasicrystal","order":9,"path":"scripts/node_quasicrystal/node_quasicrystal.yy",}, @@ -1037,7 +1038,7 @@ {"name":"node_raymarching","order":5,"path":"scripts/node_raymarching/node_raymarching.yy",}, {"name":"node_rd","order":4,"path":"scripts/node_rd/node_rd.yy",}, {"name":"node_region_fill","order":1,"path":"scripts/node_region_fill/node_region_fill.yy",}, - {"name":"node_registry","order":11,"path":"scripts/node_registry/node_registry.yy",}, + {"name":"node_registry","order":9,"path":"scripts/node_registry/node_registry.yy",}, {"name":"node_repeat_texture","order":23,"path":"scripts/node_repeat_texture/node_repeat_texture.yy",}, {"name":"node_repeat","order":5,"path":"scripts/node_repeat/node_repeat.yy",}, {"name":"node_rigid_activate","order":1,"path":"scripts/node_rigid_activate/node_rigid_activate.yy",}, @@ -1135,7 +1136,7 @@ {"name":"node_to_number","order":13,"path":"scripts/node_to_number/node_to_number.yy",}, {"name":"node_to_text","order":11,"path":"scripts/node_to_text/node_to_text.yy",}, {"name":"node_tonemap_ace","order":16,"path":"scripts/node_tonemap_ace/node_tonemap_ace.yy",}, - {"name":"node_tool","order":9,"path":"scripts/node_tool/node_tool.yy",}, + {"name":"node_tool","order":7,"path":"scripts/node_tool/node_tool.yy",}, {"name":"node_trail","order":15,"path":"scripts/node_trail/node_trail.yy",}, {"name":"node_transform_array","order":15,"path":"scripts/node_transform_array/node_transform_array.yy",}, {"name":"node_transform_single","order":1,"path":"scripts/node_transform_single/node_transform_single.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index df804feeb..b1707585b 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -119,10 +119,9 @@ {"$GMFolder":"","%Name":"misc","folderPath":"folders/misc.yy","name":"misc","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"fx","folderPath":"folders/misc/fx.yy","name":"fx","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"nodes","folderPath":"folders/nodes.yy","name":"nodes","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"__base__","folderPath":"folders/nodes/__base__.yy","name":"__base__","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"collections","folderPath":"folders/nodes/__base__/collections.yy","name":"collections","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"data","folderPath":"folders/nodes/data.yy","name":"data","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"__base__","folderPath":"folders/nodes/data/__base__.yy","name":"__base__","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"collections","folderPath":"folders/nodes/data/__base__/collections.yy","name":"collections","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"values","folderPath":"folders/nodes/data/__base__/values.yy","name":"values","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"3D","folderPath":"folders/nodes/data/3D.yy","name":"3D","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"__legacy","folderPath":"folders/nodes/data/3D/__legacy.yy","name":"__legacy","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"primitive","folderPath":"folders/nodes/data/3D/__legacy/primitive.yy","name":"primitive","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -243,6 +242,8 @@ {"$GMFolder":"","%Name":"surface","folderPath":"folders/nodes/icons/value/surface.yy","name":"surface","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"texts","folderPath":"folders/nodes/icons/value/texts.yy","name":"texts","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"VFX","folderPath":"folders/nodes/icons/VFX.yy","name":"VFX","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"values","folderPath":"folders/nodes/values.yy","name":"values","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"types","folderPath":"folders/nodes/values/types.yy","name":"types","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"panels","folderPath":"folders/panels.yy","name":"panels","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"_others","folderPath":"folders/panels/_others.yy","name":"_others","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"video_banner","folderPath":"folders/panels/_others/video_banner.yy","name":"video_banner","resourceType":"GMFolder","resourceVersion":"2.0",}, diff --git a/scripts/__add_node_item/__add_node_item.yy b/scripts/__add_node_item/__add_node_item.yy index 4e043321c..b6475d65c 100644 --- a/scripts/__add_node_item/__add_node_item.yy +++ b/scripts/__add_node_item/__add_node_item.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"__add_node_item", "isCompatibility":false, "isDnD":false, "name":"__add_node_item", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/__node/__node.yy b/scripts/__node/__node.yy index e4701ec89..c0067147d 100644 --- a/scripts/__node/__node.yy +++ b/scripts/__node/__node.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"__node", "isCompatibility":false, "isDnD":false, "name":"__node", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/__node_controller/__node_controller.yy b/scripts/__node_controller/__node_controller.yy index a13019c37..d12e4aa07 100644 --- a/scripts/__node_controller/__node_controller.yy +++ b/scripts/__node_controller/__node_controller.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"__node_controller", "isCompatibility":false, "isDnD":false, "name":"__node_controller", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/__node_module/__node_module.yy b/scripts/__node_module/__node_module.yy index 5ae989446..42229d871 100644 --- a/scripts/__node_module/__node_module.yy +++ b/scripts/__node_module/__node_module.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"__node_module", "isCompatibility":false, "isDnD":false, "name":"__node_module", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/__node_value_processor/__node_value_processor.yy b/scripts/__node_value_processor/__node_value_processor.yy index 522bd806e..1e8892c7a 100644 --- a/scripts/__node_value_processor/__node_value_processor.yy +++ b/scripts/__node_value_processor/__node_value_processor.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"__node_value_processor", "isCompatibility":false, "isDnD":false, "name":"__node_value_processor", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_attributes/node_attributes.yy b/scripts/node_attributes/node_attributes.yy index e16f41709..f9648248a 100644 --- a/scripts/node_attributes/node_attributes.yy +++ b/scripts/node_attributes/node_attributes.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_attributes", "isCompatibility":false, "isDnD":false, "name":"node_attributes", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_collection/node_collection.yy b/scripts/node_collection/node_collection.yy index 60ae446bd..d25a519a1 100644 --- a/scripts/node_collection/node_collection.yy +++ b/scripts/node_collection/node_collection.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_collection", "isCompatibility":false, "isDnD":false, "name":"node_collection", "parent":{ "name":"collections", - "path":"folders/nodes/data/__base__/collections.yy", + "path":"folders/nodes/__base__/collections.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_collection_inline/node_collection_inline.yy b/scripts/node_collection_inline/node_collection_inline.yy index 36fd7befe..e39cee24c 100644 --- a/scripts/node_collection_inline/node_collection_inline.yy +++ b/scripts/node_collection_inline/node_collection_inline.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_collection_inline", "isCompatibility":false, "isDnD":false, "name":"node_collection_inline", "parent":{ "name":"collections", - "path":"folders/nodes/data/__base__/collections.yy", + "path":"folders/nodes/__base__/collections.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_collection_managed/node_collection_managed.yy b/scripts/node_collection_managed/node_collection_managed.yy index 858d66bc4..942a56b6e 100644 --- a/scripts/node_collection_managed/node_collection_managed.yy +++ b/scripts/node_collection_managed/node_collection_managed.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_collection_managed", "isCompatibility":false, "isDnD":false, "name":"node_collection_managed", "parent":{ "name":"collections", - "path":"folders/nodes/data/__base__/collections.yy", + "path":"folders/nodes/__base__/collections.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index dddfa2521..4f33c1bc3 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -791,14 +791,19 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { } static getInputs = function(frame = CURRENT_FRAME) { - inputs_data = array_verify(inputs_data, ds_list_size(inputs)); + var i = -1; + var n = ds_list_size(inputs); + inputs_data = array_verify(inputs_data, n); - for(var i = 0; i < ds_list_size(inputs); i++) { + repeat(n) { i++; var _inp = inputs[| i]; if(!is_instanceof(_inp, NodeValue)) continue; var val = _inp.getValue(frame); - setInputData(i, val); + + // setInputData(i, val); + inputs_data[i] = val; + input_value_map[$ _inp.internalName] = val; } } diff --git a/scripts/node_data/node_data.yy b/scripts/node_data/node_data.yy index 5779d766f..66affebf5 100644 --- a/scripts/node_data/node_data.yy +++ b/scripts/node_data/node_data.yy @@ -6,7 +6,7 @@ "name":"node_data", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_functions/node_functions.yy b/scripts/node_functions/node_functions.yy index c5d8d4c69..66cdb5b02 100644 --- a/scripts/node_functions/node_functions.yy +++ b/scripts/node_functions/node_functions.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_functions", "isCompatibility":false, "isDnD":false, "name":"node_functions", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_global/node_global.yy b/scripts/node_global/node_global.yy index b1a049e1d..8d1ebec01 100644 --- a/scripts/node_global/node_global.yy +++ b/scripts/node_global/node_global.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_global", "isCompatibility":false, "isDnD":false, "name":"node_global", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_guide/node_guide.yy b/scripts/node_guide/node_guide.yy index d47499856..272353057 100644 --- a/scripts/node_guide/node_guide.yy +++ b/scripts/node_guide/node_guide.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_guide", "isCompatibility":false, "isDnD":false, "name":"node_guide", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_keyframe/node_keyframe.yy b/scripts/node_keyframe/node_keyframe.yy index 9427de900..f36a3da78 100644 --- a/scripts/node_keyframe/node_keyframe.yy +++ b/scripts/node_keyframe/node_keyframe.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_keyframe", "isCompatibility":false, "isDnD":false, "name":"node_keyframe", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_pin/node_pin.gml b/scripts/node_pin/node_pin.gml index f53acb56d..e496aa53b 100644 --- a/scripts/node_pin/node_pin.gml +++ b/scripts/node_pin/node_pin.gml @@ -9,6 +9,7 @@ function Node_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { hover_scale = 0; hover_scale_to = 0; hover_alpha = 0; + hover_junction = noone; bg_spr_add = 0; @@ -57,14 +58,18 @@ function Node_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { var hover = _dval == noone || _dval.connect_type == JUNCTION_CONNECT.input? outputs[| 0] : inputs[| 0]; var xx = x * _s + _x; var yy = y * _s + _y; - isHovering = point_in_circle(_mx, _my, xx, yy, _s * 24); + + isHovering = point_in_circle(_mx, _my, xx, yy, _s * 24); + hover_junction = noone; var jhov = hover.drawJunction(_s, _mx, _my); if(!isHovering) return noone; + hover_junction = jhov? hover : noone; hover_scale_to = 1; - return jhov? hover : noone; + + return hover_junction; } static drawNode = function(_x, _y, _mx, _my, _s) { @@ -72,17 +77,22 @@ function Node_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { var yy = y * _s + _y; hover_alpha = 0.5; + if(active_draw_index > -1) { hover_alpha = 1; hover_scale_to = 1; active_draw_index = -1; - } + } if(hover_scale > 0) { - var _r = hover_scale * _s * 16; + var _r = _s * 16; shader_set(sh_node_circle); shader_set_color("color", COLORS._main_accent, hover_alpha); + shader_set_f("radius", .5 * hover_scale); + draw_sprite_stretched(s_fx_pixel, 0, xx - _r, yy - _r, _r * 2, _r * 2); + + shader_set_f("radius", 0); shader_reset(); } diff --git a/scripts/node_processor/node_processor.gml b/scripts/node_processor/node_processor.gml index c2dcd65d9..5475d542b 100644 --- a/scripts/node_processor/node_processor.gml +++ b/scripts/node_processor/node_processor.gml @@ -326,7 +326,10 @@ function Node_Processor(_x, _y, _group = noone) : Node(_x, _y, _group) construct else if(amo == 1) val = raw[0]; //spread single array amo = max(1, amo); - setInputData(i, val); + //setInputData(i, val); + inputs_data[i] = val; + input_value_map[$ _in.internalName] = val; + inputs_is_array[i] = _in.isArray(val); switch(attributes.array_process) { diff --git a/scripts/node_processor/node_processor.yy b/scripts/node_processor/node_processor.yy index 0c6f80d0f..893c7fd04 100644 --- a/scripts/node_processor/node_processor.yy +++ b/scripts/node_processor/node_processor.yy @@ -6,7 +6,7 @@ "name":"node_processor", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_registry/node_registry.yy b/scripts/node_registry/node_registry.yy index 89f8acbbc..d7b483962 100644 --- a/scripts/node_registry/node_registry.yy +++ b/scripts/node_registry/node_registry.yy @@ -6,7 +6,7 @@ "name":"node_registry", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_tool/node_tool.yy b/scripts/node_tool/node_tool.yy index 08ccefb0c..fa229f18a 100644 --- a/scripts/node_tool/node_tool.yy +++ b/scripts/node_tool/node_tool.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_tool", "isCompatibility":false, "isDnD":false, "name":"node_tool", "parent":{ "name":"__base__", - "path":"folders/nodes/data/__base__.yy", + "path":"folders/nodes/__base__.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_value/node_value.gml b/scripts/node_value/node_value.gml index a5fde0bd5..8facb29cb 100644 --- a/scripts/node_value/node_value.gml +++ b/scripts/node_value/node_value.gml @@ -1209,7 +1209,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru } } - static arrayBalance = function(val) { #region + static arrayBalance = function(val) { if(!is_array(def_val)) return val; @@ -1226,9 +1226,9 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru array_resize(val, def_length); return val; - } #endregion + } - static __getAnimValue = function(_time = CURRENT_FRAME) { #region + static __getAnimValue = function(_time = CURRENT_FRAME) { if(value_tag == "dimension" && node.attributes.use_project_dimension) return PROJECT.attributes.surface_dimension; @@ -1254,7 +1254,7 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru } return animator.getValue(_time); - } #endregion + } static isTimelineVisible = function() { INLINE return is_anim && value_from == noone; } @@ -1482,8 +1482,13 @@ function NodeValue(_name, _node, _connect, _type, _value, _tooltip = "") constru return; } - if(is_instanceof(node, Node) && self.index >= 0) - node.setInputData(self.index, animator.getValue(time)); + if(is_instanceof(node, Node) && self.index >= 0) { + var _val = animator.getValue(time); + + // setInputData(self.index, _val); + node.inputs_data[self.index] = _val; + node.input_value_map[$ internalName] = _val; + } if(tags == VALUE_TAG.updateInTrigger || tags == VALUE_TAG.updateOutTrigger) return true; diff --git a/scripts/node_value/node_value.yy b/scripts/node_value/node_value.yy index 579996a81..dca153de4 100644 --- a/scripts/node_value/node_value.yy +++ b/scripts/node_value/node_value.yy @@ -6,7 +6,7 @@ "name":"node_value", "parent":{ "name":"values", - "path":"folders/nodes/data/__base__/values.yy", + "path":"folders/nodes/values.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_value_base/node_value_base.yy b/scripts/node_value_base/node_value_base.yy index 842785d27..fb92a6003 100644 --- a/scripts/node_value_base/node_value_base.yy +++ b/scripts/node_value_base/node_value_base.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_value_base", "isCompatibility":false, "isDnD":false, "name":"node_value_base", "parent":{ "name":"values", - "path":"folders/nodes/data/__base__/values.yy", + "path":"folders/nodes/values.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_value_types/node_value_types.yy b/scripts/node_value_types/node_value_types.yy index 0e8eb25ed..3bf1776a0 100644 --- a/scripts/node_value_types/node_value_types.yy +++ b/scripts/node_value_types/node_value_types.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_value_types", "isCompatibility":false, "isDnD":false, "name":"node_value_types", "parent":{ "name":"values", - "path":"folders/nodes/data/__base__/values.yy", + "path":"folders/nodes/values.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/scripts/node_value_validators/node_value_validators.yy b/scripts/node_value_validators/node_value_validators.yy index 18f738964..bc3fb2cd6 100644 --- a/scripts/node_value_validators/node_value_validators.yy +++ b/scripts/node_value_validators/node_value_validators.yy @@ -1,12 +1,12 @@ { - "$GMScript":"v1", + "$GMScript":"", "%Name":"node_value_validators", "isCompatibility":false, "isDnD":false, "name":"node_value_validators", "parent":{ "name":"values", - "path":"folders/nodes/data/__base__/values.yy", + "path":"folders/nodes/values.yy", }, "resourceType":"GMScript", "resourceVersion":"2.0", diff --git a/shaders/sh_node_circle/sh_node_circle.fsh b/shaders/sh_node_circle/sh_node_circle.fsh index 70782b8ce..cb2b91f1a 100644 --- a/shaders/sh_node_circle/sh_node_circle.fsh +++ b/shaders/sh_node_circle/sh_node_circle.fsh @@ -5,12 +5,14 @@ uniform vec4 color; uniform int fill; uniform float thickness; uniform float antialias; +uniform float radius; void main() { float th = thickness == 0.? 0.05 : thickness; float aa = antialias == 0.? 0.05 : antialias; + float rr = radius == 0.? 0.5 : radius; - float dist = length(v_vTexcoord - .5) * 2. - (1. - th - aa); + float dist = length(v_vTexcoord - .5) / rr - (1. - th - aa); float a; if(fill == 0) {