diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index 1de24cfd8..8a396af26 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -1163,6 +1163,7 @@ {"name":"node_value_dimension","order":20,"path":"scripts/node_value_dimension/node_value_dimension.yy",}, {"name":"node_value_enum_button","order":6,"path":"scripts/node_value_enum_button/node_value_enum_button.yy",}, {"name":"node_value_enum_scroll","order":7,"path":"scripts/node_value_enum_scroll/node_value_enum_scroll.yy",}, + {"name":"node_value_fdomain","order":8,"path":"scripts/node_value_fdomain/node_value_fdomain.yy",}, {"name":"node_value_gradient","order":1,"path":"scripts/node_value_gradient/node_value_gradient.yy",}, {"name":"node_value_int","order":1,"path":"scripts/node_value_int/node_value_int.yy",}, {"name":"node_value_output","order":1,"path":"scripts/node_value_output/node_value_output.yy",}, @@ -1181,6 +1182,7 @@ {"name":"node_value_struct","order":7,"path":"scripts/node_value_struct/node_value_struct.yy",}, {"name":"node_value_surface","order":9,"path":"scripts/node_value_surface/node_value_surface.yy",}, {"name":"node_value_text","order":14,"path":"scripts/node_value_text/node_value_text.yy",}, + {"name":"node_value_toggle","order":21,"path":"scripts/node_value_toggle/node_value_toggle.yy",}, {"name":"node_value_trigger","order":19,"path":"scripts/node_value_trigger/node_value_trigger.yy",}, {"name":"node_value_types","order":2,"path":"scripts/node_value_types/node_value_types.yy",}, {"name":"node_value_validators","order":3,"path":"scripts/node_value_validators/node_value_validators.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index a57dcf331..ce161d68e 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -1768,6 +1768,7 @@ {"id":{"name":"node_value_dimension","path":"scripts/node_value_dimension/node_value_dimension.yy",},}, {"id":{"name":"node_value_enum_button","path":"scripts/node_value_enum_button/node_value_enum_button.yy",},}, {"id":{"name":"node_value_enum_scroll","path":"scripts/node_value_enum_scroll/node_value_enum_scroll.yy",},}, + {"id":{"name":"node_value_fdomain","path":"scripts/node_value_fdomain/node_value_fdomain.yy",},}, {"id":{"name":"node_value_float","path":"scripts/node_value_float/node_value_float.yy",},}, {"id":{"name":"node_value_gradient","path":"scripts/node_value_gradient/node_value_gradient.yy",},}, {"id":{"name":"node_value_int","path":"scripts/node_value_int/node_value_int.yy",},}, @@ -1787,6 +1788,7 @@ {"id":{"name":"node_value_struct","path":"scripts/node_value_struct/node_value_struct.yy",},}, {"id":{"name":"node_value_surface","path":"scripts/node_value_surface/node_value_surface.yy",},}, {"id":{"name":"node_value_text","path":"scripts/node_value_text/node_value_text.yy",},}, + {"id":{"name":"node_value_toggle","path":"scripts/node_value_toggle/node_value_toggle.yy",},}, {"id":{"name":"node_value_trigger","path":"scripts/node_value_trigger/node_value_trigger.yy",},}, {"id":{"name":"node_value_types","path":"scripts/node_value_types/node_value_types.yy",},}, {"id":{"name":"node_value_validators","path":"scripts/node_value_validators/node_value_validators.yy",},}, diff --git a/scripts/__node_3d_combine/__node_3d_combine.gml b/scripts/__node_3d_combine/__node_3d_combine.gml index 76d4142d5..e48c2ccbc 100644 --- a/scripts/__node_3d_combine/__node_3d_combine.gml +++ b/scripts/__node_3d_combine/__node_3d_combine.gml @@ -4,52 +4,47 @@ function __Node_3D_Combine(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 0] = nodeValue_Dimension(self) .rejectArray(); - inputs[| 1] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]) .rejectArray(); - inputs[| 2] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]) .rejectArray(); - inputs[| 3] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]) .rejectArray(); - inputs[| 4] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef( function() { return getInputData(2); }, VALUE_UNIT.reference) .rejectArray(); - inputs[| 5] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 5] = nodeValue_Vector("Render scale", self, [ 1, 1 ]) .rejectArray(); inputs[| 6] = nodeValue_Rotation("Light direction", self, 0) .rejectArray(); - inputs[| 7] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 7] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }) .rejectArray(); - inputs[| 8] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 8] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); - inputs[| 9] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white) + inputs[| 9] = nodeValue_Color("Light color", self, c_white) .rejectArray(); - inputs[| 10] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey) + inputs[| 10] = nodeValue_Color("Ambient color", self, c_grey) .rejectArray(); inputs[| 11] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 12] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 12] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 90, 0.1 ] }) .rejectArray(); - inputs[| 13] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 13] = nodeValue_Bool("Scale view with dimension", self, true) input_display_list = [ ["Output", false], 0, 13, @@ -59,11 +54,11 @@ function __Node_3D_Combine(_x, _y, _group = noone) : Node(_x, _y, _group) constr ["Objects", true], ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D objects", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D objects", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); output_display_list = [ 0, 2, 1 ] diff --git a/scripts/__node_3d_displace/__node_3d_displace.gml b/scripts/__node_3d_displace/__node_3d_displace.gml index b842ed965..0f88c91c7 100644 --- a/scripts/__node_3d_displace/__node_3d_displace.gml +++ b/scripts/__node_3d_displace/__node_3d_displace.gml @@ -4,33 +4,28 @@ function __Node_3D_Displace(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); - inputs[| 2] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); - inputs[| 4] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef( function() { return getInputData(0); }, VALUE_UNIT.reference); - inputs[| 5] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); inputs[| 6] = nodeValue_Rotation("Light direction", self, 0); - inputs[| 7] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 7] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 8] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 8] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 9] = nodeValue_Color("Light color", self, c_white); - inputs[| 10] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 10] = nodeValue_Color("Ambient color", self, c_grey); inputs[| 11] = nodeValue("3D vertex", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3vertex, []) .setVisible(true, true); @@ -38,14 +33,14 @@ function __Node_3D_Displace(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 12] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 13] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 13] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 14] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 14] = nodeValue_Bool("Scale view with dimension", self, true); inputs[| 15] = nodeValue_Surface("Displacement map", self); - inputs[| 16] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 16] = nodeValue_Float("Strength", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }); input_display_list = [ 11, @@ -56,13 +51,13 @@ function __Node_3D_Displace(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr ["Light", true], 6, 7, 8, 9, 10, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); - outputs[| 3] = nodeValue("3D vertex", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3vertex, []); + outputs[| 3] = nodeValue_Output("3D vertex", self, VALUE_TYPE.d3vertex, []); output_display_list = [ 0, 2, 1, 3, diff --git a/scripts/__node_3d_export/__node_3d_export.gml b/scripts/__node_3d_export/__node_3d_export.gml index 377a95f56..53c1815cd 100644 --- a/scripts/__node_3d_export/__node_3d_export.gml +++ b/scripts/__node_3d_export/__node_3d_export.gml @@ -4,10 +4,10 @@ function __Node_3D_Export(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 0] = nodeValue("Vertex data", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3vertex, [] ) .setVisible(true, true); - inputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "", "Export location without '.obj' extension." ) + inputs[| 1] = nodeValue_Text("Path", self, "", "Export location without '.obj' extension." ) .setDisplay(VALUE_DISPLAY.path_save, { filter: "3d object|*.obj" }); - inputs[| 2] = nodeValue("Export texture", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 2] = nodeValue_Bool("Export texture", self, true ); input_display_list = [ 0, ["Export", false], 1, 2, diff --git a/scripts/__node_3d_extrude/__node_3d_extrude.gml b/scripts/__node_3d_extrude/__node_3d_extrude.gml index 7e635e152..68871c803 100644 --- a/scripts/__node_3d_extrude/__node_3d_extrude.gml +++ b/scripts/__node_3d_extrude/__node_3d_extrude.gml @@ -6,52 +6,46 @@ function __Node_3D_Extrude(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 180, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Object rotation", self, [ 0, 180, 0 ]); - inputs[| 4] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 0.1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Object scale", self, [ 1, 1, 0.1 ]); - inputs[| 5] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 5] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef( function() { return getInputData(1); }, VALUE_UNIT.reference); - inputs[| 6] = nodeValue("Render rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Render rotation", self, [ 0, 0, 0 ]); - inputs[| 7] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); - inputs[| 8] = nodeValue("Manual generate", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 8] = nodeValue_Trigger("Manual generate", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Generate", UI : true, onClick: function() { generateMesh(); doUpdate(); } }); inputs[| 9] = nodeValue_Rotation("Light direction", self, 0); - inputs[| 10] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 10] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 11] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 11] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 12] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); - inputs[| 13] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 12] = nodeValue_Color("Light color", self, c_white); + inputs[| 13] = nodeValue_Color("Ambient color", self, c_grey); inputs[| 14] = nodeValue_Surface("Height map", self); - inputs[| 15] = nodeValue("Always update", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 15] = nodeValue_Bool("Always update", self, false); inputs[| 16] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 17] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 17] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 18] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 18] = nodeValue_Bool("Scale view with dimension", self, true) - inputs[| 19] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 19] = nodeValue_Bool("Smooth", self, false) input_display_list = [ ["Output", false], 1, 18, @@ -61,13 +55,13 @@ function __Node_3D_Extrude(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro ["Light", false], 9, 10, 11, 12, 13, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function(index) { return submit_vertex(index); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function(index) { return submit_vertex(index); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); - outputs[| 3] = nodeValue("3D vertex", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3vertex, []); + outputs[| 3] = nodeValue_Output("3D vertex", self, VALUE_TYPE.d3vertex, []); output_display_list = [ 0, 2, 1, 3 diff --git a/scripts/__node_3d_light/__node_3d_light.gml b/scripts/__node_3d_light/__node_3d_light.gml index 02c1626e8..cf0541a8c 100644 --- a/scripts/__node_3d_light/__node_3d_light.gml +++ b/scripts/__node_3d_light/__node_3d_light.gml @@ -4,16 +4,16 @@ function Node_3D_Light(_x, _y, _group = noone) : Node_3D_Object(_x, _y, _group) if(!LOADING && !APPENDING) inputs[| 0].setValue([ 0, 0, 1 ]); - inputs[| in_d3d + 0] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| in_d3d + 0] = nodeValue_Bool("Active", self, true); - inputs[| in_d3d + 1] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| in_d3d + 1] = nodeValue_Color("Color", self, c_white); - inputs[| in_d3d + 2] = nodeValue("Intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| in_d3d + 2] = nodeValue_Float("Intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); in_light = ds_list_size(inputs); - outputs[| 0] = nodeValue("Light", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Light, noone); + outputs[| 0] = nodeValue_Output("Light", self, VALUE_TYPE.d3Light, noone); #macro __d3d_input_list_light ["Light", false], in_d3d + 0, in_d3d + 1, in_d3d + 2 diff --git a/scripts/__node_3d_mesh/__node_3d_mesh.gml b/scripts/__node_3d_mesh/__node_3d_mesh.gml index d9717fa8f..06c649e0e 100644 --- a/scripts/__node_3d_mesh/__node_3d_mesh.gml +++ b/scripts/__node_3d_mesh/__node_3d_mesh.gml @@ -3,7 +3,7 @@ function Node_3D_Mesh(_x, _y, _group = noone) : Node_3D_Object(_x, _y, _group) c in_mesh = ds_list_size(inputs); - outputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Mesh, noone); + outputs[| 0] = nodeValue_Output("Mesh", self, VALUE_TYPE.d3Mesh, noone); #macro __d3d_input_list_mesh ["Mesh", false] diff --git a/scripts/__node_3d_modifier/__node_3d_modifier.gml b/scripts/__node_3d_modifier/__node_3d_modifier.gml index e407e03d8..f3118dc22 100644 --- a/scripts/__node_3d_modifier/__node_3d_modifier.gml +++ b/scripts/__node_3d_modifier/__node_3d_modifier.gml @@ -1,12 +1,12 @@ function Node_3D_Modifier(_x, _y, _group = noone) : Node_3D(_x, _y, _group) constructor { name = "3D Mesh Modifier"; - inputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Mesh, noone) + inputs[| 0] = nodeValue_D3Mesh("Mesh", self, noone) .setVisible(true, true); in_mesh = ds_list_size(inputs); - outputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Mesh, noone); + outputs[| 0] = nodeValue_Output("Mesh", self, VALUE_TYPE.d3Mesh, noone); static modify_object = function(_object, _data, _matrix) { #region return _object; diff --git a/scripts/__node_3d_obj/__node_3d_obj.gml b/scripts/__node_3d_obj/__node_3d_obj.gml index 4969525d3..47c39b030 100644 --- a/scripts/__node_3d_obj/__node_3d_obj.gml +++ b/scripts/__node_3d_obj/__node_3d_obj.gml @@ -1,11 +1,11 @@ function __Node_3D_Obj(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "3D Object"; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "3d object|*.obj" }) .rejectArray(); - inputs[| 1] = nodeValue("Generate", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 1] = nodeValue_Trigger("Generate", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Generate", UI : true, onClick: function() { updateObj(); doUpdate(); @@ -13,53 +13,47 @@ function __Node_3D_Obj(_x, _y, _group = noone) : Node(_x, _y, _group) constructo inputs[| 2] = nodeValue_Dimension(self); - inputs[| 3] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef( function() { return getInputData(2); }, VALUE_UNIT.reference); - inputs[| 4] = nodeValue("Render rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Render rotation", self, [ 0, 0, 0 ]); - inputs[| 5] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); inputs[| 6] = nodeValue_Rotation("Light direction", self, 0) .rejectArray(); - inputs[| 7] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 7] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }) .rejectArray(); - inputs[| 8] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 8] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); - inputs[| 9] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white) + inputs[| 9] = nodeValue_Color("Light color", self, c_white) .rejectArray(); - inputs[| 10] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey) + inputs[| 10] = nodeValue_Color("Ambient color", self, c_grey) .rejectArray(); - inputs[| 11] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 11] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); - inputs[| 12] = nodeValue("Flip UV", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Flip UV axis, can be use to fix some texture mapping error.") + inputs[| 12] = nodeValue_Bool("Flip UV", self, true, "Flip UV axis, can be use to fix some texture mapping error.") .rejectArray(); - inputs[| 13] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 180 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 13] = nodeValue_Vector("Object rotation", self, [ 0, 0, 180 ]); - inputs[| 14] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 14] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); inputs[| 15] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 16] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 16] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 90, 0.1 ] }) .rejectArray(); - inputs[| 17] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 17] = nodeValue_Bool("Scale view with dimension", self, true) input_display_list = [ ["Output", false], 2, 17, @@ -72,11 +66,11 @@ function __Node_3D_Obj(_x, _y, _group = noone) : Node(_x, _y, _group) constructo input_length = ds_list_size(inputs); input_display_len = array_length(input_display_list); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); output_display_list = [ 0, 2, 1 @@ -109,7 +103,7 @@ function __Node_3D_Obj(_x, _y, _group = noone) : Node(_x, _y, _group) constructo function createMaterial(m_index) { var index = ds_list_size(inputs); - inputs[| index] = nodeValue(materialNames[m_index] + " texture", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, tex_surface); + inputs[| index] = nodeValue_Surface(materialNames[m_index] + " texture", self, tex_surface); inputs[| index].setVisible(true); input_display_list[input_display_len + m_index] = index; diff --git a/scripts/__node_3d_object/__node_3d_object.gml b/scripts/__node_3d_object/__node_3d_object.gml index 313d5769d..329e06aad 100644 --- a/scripts/__node_3d_object/__node_3d_object.gml +++ b/scripts/__node_3d_object/__node_3d_object.gml @@ -8,17 +8,13 @@ function Node_3D_Object(_x, _y, _group = noone) : Node_3D(_x, _y, _group) constr preview_channel = 0; apply_anchor = false; - inputs[| 0] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector, { linkable: false }); + inputs[| 0] = nodeValue_Vector("Position", self, [ 0, 0, 0 ], { linkable: false }); - inputs[| 1] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 1 ]) - .setDisplay(VALUE_DISPLAY.d3quarternion); + inputs[| 1] = nodeValue_Quaternion("Rotation", self, [ 0, 0, 0, 1 ]); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 1, 1, 1 ]); - inputs[| 3] = nodeValue("Anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector, { + inputs[| 3] = nodeValue_Vector("Anchor", self, [ 0, 0, 0 ], { linkable: false, side_button : button(function() { apply_anchor = !apply_anchor; triggerRender(); }) .setIcon(THEME.icon_3d_anchor, [ function() /*=>*/ {return apply_anchor} ], c_white) diff --git a/scripts/__node_3d_plane/__node_3d_plane.gml b/scripts/__node_3d_plane/__node_3d_plane.gml index 7d9e4aa3b..14db058b3 100644 --- a/scripts/__node_3d_plane/__node_3d_plane.gml +++ b/scripts/__node_3d_plane/__node_3d_plane.gml @@ -4,41 +4,33 @@ function __Node_3D_Plane(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - inputs[| 2] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); inputs[| 4] = nodeValue_Enum_Scroll("Output dimension", self, OUTPUT_SCALING.same_as_input, [ "Same as input", "Constant", "Relative to input" ]) .rejectArray(); - inputs[| 5] = nodeValue("Constant dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Constant dimension", self, DEF_SURF); - inputs[| 6] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); - inputs[| 7] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); inputs[| 8] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 9] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 9] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 10] = nodeValue("Texture scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 10] = nodeValue_Vector("Texture scale", self, [ 1, 1 ]); - inputs[| 11] = nodeValue("Texture shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 11] = nodeValue_Vector("Texture shift", self, [ 0, 0 ]); - inputs[| 12] = nodeValue("Subdiviion", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 12] = nodeValue_Int("Subdiviion", self, 1) inputs[| 13] = nodeValue_Enum_Button("Normal axis", self, 2, [ "X", "Y", "Z" ]); @@ -50,11 +42,11 @@ function __Node_3D_Plane(_x, _y, _group = noone) : Node_Processor(_x, _y, _group ["Texture", false], 10, 11, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("3D vertex", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3vertex, []); + outputs[| 2] = nodeValue_Output("3D vertex", self, VALUE_TYPE.d3vertex, []); output_display_list = [ 0, 1, 2 diff --git a/scripts/__node_3d_prim_cone/__node_3d_prim_cone.gml b/scripts/__node_3d_prim_cone/__node_3d_prim_cone.gml index e5fa38ad9..c51a907ea 100644 --- a/scripts/__node_3d_prim_cone/__node_3d_prim_cone.gml +++ b/scripts/__node_3d_prim_cone/__node_3d_prim_cone.gml @@ -4,49 +4,43 @@ function __Node_3D_Cone(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - inputs[| 2] = nodeValue("Render rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Render rotation", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); - inputs[| 4] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); inputs[| 5] = nodeValue_Rotation("Light direction", self, 0); - inputs[| 6] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 6] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 7] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 7] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); - inputs[| 9] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 8] = nodeValue_Color("Light color", self, c_white); + inputs[| 9] = nodeValue_Color("Ambient color", self, c_grey); - inputs[| 10] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 10] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]); - inputs[| 11] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 11] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); inputs[| 12] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 13] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 13] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 14] = nodeValue("Sides", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 16); + inputs[| 14] = nodeValue_Int("Sides", self, 16); inputs[| 15] = nodeValue_Surface("Textures base", self); inputs[| 16] = nodeValue_Surface("Textures side", self); - inputs[| 17] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 17] = nodeValue_Bool("Scale view with dimension", self, true) input_display_list = [ ["Output", false], 0, 17, @@ -57,13 +51,13 @@ function __Node_3D_Cone(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Light", false], 5, 6, 7, 8, 9, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); - outputs[| 3] = nodeValue("3D vertex", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3vertex, []); + outputs[| 3] = nodeValue_Output("3D vertex", self, VALUE_TYPE.d3vertex, []); output_display_list = [ 0, 2, 1, 3 diff --git a/scripts/__node_3d_prim_cube/__node_3d_prim_cube.gml b/scripts/__node_3d_prim_cube/__node_3d_prim_cube.gml index 5ae204ec0..17bd6c0e8 100644 --- a/scripts/__node_3d_prim_cube/__node_3d_prim_cube.gml +++ b/scripts/__node_3d_prim_cube/__node_3d_prim_cube.gml @@ -7,17 +7,14 @@ function __Node_3D_Cube(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - inputs[| 3] = nodeValue("Render rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Render rotation", self, [ 0, 0, 0 ]); - inputs[| 4] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); - inputs[| 5] = nodeValue("Textures per face", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 5] = nodeValue_Bool("Textures per face", self, false); inputs[| 6] = nodeValue_Surface("Textures 0", self).setVisible(false); inputs[| 7] = nodeValue_Surface("Textures 1", self).setVisible(false); @@ -26,34 +23,31 @@ function __Node_3D_Cube(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 10] = nodeValue_Surface("Textures 4", self).setVisible(false); inputs[| 11] = nodeValue_Surface("Textures 5", self).setVisible(false); - inputs[| 12] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 12] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); inputs[| 13] = nodeValue_Rotation("Light direction", self, 0); - inputs[| 14] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 14] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 15] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 15] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 16] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 16] = nodeValue_Color("Light color", self, c_white); - inputs[| 17] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 17] = nodeValue_Color("Ambient color", self, c_grey); - inputs[| 18] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 18] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]); - inputs[| 19] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 19] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); inputs[| 20] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 21] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 21] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 22] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 22] = nodeValue_Bool("Scale view with dimension", self, true) input_display_list = [ ["Output", false], 1, 22, @@ -63,13 +57,13 @@ function __Node_3D_Cube(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Light", false], 13, 14, 15, 16, 17, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function(index) { return submit_vertex(index); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function(index) { return submit_vertex(index); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); - outputs[| 3] = nodeValue("3D vertex", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3vertex, []); + outputs[| 3] = nodeValue_Output("3D vertex", self, VALUE_TYPE.d3vertex, []); output_display_list = [ 0, 2, 1, 3 diff --git a/scripts/__node_3d_prim_cylinder/__node_3d_prim_cylinder.gml b/scripts/__node_3d_prim_cylinder/__node_3d_prim_cylinder.gml index c0d147562..4800975d8 100644 --- a/scripts/__node_3d_prim_cylinder/__node_3d_prim_cylinder.gml +++ b/scripts/__node_3d_prim_cylinder/__node_3d_prim_cylinder.gml @@ -3,56 +3,50 @@ function __Node_3D_Cylinder(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr batch_output = false; dimension_index = 2; - inputs[| 0] = nodeValue("Sides", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 16); + inputs[| 0] = nodeValue_Int("Sides", self, 16); - inputs[| 1] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2); + inputs[| 1] = nodeValue_Float("Thickness", self, 0.2); inputs[| 2] = nodeValue_Dimension(self); - inputs[| 3] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - inputs[| 4] = nodeValue("Render rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Render rotation", self, [ 0, 0, 0 ]); - inputs[| 5] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); inputs[| 6] = nodeValue_Surface("Textures top", self); inputs[| 7] = nodeValue_Surface("Textures bottom", self); inputs[| 8] = nodeValue_Surface("Textures side", self); - inputs[| 9] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 9] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); inputs[| 10] = nodeValue_Rotation("Light direction", self, 0); - inputs[| 11] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 11] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 12] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 13] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); - inputs[| 14] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 13] = nodeValue_Color("Light color", self, c_white); + inputs[| 14] = nodeValue_Color("Ambient color", self, c_grey); - inputs[| 15] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 15] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]); - inputs[| 16] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 16] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); inputs[| 17] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 18] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 18] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 19] = nodeValue("Taper", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 19] = nodeValue_Float("Taper", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 20] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 20] = nodeValue_Bool("Scale view with dimension", self, true) input_display_list = [ ["Output", false], 2, 20, @@ -63,13 +57,13 @@ function __Node_3D_Cylinder(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr ["Light", false], 10, 11, 12, 13, 14, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); - outputs[| 3] = nodeValue("3D vertex", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3vertex, []); + outputs[| 3] = nodeValue_Output("3D vertex", self, VALUE_TYPE.d3vertex, []); output_display_list = [ 0, 2, 1, 3 diff --git a/scripts/__node_3d_prim_sphere/__node_3d_prim_sphere.gml b/scripts/__node_3d_prim_sphere/__node_3d_prim_sphere.gml index e2e5162c1..1c62615dc 100644 --- a/scripts/__node_3d_prim_sphere/__node_3d_prim_sphere.gml +++ b/scripts/__node_3d_prim_sphere/__node_3d_prim_sphere.gml @@ -3,50 +3,44 @@ function __Node_3D_Sphere(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou batch_output = false; dimension_index = 1; - inputs[| 0] = nodeValue("Subdivisions", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [8, 4], "Amount of polygon in X and Y axis.") - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 0] = nodeValue_Vector("Subdivisions", self, [8, 4]) + .setTooltip("Amount of polygon in X and Y axis."); inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - inputs[| 3] = nodeValue("Render rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Render rotation", self, [ 0, 0, 0 ]); - inputs[| 4] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); inputs[| 5] = nodeValue_Surface("Textures", self); - inputs[| 6] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); inputs[| 7] = nodeValue_Rotation("Light direction", self, 0); - inputs[| 8] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 8] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 9] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 9] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); - inputs[| 11] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 10] = nodeValue_Color("Light color", self, c_white); + inputs[| 11] = nodeValue_Color("Ambient color", self, c_grey); - inputs[| 12] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 12] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]); - inputs[| 13] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 13] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); inputs[| 14] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 15] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 15] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 16] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 16] = nodeValue_Bool("Scale view with dimension", self, true) input_display_list = [ ["Output", false], 1, 16, @@ -57,13 +51,13 @@ function __Node_3D_Sphere(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ["Light", false], 7, 8, 9, 10, 11, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); - outputs[| 3] = nodeValue("3D vertex", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3vertex, []); + outputs[| 3] = nodeValue_Output("3D vertex", self, VALUE_TYPE.d3vertex, []); output_display_list = [ 0, 2, 1, 3 ] diff --git a/scripts/__node_3d_render/__node_3d_render.gml b/scripts/__node_3d_render/__node_3d_render.gml index d50949898..c9bdea687 100644 --- a/scripts/__node_3d_render/__node_3d_render.gml +++ b/scripts/__node_3d_render/__node_3d_render.gml @@ -3,42 +3,39 @@ // inputs[| 2] = nodeValue_Dimension(self); -// inputs[| 3] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) -// .setDisplay(VALUE_DISPLAY.vector) +// inputs[| 3] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) // .setUnitRef( function() { return getInputData(2); }, VALUE_UNIT.reference); -// inputs[| 4] = nodeValue("Render rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) -// .setDisplay(VALUE_DISPLAY.vector); +// inputs[| 4] = nodeValue_Vector("Render rotation", self, [ 0, 0, 0 ]); -// inputs[| 5] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) -// .setDisplay(VALUE_DISPLAY.vector); +// inputs[| 5] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); -// inputs[| 6] = nodeValue("Light direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) +// inputs[| 6] = nodeValue_Float("Light direction", self, 0) // .setDisplay(VALUE_DISPLAY.rotation) // .rejectArray(); -// inputs[| 7] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) +// inputs[| 7] = nodeValue_Float("Light height", self, 0.5) // .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }) // .rejectArray(); -// inputs[| 8] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) +// inputs[| 8] = nodeValue_Float("Light intensity", self, 1) // .setDisplay(VALUE_DISPLAY.slider) // .rejectArray(); -// inputs[| 9] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white) +// inputs[| 9] = nodeValue_Color("Light color", self, c_white) // .rejectArray(); -// inputs[| 10] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey) +// inputs[| 10] = nodeValue_Color("Ambient color", self, c_grey) // .rejectArray(); // inputs[| 15] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) // .rejectArray(); -// inputs[| 16] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) +// inputs[| 16] = nodeValue_Float("Field of view", self, 60) // .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 90, 1 ] }) // .rejectArray(); -// inputs[| 17] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) +// inputs[| 17] = nodeValue_Bool("Scale view with dimension", self, true) // input_display_list = [ // ["Output", false], 2, 17, @@ -51,11 +48,11 @@ // input_length = ds_list_size(inputs); // input_display_len = array_length(input_display_list); -// outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); +// outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); -// outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); +// outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); -// outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); +// outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); // output_display_list = [ // 0, 2, 1 @@ -84,7 +81,7 @@ // function createMaterial(m_index) { // var index = ds_list_size(inputs); -// inputs[| index] = nodeValue(materialNames[m_index] + " texture", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, tex_surface); +// inputs[| index] = nodeValue_Surface(materialNames[m_index] + " texture", self, tex_surface); // inputs[| index].setVisible(true); // input_display_list[input_display_len + m_index] = index; diff --git a/scripts/__node_3d_repeat/__node_3d_repeat.gml b/scripts/__node_3d_repeat/__node_3d_repeat.gml index 079741a4a..fb659e7cf 100644 --- a/scripts/__node_3d_repeat/__node_3d_repeat.gml +++ b/scripts/__node_3d_repeat/__node_3d_repeat.gml @@ -3,65 +3,56 @@ function __Node_3D_Repeat(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); - inputs[| 2] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); - inputs[| 4] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef( function() { return getInputData(0); }, VALUE_UNIT.reference); - inputs[| 5] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); inputs[| 6] = nodeValue_Rotation("Light direction", self, 0); - inputs[| 7] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 7] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 8] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 8] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 9] = nodeValue_Color("Light color", self, c_white); - inputs[| 10] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 10] = nodeValue_Color("Ambient color", self, c_grey); inputs[| 11] = nodeValue("3D object", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3object, noone) .setVisible(true, true); - inputs[| 12] = nodeValue("Repeat", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1, "Amount of copies to be generated."); + inputs[| 12] = nodeValue_Int("Repeat", self, 1, "Amount of copies to be generated."); - inputs[| 13] = nodeValue("Repeat position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 13] = nodeValue_Vector("Repeat position", self, [ 1, 0, 0 ]); - inputs[| 14] = nodeValue("Repeat rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 14] = nodeValue_Vector("Repeat rotation", self, [ 0, 0, 0 ]); - inputs[| 15] = nodeValue("Repeat scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 15] = nodeValue_Vector("Repeat scale", self, [ 1, 1, 1 ]); inputs[| 16] = nodeValue_Enum_Button("Repeat pattern", self, 0, [ "Linear", "Circular" ]) .rejectArray(); inputs[| 17] = nodeValue_Enum_Button("Axis", self, 0, [ "x", "y", "z" ]); - inputs[| 18] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 18] = nodeValue_Float("Radius", self, 1); - inputs[| 19] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 360 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 19] = nodeValue_Rotation_Range("Rotation", self, [ 0, 360 ]); inputs[| 20] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 21] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 21] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 22] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 22] = nodeValue_Bool("Scale view with dimension", self, true) input_display_list = [ 11, ["Output", false], 0, 22, @@ -72,11 +63,11 @@ function __Node_3D_Repeat(_x, _y, _group = noone) : Node(_x, _y, _group) constru ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D objects", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D objects", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); output_display_list = [ 0, 2, 1 diff --git a/scripts/__node_3d_transform/__node_3d_transform.gml b/scripts/__node_3d_transform/__node_3d_transform.gml index c8ccf8551..31cdd471e 100644 --- a/scripts/__node_3d_transform/__node_3d_transform.gml +++ b/scripts/__node_3d_transform/__node_3d_transform.gml @@ -4,33 +4,28 @@ function __Node_3D_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _g inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Object position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Object position", self, [ 0, 0, 0 ]); - inputs[| 2] = nodeValue("Object rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Object rotation", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Object scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Object scale", self, [ 1, 1, 1 ]); - inputs[| 4] = nodeValue("Render position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Render position", self, [ 0.5, 0.5 ]) .setUnitRef( function() { return getInputData(2); }, VALUE_UNIT.reference); - inputs[| 5] = nodeValue("Render scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Render scale", self, [ 1, 1 ]); inputs[| 6] = nodeValue_Rotation("Light direction", self, 0); - inputs[| 7] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 7] = nodeValue_Float("Light height", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 8] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 8] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 9] = nodeValue_Color("Light color", self, c_white); - inputs[| 10] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 10] = nodeValue_Color("Ambient color", self, c_grey); inputs[| 11] = nodeValue("3D object", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3object, noone) .setVisible(true, true); @@ -38,10 +33,10 @@ function __Node_3D_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _g inputs[| 12] = nodeValue_Enum_Button("Projection", self, 0, [ "Orthographic", "Perspective" ]) .rejectArray(); - inputs[| 13] = nodeValue("Field of view", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 60) + inputs[| 13] = nodeValue_Float("Field of view", self, 60) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 90, 0.1 ] }); - inputs[| 14] = nodeValue("Scale view with dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 14] = nodeValue_Bool("Scale view with dimension", self, true) input_display_list = [ 11, ["Output", false], 0, 14, @@ -50,11 +45,11 @@ function __Node_3D_Transform(_x, _y, _group = noone) : Node_Processor(_x, _y, _g ["Light", true], 6, 7, 8, 9, 10, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("3D scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3object, function() { return submit_vertex(); }); + outputs[| 1] = nodeValue_Output("3D scene", self, VALUE_TYPE.d3object, function() { return submit_vertex(); }); - outputs[| 2] = nodeValue("Normal pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Normal pass", self, VALUE_TYPE.surface, noone); output_display_list = [ 0, 2, 1 diff --git a/scripts/__node_VFX_effector/__node_VFX_effector.gml b/scripts/__node_VFX_effector/__node_VFX_effector.gml index fe71a49f6..c11b73521 100644 --- a/scripts/__node_VFX_effector/__node_VFX_effector.gml +++ b/scripts/__node_VFX_effector/__node_VFX_effector.gml @@ -20,35 +20,31 @@ function Node_VFX_effector(_x, _y, _group = noone) : Node(_x, _y, _group) constr setDimension(96, 48); seed = 1; - inputs[| 0] = nodeValue("Particles", self, JUNCTION_CONNECT.input, VALUE_TYPE.particle, -1 ) + inputs[| 0] = nodeValue_Particle("Particles", self, -1 ) .setVisible(true, true); - inputs[| 1] = nodeValue("Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA) - .setDisplay(VALUE_DISPLAY.area) + inputs[| 1] = nodeValue_Area("Area", self, DEF_AREA) .rejectArray(); inputs[| 2] = nodeValue("Falloff", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_01 ) .rejectArray(); - inputs[| 3] = nodeValue("Falloff distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ) + inputs[| 3] = nodeValue_Float("Falloff distance", self, 4 ) .rejectArray(); - inputs[| 4] = nodeValue("Effect Vector", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ -1, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Effect Vector", self, [ -1, 0 ] ) .rejectArray(); - inputs[| 5] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 5] = nodeValue_Float("Strength", self, 1 ) .rejectArray(); - inputs[| 6] = nodeValue("Rotate particle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.rotation_range) + inputs[| 6] = nodeValue_Rotation_Range("Rotate particle", self, [ 0, 0 ] ) .rejectArray(); - inputs[| 7] = nodeValue("Scale particle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector_range, { linked : true }) + inputs[| 7] = nodeValue_Vec2_Range("Scale particle", self, [ 0, 0, 0, 0 ] , { linked : true }) .rejectArray(); - inputs[| 8] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 8] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 8].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }) .rejectArray(); @@ -59,7 +55,7 @@ function Node_VFX_effector(_x, _y, _group = noone) : Node(_x, _y, _group) constr ["Effect", false], 8, 4, 5, 6, 7, ]; - outputs[| 0] = nodeValue("Particles", self, JUNCTION_CONNECT.output, VALUE_TYPE.particle, -1 ); + outputs[| 0] = nodeValue_Output("Particles", self, VALUE_TYPE.particle, -1 ); UPDATE_PART_FORWARD diff --git a/scripts/__node_custom/__node_custom.gml b/scripts/__node_custom/__node_custom.gml index 0d11bf32d..2cab23820 100644 --- a/scripts/__node_custom/__node_custom.gml +++ b/scripts/__node_custom/__node_custom.gml @@ -62,7 +62,7 @@ function Node_Custom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co for( var i = 0, n = array_length(info.outputs); i < n; i++ ) { var _output = info.outputs[i]; - outputs[| i] = nodeValue(_output.name, self, JUNCTION_CONNECT.output, value_type_from_string(_output.type), _output.value) + outputs[| i] = nodeValue_Output(_output.name, self, value_type_from_string(_output.type), _output.value) .setVisible(_output.show_in_graph); output_index_map[? _output.name] = i; diff --git a/scripts/__node_process_template/__node_process_template.gml b/scripts/__node_process_template/__node_process_template.gml index 46fc4d165..777ef61a7 100644 --- a/scripts/__node_process_template/__node_process_template.gml +++ b/scripts/__node_process_template/__node_process_template.gml @@ -3,7 +3,7 @@ function Node_Process_Template(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 0] = nodeValue_Surface("", self); - outputs[| 0] = nodeValue("", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("", self, VALUE_TYPE.surface, noone); input_display_list = [ 0 ]; diff --git a/scripts/__node_shader/__node_shader.gml b/scripts/__node_shader/__node_shader.gml index eb3d933bf..819120e19 100644 --- a/scripts/__node_shader/__node_shader.gml +++ b/scripts/__node_shader/__node_shader.gml @@ -16,7 +16,7 @@ function Node_Shader(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co shader = noone; shader_data = []; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); static setShader = function(_data) { #region for( var i = 0, n = array_length(shader_data); i < n; i++ ) { diff --git a/scripts/__node_template/__node_template.gml b/scripts/__node_template/__node_template.gml index a0516b887..8567847c8 100644 --- a/scripts/__node_template/__node_template.gml +++ b/scripts/__node_template/__node_template.gml @@ -3,7 +3,7 @@ function Node_Template(_x, _y, _group = noone) : Node(_x, _y, _group) constructo inputs[| 0] = nodeValue_Surface("", self); - outputs[| 0] = nodeValue("", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("", self, VALUE_TYPE.surface, noone); input_display_list = [ 0 ]; diff --git a/scripts/__node_value_array/__node_value_array.gml b/scripts/__node_value_array/__node_value_array.gml index 9eab47f90..f91b60093 100644 --- a/scripts/__node_value_array/__node_value_array.gml +++ b/scripts/__node_value_array/__node_value_array.gml @@ -1,3 +1,15 @@ +function nodeValue_Vector(_name, _node, _value, _data = {}) { + var _len = array_length(_value); + + switch(_len) { + case 2 : return new NodeValue_Vec2(_name, _node, _value, _data); + case 3 : return new NodeValue_Vec3(_name, _node, _value, _data); + case 4 : return new NodeValue_Vec4(_name, _node, _value, _data); + } + + return new NodeValue_Array(_name, _node, _value, "", _len); +} + function NodeValue_Array(_name, _node, _value, _tooltip = "", _length = 2) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.float, _value, _tooltip) constructor { data_array_length = _length; diff --git a/scripts/_node_VFX_spawner/_node_VFX_spawner.gml b/scripts/_node_VFX_spawner/_node_VFX_spawner.gml index bc453519b..bcb06d514 100644 --- a/scripts/_node_VFX_spawner/_node_VFX_spawner.gml +++ b/scripts/_node_VFX_spawner/_node_VFX_spawner.gml @@ -4,133 +4,116 @@ function Node_VFX_Spawner_Base(_x, _y, _group = noone) : Node(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Particle sprite", self); - inputs[| 1] = nodeValue("Spawn delay", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4, "Frames delay between each particle spawn." ); + inputs[| 1] = nodeValue_Int("Spawn delay", self, 4, "Frames delay between each particle spawn." ); - inputs[| 2] = nodeValue("Spawn amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 2, 2 ], "Amount of particle spawn in that frame." ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 2] = nodeValue_Range("Spawn amount", self, [ 2, 2 ] , { linked : true }) + .setTooltip("Amount of particle spawn in that frame."); - inputs[| 3] = nodeValue("Spawn area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA ) - .setDisplay(VALUE_DISPLAY.area); + inputs[| 3] = nodeValue_Area("Spawn area", self, DEF_AREA ); inputs[| 4] = nodeValue_Enum_Scroll("Spawn distribution", self, 0, [ "Area", "Border", "Map" ] ); - inputs[| 5] = nodeValue("Lifespan", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 20, 30 ] ) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 5] = nodeValue_Range("Lifespan", self, [ 20, 30 ] ); - inputs[| 6] = nodeValue("Spawn direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 45, 135, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.rotation_random); + inputs[| 6] = nodeValue_Rotation_Random("Spawn direction", self, [ 0, 45, 135, 0, 0 ] ); - inputs[| 7] = nodeValue("Acceleration", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 7] = nodeValue_Range("Acceleration", self, [ 0, 0 ] , { linked : true }); - inputs[| 8] = nodeValue("Orientation", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.rotation_random); + inputs[| 8] = nodeValue_Rotation_Random("Orientation", self, [ 0, 0, 0, 0, 0 ] ); - inputs[| 9] = nodeValue("Rotational speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 9] = nodeValue_Range("Rotational speed", self, [ 0, 0 ] , { linked : true }); - inputs[| 10] = nodeValue("Spawn scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector_range, { linked : true }); + inputs[| 10] = nodeValue_Vec2_Range("Spawn scale", self, [ 1, 1, 1, 1 ] , { linked : true }); inputs[| 11] = nodeValue("Scale over time", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11 ); - inputs[| 12] = nodeValue("Color over lifetime", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); + inputs[| 12] = nodeValue_Gradient("Color over lifetime", self, new gradientObject(cola(c_white))); - inputs[| 13] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 13] = nodeValue_Range("Alpha", self, [ 1, 1 ], { linked : true }); inputs[| 14] = nodeValue("Alpha over time", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 15] = nodeValue("Rotate by direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Make the particle rotates to follow its movement."); + inputs[| 15] = nodeValue_Bool("Rotate by direction", self, false, "Make the particle rotates to follow its movement."); inputs[| 16] = nodeValue_Enum_Button("Spawn type", self, 0, [ "Stream", "Burst", "Trigger" ]); - inputs[| 17] = nodeValue("Spawn size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 17] = nodeValue_Range("Spawn size", self, [ 1, 1 ] , { linked : true }); - inputs[| 18] = nodeValue("Spawn velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 2 ] ) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 18] = nodeValue_Range("Spawn velocity", self, [ 1, 2 ] ); - inputs[| 19] = nodeValue("Gravity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 19] = nodeValue_Range("Gravity", self, [ 0, 0 ] , { linked : true }); - inputs[| 20] = nodeValue("Direction wiggle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector, { label: [ "Amplitude", "Period" ], linkable: false, per_line: true }); + inputs[| 20] = nodeValue_Vector("Direction wiggle", self, [ 0, 0 ] , { label: [ "Amplitude", "Period" ], linkable: false, per_line: true }); - inputs[| 21] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 21] = nodeValue_Bool("Loop", self, true ); inputs[| 22] = nodeValue_Enum_Scroll("Surface array", self, 0, [ "Random", "Order", "Animation", "Scale" ]) .setTooltip("Whether to select image from an array in order, at random, or treat array as animation.") .setVisible(false); - inputs[| 23] = nodeValue("Animation speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }) + inputs[| 23] = nodeValue_Range("Animation speed", self, [ 1, 1 ] , { linked : true }) .setVisible(false); inputs[| 24] = nodeValue_Enum_Button("Scatter", self, 1, [ "Uniform", "Random" ]); - inputs[| 25] = nodeValue("Boundary data", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, []) + inputs[| 25] = nodeValue_Int("Boundary data", self, []) .setArrayDepth(1) .setVisible(false, true); inputs[| 26] = nodeValue_Enum_Button("On animation end", self, ANIM_END_ACTION.loop, [ "Loop", "Ping pong", "Destroy" ]) .setVisible(false); - inputs[| 27] = nodeValue("Spawn", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 27] = nodeValue_Bool("Spawn", self, true); - inputs[| 28] = nodeValue("Random blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); + inputs[| 28] = nodeValue_Gradient("Random blend", self, new gradientObject(cola(c_white))); - inputs[| 29] = nodeValue("Directed from center", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Make particle move away from the spawn center."); + inputs[| 29] = nodeValue_Bool("Directed from center", self, false, "Make particle move away from the spawn center."); inputs[| 30] = nodeValue_Surface("Distribution map", self) inputs[| 31] = nodeValue_Surface("Atlas", self, []) .setArrayDepth(1); - inputs[| 32] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 32] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 32].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 33] = nodeValue_Rotation("Gravity direction", self, -90); - inputs[| 34] = nodeValue("Turning", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 34] = nodeValue_Range("Turning", self, [ 0, 0 ] , { linked : true }); - inputs[| 35] = nodeValue("Turn both directions", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Apply randomized 1, -1 multiplier to the turning speed." ); + inputs[| 35] = nodeValue_Bool("Turn both directions", self, false, "Apply randomized 1, -1 multiplier to the turning speed." ); - inputs[| 36] = nodeValue("Turn scale with speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, false ); + inputs[| 36] = nodeValue_Float("Turn scale with speed", self, false ); - inputs[| 37] = nodeValue("Collide ground", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 37] = nodeValue_Bool("Collide ground", self, false ); - inputs[| 38] = nodeValue("Ground offset", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ); + inputs[| 38] = nodeValue_Float("Ground offset", self, 0 ); - inputs[| 39] = nodeValue("Bounce amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 39] = nodeValue_Float("Bounce amount", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 40] = nodeValue("Bounce friction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1, "Apply horizontal friction once particle stop bouncing." ) + inputs[| 40] = nodeValue_Float("Bounce friction", self, 0.1, "Apply horizontal friction once particle stop bouncing." ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 41] = nodeValue("Position wiggle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector, { label: [ "Amplitude", "Period" ], linkable: false, per_line: true }); + inputs[| 41] = nodeValue_Vector("Position wiggle", self, [ 0, 0 ] , { label: [ "Amplitude", "Period" ], linkable: false, per_line: true }); - inputs[| 42] = nodeValue("Rotation wiggle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector, { label: [ "Amplitude", "Period" ], linkable: false, per_line: true }); + inputs[| 42] = nodeValue_Vector("Rotation wiggle", self, [ 0, 0 ] , { label: [ "Amplitude", "Period" ], linkable: false, per_line: true }); - inputs[| 43] = nodeValue("Scale wiggle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector, { label: [ "Amplitude", "Period" ], linkable: false, per_line: true }); + inputs[| 43] = nodeValue_Vector("Scale wiggle", self, [ 0, 0 ] , { label: [ "Amplitude", "Period" ], linkable: false, per_line: true }); - inputs[| 44] = nodeValue("Spawn", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 44] = nodeValue_Trigger("Spawn", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Trigger" }); - inputs[| 45] = nodeValue("Follow Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 45] = nodeValue_Bool("Follow Path", self, false ); - inputs[| 46] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone ); + inputs[| 46] = nodeValue_PathNode("Path", self, noone ); inputs[| 47] = nodeValue("Path Deviation", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11 ); - inputs[| 48] = nodeValue("Reset Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 48] = nodeValue_Trigger("Reset Seed", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Trigger" }) - inputs[| 49] = nodeValue("Stretch Animation", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 49] = nodeValue_Bool("Stretch Animation", self, false ); for (var i = 2, n = ds_list_size(inputs); i < n; i++) inputs[| i].rejectArray(); diff --git a/scripts/_node_strand_affector/_node_strand_affector.gml b/scripts/_node_strand_affector/_node_strand_affector.gml index 35aad8695..eb0140405 100644 --- a/scripts/_node_strand_affector/_node_strand_affector.gml +++ b/scripts/_node_strand_affector/_node_strand_affector.gml @@ -45,17 +45,16 @@ function _Node_Strand_Affector(_x, _y, _group = noone) : Node(_x, _y, _group) co inputs[| 1] = nodeValue_Enum_Scroll("Shape", self, 0, [ "Point", "Band" ]); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0 ]); - inputs[| 3] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4); + inputs[| 3] = nodeValue_Float("Range", self, 4); inputs[| 4] = nodeValue_Rotation("Direction", self, 0); - inputs[| 5] = nodeValue("Falloff", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 5] = nodeValue_Float("Falloff", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Strand", self, JUNCTION_CONNECT.output, VALUE_TYPE.strands, noone); + outputs[| 0] = nodeValue_Output("Strand", self, VALUE_TYPE.strands, noone); input_fix_len = ds_list_size(inputs); diff --git a/scripts/mask_function/mask_function.gml b/scripts/mask_function/mask_function.gml index c45965476..2a9579e3f 100644 --- a/scripts/mask_function/mask_function.gml +++ b/scripts/mask_function/mask_function.gml @@ -1,9 +1,9 @@ function __init_mask_modifier(_mask_index) { #region var _ind = ds_list_size(inputs); - inputs[| _ind + 0] = nodeValue("Invert mask", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| _ind + 0] = nodeValue_Bool("Invert mask", self, false); - inputs[| _ind + 1] = nodeValue("Mask feather", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| _ind + 1] = nodeValue_Float("Mask feather", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 32, 0.1] }); __mask_index = _mask_index; diff --git a/scripts/nodd_mk_delay_machine/nodd_mk_delay_machine.gml b/scripts/nodd_mk_delay_machine/nodd_mk_delay_machine.gml index 5326aad71..3d541b3e0 100644 --- a/scripts/nodd_mk_delay_machine/nodd_mk_delay_machine.gml +++ b/scripts/nodd_mk_delay_machine/nodd_mk_delay_machine.gml @@ -6,21 +6,20 @@ function Node_MK_Delay_Machine(_x, _y, _group = noone) : Node(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Surface", self); - inputs[| 1] = nodeValue("Delay Amounts", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 1] = nodeValue_Int("Delay Amounts", self, 4); - inputs[| 2] = nodeValue("Delay Frames", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 2] = nodeValue_Int("Delay Frames", self, 1); - inputs[| 3] = nodeValue("Blend over Delay", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, [ c_white ]) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 3] = nodeValue_Palette("Blend over Delay", self, [ c_white ]); inputs[| 4] = nodeValue("Alpha over Delay", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); inputs[| 5] = nodeValue_Enum_Scroll("Palette Select", self, 0, [ "Loop", "Pingpong", "Random" ]); - inputs[| 6] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 6] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 6].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Delay", false], 1, 2, diff --git a/scripts/node_2d_light/node_2d_light.gml b/scripts/node_2d_light/node_2d_light.gml index c0139ad87..020106f5e 100644 --- a/scripts/node_2d_light/node_2d_light.gml +++ b/scripts/node_2d_light/node_2d_light.gml @@ -22,30 +22,27 @@ function Node_2D_light(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) new scrollItem("Line asymmetric", s_node_2d_light_shape, 2), new scrollItem("Spot", s_node_2d_light_shape, 3), ]); - inputs[| 2] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Center", self, [ 16, 16 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 3] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 16); + inputs[| 3] = nodeValue_Float("Range", self, 16); - inputs[| 4] = nodeValue("Intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 5] = nodeValue_Color("Color", self, c_white); - inputs[| 6] = nodeValue("Start", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 16, 16 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Start", self, [ 16, 16 ]); - inputs[| 7] = nodeValue("Finish", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 32, 16 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Finish", self, [ 32, 16 ]); - inputs[| 8] = nodeValue("Sweep", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 15) + inputs[| 8] = nodeValue_Int("Sweep", self, 15) .setDisplay(VALUE_DISPLAY.slider, { range: [-80, 80, 0.1] }); - inputs[| 9] = nodeValue("Sweep end", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 9] = nodeValue_Int("Sweep end", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-80, 80, 0.1] }); - inputs[| 10] = nodeValue("Banding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 10] = nodeValue_Int("Banding", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 16, 0.1] }); inputs[| 11] = nodeValue_Enum_Scroll("Attenuation", self, 0, @@ -54,19 +51,19 @@ function Node_2D_light(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) new scrollItem("Linear", s_node_curve, 2), ]) .setTooltip("Control how light fade out over distance."); - inputs[| 12] = nodeValue("Radial banding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 12] = nodeValue_Int("Radial banding", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 16, 0.1] }); inputs[| 13] = nodeValue_Rotation("Radial start", self, 0); - inputs[| 14] = nodeValue("Radial band ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 14] = nodeValue_Float("Radial band ratio", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 15] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 15] = nodeValue_Bool("Active", self, true); active_index = 15; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Light only", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Light only", self, VALUE_TYPE.surface, noone); input_display_list = [ 15, 0, ["Shape", false], 1, 2, 6, 7, 8, 9, diff --git a/scripts/node_3d_camera/node_3d_camera.gml b/scripts/node_3d_camera/node_3d_camera.gml index 8a8a39ab0..4ce490d16 100644 --- a/scripts/node_3d_camera/node_3d_camera.gml +++ b/scripts/node_3d_camera/node_3d_camera.gml @@ -18,68 +18,66 @@ function Node_3D_Camera(_x, _y, _group = noone) : Node_3D_Object(_x, _y, _group) global.SKY_SPHERE = new __3dUVSphere(0.5, 16, 8, true); - inputs[| in_d3d + 0] = nodeValue("FOV", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 60 ) + inputs[| in_d3d + 0] = nodeValue_Int("FOV", self, 60 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 10, 90, 0.1 ] }); - inputs[| in_d3d + 1] = nodeValue("Clipping Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 10 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| in_d3d + 1] = nodeValue_Vector("Clipping Distance", self, [ 1, 10 ] ); inputs[| in_d3d + 2] = nodeValue_Dimension(self); inputs[| in_d3d + 3] = nodeValue_Enum_Button("Projection", self, 1 , [ "Perspective", "Orthographic" ]); - inputs[| in_d3d + 4] = nodeValue("Scene", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Scene, noone ) + inputs[| in_d3d + 4] = nodeValue_D3Scene("Scene", self, noone ) .setVisible(true, true); - inputs[| in_d3d + 5] = nodeValue("Ambient Light", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_dkgrey ); + inputs[| in_d3d + 5] = nodeValue_Color("Ambient Light", self, c_dkgrey ); - inputs[| in_d3d + 6] = nodeValue("Show Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_d3d + 6] = nodeValue_Bool("Show Background", self, false ); inputs[| in_d3d + 7] = nodeValue_Enum_Button("Backface Culling", self, 2 , [ "None", "CW", "CCW" ]); - inputs[| in_d3d + 8] = nodeValue("Orthographic Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| in_d3d + 8] = nodeValue_Float("Orthographic Scale", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0.01, 4, 0.01 ] }); inputs[| in_d3d + 9] = nodeValue_Enum_Scroll("Postioning Mode", self, 2, [ "Position + Rotation", "Position + Lookat", "Lookat + Rotation" ] ); - inputs[| in_d3d + 10] = nodeValue("Lookat Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| in_d3d + 10] = nodeValue_Vector("Lookat Position", self, [ 0, 0, 0 ] ); inputs[| in_d3d + 11] = nodeValue_Rotation("Roll", self, 0); inputs[| in_d3d + 12] = nodeValue_Rotation("Horizontal Angle", self, 45 ); - inputs[| in_d3d + 13] = nodeValue("Vertical Angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 30 ) + inputs[| in_d3d + 13] = nodeValue_Float("Vertical Angle", self, 30 ) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 90, 0.1] }); - inputs[| in_d3d + 14] = nodeValue("Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ); + inputs[| in_d3d + 14] = nodeValue_Float("Distance", self, 4 ); - inputs[| in_d3d + 15] = nodeValue("Gamma Adjust", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_d3d + 15] = nodeValue_Bool("Gamma Adjust", self, false ); inputs[| in_d3d + 16] = nodeValue_Surface("Environment Texture", self); - inputs[| in_d3d + 17] = nodeValue("Ambient Occlusion", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_d3d + 17] = nodeValue_Bool("Ambient Occlusion", self, false ); - inputs[| in_d3d + 18] = nodeValue("AO Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.25 ); + inputs[| in_d3d + 18] = nodeValue_Float("AO Radius", self, 0.25 ); - inputs[| in_d3d + 19] = nodeValue("AO Bias", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.05 ); + inputs[| in_d3d + 19] = nodeValue_Float("AO Bias", self, 0.05 ); - inputs[| in_d3d + 20] = nodeValue("AO Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1. ) + inputs[| in_d3d + 20] = nodeValue_Float("AO Strength", self, 1. ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0.01, 4, 0.01 ] }); - inputs[| in_d3d + 21] = nodeValue("Round Normal", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0 ) + inputs[| in_d3d + 21] = nodeValue_Int("Round Normal", self, 0 ) .setWindows(); inputs[| in_d3d + 22] = nodeValue_Enum_Button("Blend mode", self, 0 , [ "Normal", "Additive" ]); in_cam = ds_list_size(inputs); - outputs[| 0] = nodeValue("Rendered", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ); + outputs[| 0] = nodeValue_Output("Rendered", self, VALUE_TYPE.surface, noone ); - outputs[| 1] = nodeValue("Normal", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ) + outputs[| 1] = nodeValue_Output("Normal", self, VALUE_TYPE.surface, noone ) .setVisible(false); - outputs[| 2] = nodeValue("Depth", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ) + outputs[| 2] = nodeValue_Output("Depth", self, VALUE_TYPE.surface, noone ) .setVisible(false); input_display_list = [ in_d3d + 4, diff --git a/scripts/node_3d_camera_set/node_3d_camera_set.gml b/scripts/node_3d_camera_set/node_3d_camera_set.gml index 8002672b2..4ebe951e3 100644 --- a/scripts/node_3d_camera_set/node_3d_camera_set.gml +++ b/scripts/node_3d_camera_set/node_3d_camera_set.gml @@ -8,28 +8,28 @@ function Node_3D_Camera_Set(_x, _y, _group = noone) : Node_3D_Camera(_x, _y, _gr inputs[| in_cam + 0] = nodeValue_Rotation("L1 H angle", self, 30) .setName("Horizontal angle"); - inputs[| in_cam + 1] = nodeValue("L1 V angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 45 ) + inputs[| in_cam + 1] = nodeValue_Float("L1 V angle", self, 45 ) .setName("Vertical angle") .setDisplay(VALUE_DISPLAY.slider, { range: [0, 90, 0.1] }); - inputs[| in_cam + 2] = nodeValue("L1 Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ) + inputs[| in_cam + 2] = nodeValue_Color("L1 Color", self, c_white ) .setName("Color") - inputs[| in_cam + 3] = nodeValue("L1 Intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| in_cam + 3] = nodeValue_Float("L1 Intensity", self, 1 ) .setName("Intensity") .setDisplay(VALUE_DISPLAY.slider); inputs[| in_cam + 4] = nodeValue_Rotation("L2 H angle", self, -45) .setName("Horizontal angle"); - inputs[| in_cam + 5] = nodeValue("L2 V angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 45 ) + inputs[| in_cam + 5] = nodeValue_Float("L2 V angle", self, 45 ) .setName("Vertical angle") .setDisplay(VALUE_DISPLAY.slider, { range: [0, 90, 0.1] }); - inputs[| in_cam + 6] = nodeValue("L2 Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ) + inputs[| in_cam + 6] = nodeValue_Color("L2 Color", self, c_white ) .setName("Color") - inputs[| in_cam + 7] = nodeValue("L2 Intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.25 ) + inputs[| in_cam + 7] = nodeValue_Float("L2 Intensity", self, 0.25 ) .setName("Intensity") .setDisplay(VALUE_DISPLAY.slider); diff --git a/scripts/node_3d_depth/node_3d_depth.gml b/scripts/node_3d_depth/node_3d_depth.gml index 81741f0e9..5bb6868dd 100644 --- a/scripts/node_3d_depth/node_3d_depth.gml +++ b/scripts/node_3d_depth/node_3d_depth.gml @@ -5,10 +5,9 @@ function Node_3D_Depth(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 1] = nodeValue_Surface("Depth", self); - inputs[| 2] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0, 0] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Rotation", self, [0, 0, 0] ); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Texture", false], 0, 1, diff --git a/scripts/node_3d_instancer/node_3d_instancer.gml b/scripts/node_3d_instancer/node_3d_instancer.gml index 2596883ee..5fb76a9e7 100644 --- a/scripts/node_3d_instancer/node_3d_instancer.gml +++ b/scripts/node_3d_instancer/node_3d_instancer.gml @@ -1,10 +1,9 @@ function Node_3D_Instancer(_x, _y, _group = noone) : Node_3D_Modifier(_x, _y, _group) constructor { name = "3D Instancer"; - inputs[| in_mesh + 0] = nodeValue("Amounts", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| in_mesh + 0] = nodeValue_Int("Amounts", self, 1); - inputs[| in_mesh + 1] = nodeValue("Positions", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| in_mesh + 1] = nodeValue_Vector("Positions", self, [ 0, 0, 0 ]) .setArrayDepth(1); static processData = function(_output, _data, _output_index, _array_index = 0) { diff --git a/scripts/node_3d_light_directional/node_3d_light_directional.gml b/scripts/node_3d_light_directional/node_3d_light_directional.gml index 76cda6117..833045397 100644 --- a/scripts/node_3d_light_directional/node_3d_light_directional.gml +++ b/scripts/node_3d_light_directional/node_3d_light_directional.gml @@ -3,13 +3,13 @@ function Node_3D_Light_Directional(_x, _y, _group = noone) : Node_3D_Light(_x, _ object_class = __3dLightDirectional; - inputs[| in_light + 0] = nodeValue("Cast Shadow", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| in_light + 0] = nodeValue_Bool("Cast Shadow", self, false); - inputs[| in_light + 1] = nodeValue("Shadow Map Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1024); + inputs[| in_light + 1] = nodeValue_Int("Shadow Map Size", self, 1024); - inputs[| in_light + 2] = nodeValue("Shadow Map Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| in_light + 2] = nodeValue_Int("Shadow Map Scale", self, 4); - inputs[| in_light + 3] = nodeValue("Shadow Bias", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .001); + inputs[| in_light + 3] = nodeValue_Float("Shadow Bias", self, .001); input_display_list = [ ["Transform", false], 0, diff --git a/scripts/node_3d_light_point/node_3d_light_point.gml b/scripts/node_3d_light_point/node_3d_light_point.gml index e7aafa100..56e50fa3e 100644 --- a/scripts/node_3d_light_point/node_3d_light_point.gml +++ b/scripts/node_3d_light_point/node_3d_light_point.gml @@ -3,15 +3,15 @@ function Node_3D_Light_Point(_x, _y, _group = noone) : Node_3D_Light(_x, _y, _gr object_class = __3dLightPoint; - inputs[| in_light + 0] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4) + inputs[| in_light + 0] = nodeValue_Float("Radius", self, 4) - inputs[| in_light + 1] = nodeValue("Cast Shadow", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| in_light + 1] = nodeValue_Bool("Cast Shadow", self, false) .setWindows(); - inputs[| in_light + 2] = nodeValue("Shadow Map Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1024) + inputs[| in_light + 2] = nodeValue_Int("Shadow Map Size", self, 1024) .setWindows(); - inputs[| in_light + 3] = nodeValue("Shadow Bias", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .001) + inputs[| in_light + 3] = nodeValue_Float("Shadow Bias", self, .001) .setWindows(); input_display_list = [ diff --git a/scripts/node_3d_material/node_3d_material.gml b/scripts/node_3d_material/node_3d_material.gml index feba73570..e6db024c1 100644 --- a/scripts/node_3d_material/node_3d_material.gml +++ b/scripts/node_3d_material/node_3d_material.gml @@ -5,27 +5,27 @@ function Node_3D_Material(_x, _y, _group = noone) : Node_3D(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Texture", self) .setVisible(true, true); - inputs[| 1] = nodeValue("Diffuse", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 1] = nodeValue_Float("Diffuse", self, 1 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 2] = nodeValue("Specular", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 2] = nodeValue_Float("Specular", self, 0 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Shininess", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ); + inputs[| 3] = nodeValue_Float("Shininess", self, 1 ); - inputs[| 4] = nodeValue("Metalic", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 4] = nodeValue_Bool("Metalic", self, false ); inputs[| 5] = nodeValue_Surface("Normal Map", self); - inputs[| 6] = nodeValue("Normal Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 6] = nodeValue_Float("Normal Strength", self, 1 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }); - inputs[| 7] = nodeValue("Roughness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 7] = nodeValue_Float("Roughness", self, 1 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 8] = nodeValue_Bool("Anti aliasing", self, false ); - outputs[| 0] = nodeValue("Material", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Material, noone); + outputs[| 0] = nodeValue_Output("Material", self, VALUE_TYPE.d3Material, noone); input_display_list = [ 0, 8, ["Properties", false], 1, 2, 3, 4, 7, diff --git a/scripts/node_3d_mesh_cone/node_3d_mesh_cone.gml b/scripts/node_3d_mesh_cone/node_3d_mesh_cone.gml index c4eb146d0..41578055f 100644 --- a/scripts/node_3d_mesh_cone/node_3d_mesh_cone.gml +++ b/scripts/node_3d_mesh_cone/node_3d_mesh_cone.gml @@ -3,16 +3,16 @@ function Node_3D_Mesh_Cone(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _group object_class = __3dCone; - inputs[| in_mesh + 0] = nodeValue("Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8 ) + inputs[| in_mesh + 0] = nodeValue_Int("Side", self, 8 ) .setValidator(VV_min(3)); - inputs[| in_mesh + 1] = nodeValue("Material Bottom", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 1] = nodeValue_D3Material("Material Bottom", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 2] = nodeValue("Material Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 2] = nodeValue_D3Material("Material Side", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 3] = nodeValue("Smooth Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 3] = nodeValue_Bool("Smooth Side", self, false ); input_display_list = [ __d3d_input_list_mesh, in_mesh + 0, in_mesh + 3, diff --git a/scripts/node_3d_mesh_cube/node_3d_mesh_cube.gml b/scripts/node_3d_mesh_cube/node_3d_mesh_cube.gml index 225ce9ed3..fa1a02583 100644 --- a/scripts/node_3d_mesh_cube/node_3d_mesh_cube.gml +++ b/scripts/node_3d_mesh_cube/node_3d_mesh_cube.gml @@ -2,24 +2,24 @@ function Node_3D_Mesh_Cube(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _group name = "3D Cube"; object_class = noone; - inputs[| in_mesh + 0] = nodeValue("Material per side", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 0] = nodeValue_Bool("Material per side", self, false ); - inputs[| in_mesh + 1] = nodeValue("Material", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 1] = nodeValue_D3Material("Material", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 2] = nodeValue("Material Bottom", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 2] = nodeValue_D3Material("Material Bottom", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 3] = nodeValue("Material Left", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 3] = nodeValue_D3Material("Material Left", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 4] = nodeValue("Material Right", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 4] = nodeValue_D3Material("Material Right", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 5] = nodeValue("Material Back", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 5] = nodeValue_D3Material("Material Back", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 6] = nodeValue("Material Front", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 6] = nodeValue_D3Material("Material Front", self, new __d3dMaterial()) .setVisible(true, true); input_display_list = [ diff --git a/scripts/node_3d_mesh_cylinder/node_3d_mesh_cylinder.gml b/scripts/node_3d_mesh_cylinder/node_3d_mesh_cylinder.gml index 4bd6438ce..a345b99b7 100644 --- a/scripts/node_3d_mesh_cylinder/node_3d_mesh_cylinder.gml +++ b/scripts/node_3d_mesh_cylinder/node_3d_mesh_cylinder.gml @@ -3,21 +3,21 @@ function Node_3D_Mesh_Cylinder(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _g object_class = __3dCylinder; - inputs[| in_mesh + 0] = nodeValue("Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8 ) + inputs[| in_mesh + 0] = nodeValue_Int("Side", self, 8 ) .setValidator(VV_min(3)); - inputs[| in_mesh + 1] = nodeValue("Material Top", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 1] = nodeValue_D3Material("Material Top", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 2] = nodeValue("Material Bottom", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 2] = nodeValue_D3Material("Material Bottom", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 3] = nodeValue("Material Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 3] = nodeValue_D3Material("Material Side", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 4] = nodeValue("Smooth Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 4] = nodeValue_Bool("Smooth Side", self, false ); - inputs[| in_mesh + 5] = nodeValue("End caps", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| in_mesh + 5] = nodeValue_Bool("End caps", self, true ); input_display_list = [ __d3d_input_list_mesh, in_mesh + 0, in_mesh + 4, in_mesh + 5, diff --git a/scripts/node_3d_mesh_export/node_3d_mesh_export.gml b/scripts/node_3d_mesh_export/node_3d_mesh_export.gml index 3537a6286..c9fb583ee 100644 --- a/scripts/node_3d_mesh_export/node_3d_mesh_export.gml +++ b/scripts/node_3d_mesh_export/node_3d_mesh_export.gml @@ -1,16 +1,16 @@ function Node_3D_Mesh_Export(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Mesh Export"; - inputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Mesh, noone) + inputs[| 0] = nodeValue_D3Mesh("Mesh", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Paths", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 1] = nodeValue_Text("Paths", self, "") .setDisplay(VALUE_DISPLAY.path_save, { filter: "Obj (.obj)|*.obj" }) .setVisible(true); - inputs[| 2] = nodeValue("Export Texture", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Export Texture", self, true); - inputs[| 3] = nodeValue("Invert UV", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Invert UV", self, false); input_display_list = [ 0, ["Export", false], 1, 2, 3, diff --git a/scripts/node_3d_mesh_extrude/node_3d_mesh_extrude.gml b/scripts/node_3d_mesh_extrude/node_3d_mesh_extrude.gml index 8e447ad3a..0e670a98c 100644 --- a/scripts/node_3d_mesh_extrude/node_3d_mesh_extrude.gml +++ b/scripts/node_3d_mesh_extrude/node_3d_mesh_extrude.gml @@ -3,27 +3,25 @@ function Node_3D_Mesh_Extrude(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _gr object_class = __3dSurfaceExtrude; - inputs[| in_mesh + 0] = nodeValue("Front Surface", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial()) + inputs[| in_mesh + 0] = nodeValue_D3Material("Front Surface", self, new __d3dMaterial()) .setVisible(true, true); inputs[| in_mesh + 1] = nodeValue_Surface("Front Height", self); - inputs[| in_mesh + 2] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| in_mesh + 2] = nodeValue_Bool("Smooth", self, false) - inputs[| in_mesh + 3] = nodeValue("Always update", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| in_mesh + 3] = nodeValue_Bool("Always update", self, false); - inputs[| in_mesh + 4] = nodeValue("Double Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| in_mesh + 4] = nodeValue_Bool("Double Side", self, false); - inputs[| in_mesh + 5] = nodeValue("Back Surface", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial()) + inputs[| in_mesh + 5] = nodeValue_D3Material("Back Surface", self, new __d3dMaterial()) .setVisible(true, true); inputs[| in_mesh + 6] = nodeValue_Surface("Back Height", self); - inputs[| in_mesh + 7] = nodeValue("Front Height Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| in_mesh + 7] = nodeValue_Slider_Range("Front Height Level", self, [ 0, 1 ]); - inputs[| in_mesh + 8] = nodeValue("Back Height Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| in_mesh + 8] = nodeValue_Slider_Range("Back Height Level", self, [ 0, 1 ]); input_display_list = [ in_mesh + 3, __d3d_input_list_mesh, diff --git a/scripts/node_3d_mesh_obj/node_3d_mesh_obj.gml b/scripts/node_3d_mesh_obj/node_3d_mesh_obj.gml index 4adbc9631..87d035a43 100644 --- a/scripts/node_3d_mesh_obj/node_3d_mesh_obj.gml +++ b/scripts/node_3d_mesh_obj/node_3d_mesh_obj.gml @@ -25,14 +25,14 @@ function Node_3D_Mesh_Obj(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _group) object = noone; object_class = __3dObject; - inputs[| in_mesh + 0] = nodeValue("File Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "" ) + inputs[| in_mesh + 0] = nodeValue_Text("File Path", self, "" ) .setDisplay(VALUE_DISPLAY.path_load, { filter: "3d object|*.obj" }) .rejectArray(); - inputs[| in_mesh + 1] = nodeValue("Flip UV", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Flip UV axis, can be use to fix some texture mapping error.") + inputs[| in_mesh + 1] = nodeValue_Bool("Flip UV", self, true, "Flip UV axis, can be use to fix some texture mapping error.") .rejectArray(); - inputs[| in_mesh + 2] = nodeValue("Import Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| in_mesh + 2] = nodeValue_Float("Import Scale", self, 1) .rejectArray(); inputs[| in_mesh + 3] = nodeValue_Enum_Scroll("Axis", self, 0, [ "XYZ", "XZ-Y", "X-ZY" ]) @@ -73,7 +73,7 @@ function Node_3D_Mesh_Obj(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _group) static createNewInput = function(index = -1) { #region if(index == -1) index = ds_list_size(inputs); - inputs[| index] = nodeValue("Material", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial()) + inputs[| index] = nodeValue_D3Material("Material", self, new __d3dMaterial()) .setVisible(true, true); } #endregion diff --git a/scripts/node_3d_mesh_path_extrude/node_3d_mesh_path_extrude.gml b/scripts/node_3d_mesh_path_extrude/node_3d_mesh_path_extrude.gml index 2be321b20..130c5af60 100644 --- a/scripts/node_3d_mesh_path_extrude/node_3d_mesh_path_extrude.gml +++ b/scripts/node_3d_mesh_path_extrude/node_3d_mesh_path_extrude.gml @@ -3,36 +3,35 @@ function Node_3D_Mesh_Path_Extrude(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y object_class = __3dPathExtrude; - inputs[| in_mesh + 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone ) + inputs[| in_mesh + 0] = nodeValue_PathNode("Path", self, noone ) .setVisible(true, true); - inputs[| in_mesh + 1] = nodeValue("Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8 ) + inputs[| in_mesh + 1] = nodeValue_Int("Side", self, 8 ) .setValidator(VV_min(2)); - inputs[| in_mesh + 2] = nodeValue("Material Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 2] = nodeValue_D3Material("Material Side", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 3] = nodeValue("Material Cap", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 3] = nodeValue_D3Material("Material Cap", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 4] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 4] = nodeValue_Bool("Smooth", self, false ); - inputs[| in_mesh + 5] = nodeValue("End caps", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| in_mesh + 5] = nodeValue_Bool("End caps", self, true ); - inputs[| in_mesh + 6] = nodeValue("Subdivision", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8 ) + inputs[| in_mesh + 6] = nodeValue_Int("Subdivision", self, 8 ) .setValidator(VV_min(2)); - inputs[| in_mesh + 7] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.25 ) + inputs[| in_mesh + 7] = nodeValue_Float("Radius", self, 0.25 ) .setDisplay(VALUE_DISPLAY.slider); inputs[| in_mesh + 8] = nodeValue("Radius Over Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11 ); - inputs[| in_mesh + 9] = nodeValue("Texture Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| in_mesh + 9] = nodeValue_Vector("Texture Scale", self, [ 1, 1 ] ); - inputs[| in_mesh + 10] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 10] = nodeValue_Bool("Loop", self, false ); - inputs[| in_mesh + 11] = nodeValue("Inverted", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 11] = nodeValue_Bool("Inverted", self, false ); input_display_list = [ ["Path", false], in_mesh + 0, in_mesh + 10, diff --git a/scripts/node_3d_mesh_plane/node_3d_mesh_plane.gml b/scripts/node_3d_mesh_plane/node_3d_mesh_plane.gml index c881c4b71..d8b24b11e 100644 --- a/scripts/node_3d_mesh_plane/node_3d_mesh_plane.gml +++ b/scripts/node_3d_mesh_plane/node_3d_mesh_plane.gml @@ -3,15 +3,15 @@ function Node_3D_Mesh_Plane(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _grou object_class = __3dPlane; - inputs[| in_mesh + 0] = nodeValue("Material", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 0] = nodeValue_D3Material("Material", self, new __d3dMaterial()) .setVisible(true, true); inputs[| in_mesh + 1] = nodeValue_Enum_Button("Normal", self, 2 , [ "X", "Y", "Z" ]); - inputs[| in_mesh + 2] = nodeValue("Both side", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| in_mesh + 2] = nodeValue_Bool("Both side", self, false ) .rejectArray(); - inputs[| in_mesh + 3] = nodeValue("Back Material", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ); + inputs[| in_mesh + 3] = nodeValue_D3Material("Back Material", self, new __d3dMaterial()) input_display_list = [ __d3d_input_list_mesh, in_mesh + 1, diff --git a/scripts/node_3d_mesh_sphere_ico/node_3d_mesh_sphere_ico.gml b/scripts/node_3d_mesh_sphere_ico/node_3d_mesh_sphere_ico.gml index ca5e01771..f146ea4fb 100644 --- a/scripts/node_3d_mesh_sphere_ico/node_3d_mesh_sphere_ico.gml +++ b/scripts/node_3d_mesh_sphere_ico/node_3d_mesh_sphere_ico.gml @@ -3,13 +3,13 @@ function Node_3D_Mesh_Sphere_Ico(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, object_class = __3dICOSphere; - inputs[| in_mesh + 0] = nodeValue("Subdivision", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ) + inputs[| in_mesh + 0] = nodeValue_Int("Subdivision", self, 1 ) .setValidator(VV_min(0)); - inputs[| in_mesh + 1] = nodeValue("Material", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 1] = nodeValue_D3Material("Material", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 2] = nodeValue("Smooth Normal", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 2] = nodeValue_Bool("Smooth Normal", self, false ); input_display_list = [ __d3d_input_list_mesh, in_mesh + 0, in_mesh + 2, diff --git a/scripts/node_3d_mesh_sphere_uv/node_3d_mesh_sphere_uv.gml b/scripts/node_3d_mesh_sphere_uv/node_3d_mesh_sphere_uv.gml index 5dc12cdc9..90fd6574a 100644 --- a/scripts/node_3d_mesh_sphere_uv/node_3d_mesh_sphere_uv.gml +++ b/scripts/node_3d_mesh_sphere_uv/node_3d_mesh_sphere_uv.gml @@ -3,16 +3,16 @@ function Node_3D_Mesh_Sphere_UV(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _ object_class = __3dUVSphere; - inputs[| in_mesh + 0] = nodeValue("Horizontal Slices", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8 ) + inputs[| in_mesh + 0] = nodeValue_Int("Horizontal Slices", self, 8 ) .setValidator(VV_min(2)); - inputs[| in_mesh + 1] = nodeValue("Vertical Slices", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 16 ) + inputs[| in_mesh + 1] = nodeValue_Int("Vertical Slices", self, 16 ) .setValidator(VV_min(3)); - inputs[| in_mesh + 2] = nodeValue("Material", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 2] = nodeValue_D3Material("Material", self, new __d3dMaterial()) .setVisible(true, true); - inputs[| in_mesh + 3] = nodeValue("Smooth Normal", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 3] = nodeValue_Bool("Smooth Normal", self, false ); input_display_list = [ __d3d_input_list_mesh, in_mesh + 0, in_mesh + 1, in_mesh + 3, diff --git a/scripts/node_3d_mesh_stack_slice/node_3d_mesh_stack_slice.gml b/scripts/node_3d_mesh_stack_slice/node_3d_mesh_stack_slice.gml index f36ce63e1..23461c60a 100644 --- a/scripts/node_3d_mesh_stack_slice/node_3d_mesh_stack_slice.gml +++ b/scripts/node_3d_mesh_stack_slice/node_3d_mesh_stack_slice.gml @@ -1,20 +1,18 @@ function Node_3D_Mesh_Stack_Slice(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Slice Stack"; - inputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Mesh, noone) + inputs[| 0] = nodeValue_D3Mesh("Mesh", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Output Dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 16, 16 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Output Dimension", self, [ 16, 16 ]); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = nodeValue_Float("Scale", self, 1); - inputs[| 3] = nodeValue("Slices", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 3] = nodeValue_Int("Slices", self, 4); - inputs[| 4] = nodeValue("BBOX Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("BBOX Padding", self, [ 0, 0, 0 ]); - outputs[| 0] = nodeValue("Outputs", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []) + outputs[| 0] = nodeValue_Output("Outputs", self, VALUE_TYPE.surface, []) .setArrayDepth(1); mesh_data = new Inspector_Label("", f_code); diff --git a/scripts/node_3d_mesh_terrain/node_3d_mesh_terrain.gml b/scripts/node_3d_mesh_terrain/node_3d_mesh_terrain.gml index 34fc1ef14..017622f6f 100644 --- a/scripts/node_3d_mesh_terrain/node_3d_mesh_terrain.gml +++ b/scripts/node_3d_mesh_terrain/node_3d_mesh_terrain.gml @@ -3,22 +3,21 @@ function Node_3D_Mesh_Terrain(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _gr object_class = __3dTerrain; - inputs[| in_mesh + 0] = nodeValue("Material", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 0] = nodeValue_D3Material("Material", self, new __d3dMaterial()) .setVisible(true, true); inputs[| in_mesh + 1] = nodeValue_Enum_Button("Input type", self, 0 , [ "Surface", "Array" ]); inputs[| in_mesh + 2] = nodeValue_Surface("Height map", self); - inputs[| in_mesh + 3] = nodeValue("Subdivision", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4 ); + inputs[| in_mesh + 3] = nodeValue_Int("Subdivision", self, 4 ); - inputs[| in_mesh + 4] = nodeValue("Height array", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [] ) + inputs[| in_mesh + 4] = nodeValue_Float("Height array", self, [] ) .setArrayDepth(2); - inputs[| in_mesh + 5] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| in_mesh + 5] = nodeValue_Bool("Smooth", self, false ); - inputs[| in_mesh + 6] = nodeValue("Front Height Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| in_mesh + 6] = nodeValue_Slider_Range("Front Height Level", self, [ 0, 1 ]); input_display_list = [ __d3d_input_list_transform, diff --git a/scripts/node_3d_particle/node_3d_particle.gml b/scripts/node_3d_particle/node_3d_particle.gml index 75be0656e..099811cad 100644 --- a/scripts/node_3d_particle/node_3d_particle.gml +++ b/scripts/node_3d_particle/node_3d_particle.gml @@ -2,7 +2,7 @@ function Node_3D_Particle(_x, _y, _group = noone) : Node_3D_Modifier(_x, _y, _gr name = "3D Particle"; update_on_frame = true; - inputs[| in_mesh + 0] = nodeValue("Amounts", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| in_mesh + 0] = nodeValue_Int("Amounts", self, 1); part_pool_size = 128; parts = array_create(part_pool_size); diff --git a/scripts/node_3d_point_affector/node_3d_point_affector.gml b/scripts/node_3d_point_affector/node_3d_point_affector.gml index bfd4667cb..01f523971 100644 --- a/scripts/node_3d_point_affector/node_3d_point_affector.gml +++ b/scripts/node_3d_point_affector/node_3d_point_affector.gml @@ -5,24 +5,21 @@ function Node_3D_Point_Affector(_x, _y, _group = noone) : Node_3D_Object(_x, _y, gizmo_plane = [ new __3dGizmoPlaneFalloff(,, 0.75) ]; gizmo_object = noone; - inputs[| in_d3d + 0] = nodeValue("Points", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setVisible(true, true) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| in_d3d + 0] = nodeValue_Vector("Points", self, [ 0, 0, 0 ]) + .setVisible(true, true); - inputs[| in_d3d + 1] = nodeValue("Initial value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| in_d3d + 1] = nodeValue_Vector("Initial value", self, [ 0, 0, 0 ]); - inputs[| in_d3d + 2] = nodeValue("Final value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| in_d3d + 2] = nodeValue_Vector("Final value", self, [ 0, 0, 0 ]); - inputs[| in_d3d + 3] = nodeValue("Falloff distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5); + inputs[| in_d3d + 3] = nodeValue_Float("Falloff distance", self, 0.5); inputs[| in_d3d + 4] = nodeValue("Falloff curve", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_01); inputs[| in_d3d + 5] = nodeValue_Enum_Scroll("Shape", self, 0, [ new scrollItem("Sphere", s_node_3d_affector_shape, 0), new scrollItem("Plane", s_node_3d_affector_shape, 1), ]); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0, 0 ]) + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.float, [ 0, 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); input_display_list = [ diff --git a/scripts/node_3d_repeat/node_3d_repeat.gml b/scripts/node_3d_repeat/node_3d_repeat.gml index 3c9e8d7ee..063555b53 100644 --- a/scripts/node_3d_repeat/node_3d_repeat.gml +++ b/scripts/node_3d_repeat/node_3d_repeat.gml @@ -1,45 +1,39 @@ function Node_3D_Repeat(_x, _y, _group = noone) : Node_3D(_x, _y, _group) constructor { name = "3D Repeat"; - inputs[| 0] = nodeValue("Objects", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Mesh, noone ) + inputs[| 0] = nodeValue_D3Mesh("Objects", self, noone) .setArrayDepth(1) .setVisible(true, true); inputs[| 1] = nodeValue_Enum_Button("Object Mode", self, 0 , [ "Duplicate", "Array" ] ) .rejectArray(); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ); + inputs[| 2] = nodeValue_Int("Amount", self, 1 ); - inputs[| 3] = nodeValue("Starting Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Starting Position", self, [ 0, 0, 0 ] ); - inputs[| 4] = nodeValue("Starting Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 1 ] ) - .setDisplay(VALUE_DISPLAY.d3quarternion); + inputs[| 4] = nodeValue_Quaternion("Starting Rotation", self, [ 0, 0, 0, 1 ] ); - inputs[| 5] = nodeValue("Starting Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Starting Scale", self, [ 1, 1, 1 ] ); - inputs[| 6] = nodeValue("Shift Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Shift Position", self, [ 0, 0, 0 ] ); - inputs[| 7] = nodeValue("Shift Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 1 ] ) - .setDisplay(VALUE_DISPLAY.d3quarternion); + inputs[| 7] = nodeValue_Quaternion("Shift Rotation", self, [ 0, 0, 0, 1 ] ); - inputs[| 8] = nodeValue("Shift Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 8] = nodeValue_Vector("Shift Scale", self, [ 0, 0, 0 ] ); - inputs[| 9] = nodeValue("Positions", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [] ) + inputs[| 9] = nodeValue_Float("Positions", self, [] ) .setArrayDepth(2); - inputs[| 10] = nodeValue("Rotations", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [] ) + inputs[| 10] = nodeValue_Float("Rotations", self, [] ) .setArrayDepth(2); - inputs[| 11] = nodeValue("Scales", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [] ) + inputs[| 11] = nodeValue_Float("Scales", self, [] ) .setArrayDepth(2); - inputs[| 12] = nodeValue("Use Instance", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ) + inputs[| 12] = nodeValue_Bool("Use Instance", self, true ) - outputs[| 0] = nodeValue("Scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Scene, noone); + outputs[| 0] = nodeValue_Output("Scene", self, VALUE_TYPE.d3Scene, noone); input_display_list = [ ["Objects", false], 0, 3, 4, 5, diff --git a/scripts/node_3d_round_vertex/node_3d_round_vertex.gml b/scripts/node_3d_round_vertex/node_3d_round_vertex.gml index f1646480c..e2aca83cf 100644 --- a/scripts/node_3d_round_vertex/node_3d_round_vertex.gml +++ b/scripts/node_3d_round_vertex/node_3d_round_vertex.gml @@ -1,7 +1,7 @@ function Node_3D_Round_Vertex(_x, _y, _group = noone) : Node_3D_Modifier(_x, _y, _group) constructor { name = "Discretize vertex"; - inputs[| in_mesh + 0] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| in_mesh + 0] = nodeValue_Float("Step", self, 0.1) static processData = function(_output, _data, _output_index, _array_index = 0) { var _obj = _data[0]; diff --git a/scripts/node_3d_scene/node_3d_scene.gml b/scripts/node_3d_scene/node_3d_scene.gml index 21fdf3047..8a0d49d3c 100644 --- a/scripts/node_3d_scene/node_3d_scene.gml +++ b/scripts/node_3d_scene/node_3d_scene.gml @@ -1,13 +1,13 @@ function Node_3D_Scene(_x, _y, _group = noone) : Node_3D(_x, _y, _group) constructor { name = "3D Scene"; - outputs[| 0] = nodeValue("Scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Scene, noone); + outputs[| 0] = nodeValue_Output("Scene", self, VALUE_TYPE.d3Scene, noone); object_lists = []; static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index] = nodeValue("Object", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Mesh, noone ) + inputs[| index] = nodeValue_D3Mesh("Object", self, noone) .setVisible(true, true); return inputs[| index]; diff --git a/scripts/node_3d_set_material/node_3d_set_material.gml b/scripts/node_3d_set_material/node_3d_set_material.gml index e9302fd5a..68f95df61 100644 --- a/scripts/node_3d_set_material/node_3d_set_material.gml +++ b/scripts/node_3d_set_material/node_3d_set_material.gml @@ -1,11 +1,11 @@ function Node_3D_Set_Material(_x, _y, _group = noone) : Node_3D_Modifier(_x, _y, _group) constructor { name = "Set Material"; - inputs[| in_mesh + 0] = nodeValue("Materials", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, new __d3dMaterial() ) + inputs[| in_mesh + 0] = nodeValue_D3Material("Materials", self, new __d3dMaterial()) .setVisible(true, true) .setArrayDepth(1); - inputs[| in_mesh + 1] = nodeValue("Single material", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| in_mesh + 1] = nodeValue_Bool("Single material", self, true) static preGetInputs = function() { #region var _sing = inputs[| in_mesh + 1].getValue(); diff --git a/scripts/node_3d_transform/node_3d_transform.gml b/scripts/node_3d_transform/node_3d_transform.gml index 0f2c9558f..81a48df3e 100644 --- a/scripts/node_3d_transform/node_3d_transform.gml +++ b/scripts/node_3d_transform/node_3d_transform.gml @@ -1,10 +1,10 @@ function Node_3D_Transform(_x, _y, _group = noone) : Node_3D_Object(_x, _y, _group) constructor { name = "Transform"; - inputs[| in_d3d + 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Mesh, noone) + inputs[| in_d3d + 0] = nodeValue_D3Mesh("Mesh", self, noone) .setVisible(true, true); - outputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Mesh, noone); + outputs[| 0] = nodeValue_Output("Mesh", self, VALUE_TYPE.d3Mesh, noone); input_display_list = [ in_d3d + 0, ["Transform", false], 0, 1, 2, diff --git a/scripts/node_3d_transform_image/node_3d_mesh_plane.gml b/scripts/node_3d_transform_image/node_3d_mesh_plane.gml index 032af6535..4215bc47c 100644 --- a/scripts/node_3d_transform_image/node_3d_mesh_plane.gml +++ b/scripts/node_3d_transform_image/node_3d_mesh_plane.gml @@ -8,7 +8,7 @@ function Node_3D_Mesh_Plane(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, _grou inputs[| in_mesh + 1] = nodeValue_Enum_Button("Normal", self, 2 , [ "X", "Y", "Z" ]); - inputs[| in_mesh + 2] = nodeValue("Both side", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| in_mesh + 2] = nodeValue_Bool("Both side", self, false ) inputs[| in_mesh + 3] = nodeValue("Back Material", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, noone ) diff --git a/scripts/node_3d_transform_image/node_3d_transform_image.gml b/scripts/node_3d_transform_image/node_3d_transform_image.gml index d07910caa..3b33fd6c6 100644 --- a/scripts/node_3d_transform_image/node_3d_transform_image.gml +++ b/scripts/node_3d_transform_image/node_3d_transform_image.gml @@ -28,7 +28,7 @@ function Node_3D_Transform_Image(_x, _y, _group = noone) : Node_3D_Mesh(_x, _y, ] outputs[| 0].setVisible(false); - outputs[| 1] = nodeValue("Rendered", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Rendered", self, VALUE_TYPE.surface, noone); output_display_list = [ 1 ] diff --git a/scripts/node_3d_transform_scene/node_3d_transform_scene.gml b/scripts/node_3d_transform_scene/node_3d_transform_scene.gml index 5bf90f04c..2423d33f0 100644 --- a/scripts/node_3d_transform_scene/node_3d_transform_scene.gml +++ b/scripts/node_3d_transform_scene/node_3d_transform_scene.gml @@ -1,16 +1,16 @@ function Node_3D_Transform_Scene(_x, _y, _group = noone) : Node_3D(_x, _y, _group) constructor { name = "Transform Scene"; - inputs[| 0] = nodeValue("Scene", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Scene, noone) + inputs[| 0] = nodeValue_D3Scene("Scene", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 1] = nodeValue_Float("Position", self, []) .setArrayDepth(2); - inputs[| 2] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 2] = nodeValue_Float("Rotation", self, []) .setArrayDepth(2); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 3] = nodeValue_Float("Scale", self, []) .setArrayDepth(2); inputs[| 4] = nodeValue_Enum_Scroll("Positioning type", self, 0, [ "Additive", "Override" ]); @@ -19,7 +19,7 @@ function Node_3D_Transform_Scene(_x, _y, _group = noone) : Node_3D(_x, _y, _grou inputs[| 6] = nodeValue_Enum_Scroll("Scaling type", self, 0, [ "Additive", "Multiplicative", "Override" ]); - outputs[| 0] = nodeValue("Scene", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Scene, noone); + outputs[| 0] = nodeValue_Output("Scene", self, VALUE_TYPE.d3Scene, noone); input_display_list = [ 0, ["Transform", false], 1, 2, 3, diff --git a/scripts/node_3d_uv_remap/node_3d_uv_remap.gml b/scripts/node_3d_uv_remap/node_3d_uv_remap.gml index c627cd40a..0dd9901bf 100644 --- a/scripts/node_3d_uv_remap/node_3d_uv_remap.gml +++ b/scripts/node_3d_uv_remap/node_3d_uv_remap.gml @@ -2,16 +2,16 @@ function Node_3D_UV_Remap(_x, _y, _group = noone) : Node_3D_Object(_x, _y, _grou name = "UV Remap"; gizmo = new __3dGizmoPlane(); - inputs[| in_d3d + 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Mesh, noone) + inputs[| in_d3d + 0] = nodeValue_D3Mesh("Mesh", self, noone) .setVisible(true, true); - inputs[| in_d3d + 1] = nodeValue("Target subobject", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, -1) + inputs[| in_d3d + 1] = nodeValue_Int("Target subobject", self, -1) .setArrayDepth(1); - inputs[| in_d3d + 2] = nodeValue("Bake UV", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| in_d3d + 2] = nodeValue_Int("Bake UV", self, 0) .setDisplay(VALUE_DISPLAY.button, { name: "Bake", onClick: function() { attributes.bakedUV = !attributes.bakedUV; triggerRender(); } }); - outputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.output, VALUE_TYPE.d3Mesh, noone); + outputs[| 0] = nodeValue_Output("Mesh", self, VALUE_TYPE.d3Mesh, noone); input_display_list = [ ["Transform", false], 0, 1, 2, diff --git a/scripts/node_3dsurf/node_3dsurf.gml b/scripts/node_3dsurf/node_3dsurf.gml index ce4c11d54..4280c3c49 100644 --- a/scripts/node_3dsurf/node_3dsurf.gml +++ b/scripts/node_3dsurf/node_3dsurf.gml @@ -3,18 +3,17 @@ function Node_3DSurf(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co cached_object = []; object_class = dynaSurf_3d; - inputs[| 0] = nodeValue("Scene", self, JUNCTION_CONNECT.input, VALUE_TYPE.d3Scene, noone) + inputs[| 0] = nodeValue_D3Scene("Scene", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Base Dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Base Dimension", self, DEF_SURF); - inputs[| 2] = nodeValue("Vertical Angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 45 ) + inputs[| 2] = nodeValue_Float("Vertical Angle", self, 45 ) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 90, 0.1] }); - inputs[| 3] = nodeValue("Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ); + inputs[| 3] = nodeValue_Float("Distance", self, 4 ); - outputs[| 0] = nodeValue("3DSurf", self, JUNCTION_CONNECT.output, VALUE_TYPE.dynaSurface, noone); + outputs[| 0] = nodeValue_Output("3DSurf", self, VALUE_TYPE.dynaSurface, noone); input_display_list = [ 0, ["Camera", false], 1, 2, 3, diff --git a/scripts/node_9slice/node_9slice.gml b/scripts/node_9slice/node_9slice.gml index ae638e052..df1277f8c 100644 --- a/scripts/node_9slice/node_9slice.gml +++ b/scripts/node_9slice/node_9slice.gml @@ -5,13 +5,12 @@ function Node_9Slice(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Splice", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 2] = nodeValue_Padding("Splice", self, [ 0, 0, 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); inputs[| 3] = nodeValue_Enum_Scroll("Filling modes", self, 0, [ "Scale", "Repeat" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_interpolation(); diff --git a/scripts/node_FFT/node_FFT.gml b/scripts/node_FFT/node_FFT.gml index 04dfaedd6..bf8bac2bf 100644 --- a/scripts/node_FFT/node_FFT.gml +++ b/scripts/node_FFT/node_FFT.gml @@ -2,13 +2,13 @@ function Node_FFT(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) const name = "FFT"; setDimension(96, 72); - inputs[| 0] = nodeValue("Data", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 0] = nodeValue_Float("Data", self, []) .setArrayDepth(1) .setVisible(true, true); inputs[| 1] = nodeValue_Enum_Scroll("Preprocess Function", self, 0, [ "None", "Hann" ]); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []) + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.float, []) .setArrayDepth(1); static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_FLIP_add_rigidbody/node_FLIP_add_rigidbody.gml b/scripts/node_FLIP_add_rigidbody/node_FLIP_add_rigidbody.gml index eaeca8730..6b1edd52b 100644 --- a/scripts/node_FLIP_add_rigidbody/node_FLIP_add_rigidbody.gml +++ b/scripts/node_FLIP_add_rigidbody/node_FLIP_add_rigidbody.gml @@ -6,7 +6,7 @@ function Node_FLIP_Add_Rigidbody(_x, _y, _group = noone) : Node(_x, _y, _group) manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone ) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone ) .setVisible(true, true); inputs[| 1] = nodeValue("Objects", self, JUNCTION_CONNECT.input, VALUE_TYPE.rigid, [] ) @@ -16,7 +16,7 @@ function Node_FLIP_Add_Rigidbody(_x, _y, _group = noone) : Node(_x, _y, _group) ["Collider", false], 1, ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone ); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone ); obstracle = new FLIP_Obstracle(); index = 0; diff --git a/scripts/node_FLIP_apply_force/node_FLIP_apply_force.gml b/scripts/node_FLIP_apply_force/node_FLIP_apply_force.gml index 6e1873ef8..682f4a93d 100644 --- a/scripts/node_FLIP_apply_force/node_FLIP_apply_force.gml +++ b/scripts/node_FLIP_apply_force/node_FLIP_apply_force.gml @@ -22,20 +22,18 @@ function Node_FLIP_Apply_Force(_x, _y, _group = noone) : Node(_x, _y, _group) co manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone ) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone ) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(); }); - inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ) + inputs[| 2] = nodeValue_Float("Radius", self, 4 ) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); inputs[| 3] = nodeValue_Enum_Scroll("Shape", self, 0 , [ new scrollItem("Circle", s_node_shape_circle, 0), new scrollItem("Rectangle", s_node_shape_rectangle, 0), ]); - inputs[| 4] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Size", self, [ 4, 4 ] ); inputs[| 5] = nodeValue_Surface("Texture", self) @@ -44,7 +42,7 @@ function Node_FLIP_Apply_Force(_x, _y, _group = noone) : Node(_x, _y, _group) co ["Obstracle", false], 1, 5, ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone ); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone ); obstracle = new FLIP_Obstracle(); index = 0; diff --git a/scripts/node_FLIP_apply_velocity/node_FLIP_apply_velocity.gml b/scripts/node_FLIP_apply_velocity/node_FLIP_apply_velocity.gml index 764d91ab4..b28228502 100644 --- a/scripts/node_FLIP_apply_velocity/node_FLIP_apply_velocity.gml +++ b/scripts/node_FLIP_apply_velocity/node_FLIP_apply_velocity.gml @@ -6,29 +6,26 @@ function Node_FLIP_Apply_Velocity(_x, _y, _group = noone) : Node(_x, _y, _group) manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone ) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone ) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(); }); - inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ) + inputs[| 2] = nodeValue_Float("Radius", self, 4 ) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); - inputs[| 3] = nodeValue("Velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Velocity", self, [ 0, 0 ] ); inputs[| 4] = nodeValue_Enum_Scroll("Shape", self, 0 , [ new scrollItem("Circle", s_node_shape_circle, 0), new scrollItem("Rectangle", s_node_shape_rectangle, 0) ]); - inputs[| 5] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Size", self, [ 4, 4 ] ); input_display_list = [ 0, ["Velocity", false], 4, 1, 2, 5, 3, ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone ); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone ); static getDimension = function() { var domain = getInputData(0); diff --git a/scripts/node_FLIP_destroy/node_FLIP_destroy.gml b/scripts/node_FLIP_destroy/node_FLIP_destroy.gml index 055205a97..77426c2a4 100644 --- a/scripts/node_FLIP_destroy/node_FLIP_destroy.gml +++ b/scripts/node_FLIP_destroy/node_FLIP_destroy.gml @@ -6,25 +6,23 @@ function Node_FLIP_Destroy(_x, _y, _group = noone) : Node(_x, _y, _group) constr manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone ) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone ) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(); }); inputs[| 2] = nodeValue_Enum_Scroll("Shape", self, 0 , [ new scrollItem("Circle", s_node_shape_circle, 0), new scrollItem("Rectangle", s_node_shape_rectangle, 0), ]); - inputs[| 3] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ) + inputs[| 3] = nodeValue_Float("Radius", self, 4 ) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); - inputs[| 4] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Size", self, [ 4, 4 ] ); - inputs[| 5] = nodeValue("Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 5] = nodeValue_Float("Ratio", self, 1 ) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone ); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone ); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region var _pos = getInputData(1); diff --git a/scripts/node_FLIP_domain/node_FLIP_domain.gml b/scripts/node_FLIP_domain/node_FLIP_domain.gml index 779bf2537..092679bcf 100644 --- a/scripts/node_FLIP_domain/node_FLIP_domain.gml +++ b/scripts/node_FLIP_domain/node_FLIP_domain.gml @@ -9,34 +9,33 @@ function Node_FLIP_Domain(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Particle Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 1] = nodeValue_Int("Particle Size", self, 1); - inputs[| 2] = nodeValue("Particle Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 10); + inputs[| 2] = nodeValue_Int("Particle Density", self, 10); - inputs[| 3] = nodeValue("FLIP Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.8) + inputs[| 3] = nodeValue_Float("FLIP Ratio", self, 0.8) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Resolve accelerator", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.5); + inputs[| 4] = nodeValue_Float("Resolve accelerator", self, 1.5); - inputs[| 5] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8); + inputs[| 5] = nodeValue_Int("Iteration", self, 8); - inputs[| 6] = nodeValue("Damping", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.8) + inputs[| 6] = nodeValue_Float("Damping", self, 0.8) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Gravity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 5); + inputs[| 7] = nodeValue_Float("Gravity", self, 5); - inputs[| 8] = nodeValue("Time Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.05); + inputs[| 8] = nodeValue_Float("Time Step", self, 0.05); - inputs[| 9] = nodeValue("Wall", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: [ "T", "B", "L", "R" ] }); + inputs[| 9] = nodeValue_Toggle("Wall", self, 0b1111, { data: [ "T", "B", "L", "R" ] }); - inputs[| 10] = nodeValue("Viscosity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 10] = nodeValue_Float("Viscosity", self, 0.) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }); - inputs[| 11] = nodeValue("Friction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 11] = nodeValue_Float("Friction", self, 0.) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 12] = nodeValue("Wall Elasticity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 12] = nodeValue_Float("Wall Elasticity", self, 0.) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }); inputs[| 13] = nodeValue_Rotation("Gravity Direction", self, 0); @@ -47,7 +46,7 @@ function Node_FLIP_Domain(_x, _y, _group = noone) : Node(_x, _y, _group) constru ["Physics", false], 7, 13, 10, 11, ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone); #region attributes array_push(attributeEditors, "FLIP Solver"); diff --git a/scripts/node_FLIP_render/node_FLIP_render.gml b/scripts/node_FLIP_render/node_FLIP_render.gml index 46dcac9a2..11915bca5 100644 --- a/scripts/node_FLIP_render/node_FLIP_render.gml +++ b/scripts/node_FLIP_render/node_FLIP_render.gml @@ -5,37 +5,34 @@ function Node_FLIP_Render(_x, _y, _group = noone) : Node(_x, _y, _group) constru manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Merge threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.75) + inputs[| 1] = nodeValue_Float("Merge threshold", self, 0.75) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 2] = nodeValue("Lifespan", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 2] = nodeValue_Range("Lifespan", self, [ 0, 0 ], { linked : true }); - inputs[| 3] = nodeValue("Particle expansion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 20); + inputs[| 3] = nodeValue_Float("Particle expansion", self, 20); - inputs[| 4] = nodeValue("Draw obstracles", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Draw obstracles", self, true); inputs[| 5] = nodeValue_Surface("Fluid particle", self); inputs[| 6] = nodeValue_Enum_Scroll("Render type", self, 0, [ new scrollItem("Particle", s_node_flip_render, 0), new scrollItem("Line", s_node_flip_render, 1), ] ); - inputs[| 7] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Threshold", self, true); - inputs[| 8] = nodeValue("Additive", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Additive", self, true); - inputs[| 9] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 9] = nodeValue_Slider_Range("Alpha", self, [ 1, 1 ]); - inputs[| 10] = nodeValue("Segments", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 10] = nodeValue_Int("Segments", self, 1); - inputs[| 11] = nodeValue("Color Over Velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))); + inputs[| 11] = nodeValue_Gradient("Color Over Velocity", self, new gradientObject(cola(c_white))); - inputs[| 12] = nodeValue("Velocity Map", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 10 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 12] = nodeValue_Range("Velocity Map", self, [ 0, 10 ]); input_display_list = [ 0, 5, ["Rendering", false], 6, 10, 3, 4, 9, @@ -43,7 +40,7 @@ function Node_FLIP_Render(_x, _y, _group = noone) : Node(_x, _y, _group) constru ["Post Processing", false], 8, 7, 1, ]; - outputs[| 0] = nodeValue("Rendered", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Rendered", self, VALUE_TYPE.surface, noone); seed = irandom_range(100000, 999999); temp_surface = [ noone ]; diff --git a/scripts/node_FLIP_repel/node_FLIP_repel.gml b/scripts/node_FLIP_repel/node_FLIP_repel.gml index 9d6a27fb8..fb7754871 100644 --- a/scripts/node_FLIP_repel/node_FLIP_repel.gml +++ b/scripts/node_FLIP_repel/node_FLIP_repel.gml @@ -6,23 +6,22 @@ function Node_FLIP_Repel(_x, _y, _group = noone) : Node(_x, _y, _group) construc manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone ) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone ) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(); }); - inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ); + inputs[| 2] = nodeValue_Float("Radius", self, 4 ); - inputs[| 3] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ) + inputs[| 3] = nodeValue_Float("Strength", self, 4 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 16, 0.1 ] }); input_display_list = [ 0, ["Repel", false], 1, 2, 3, ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone ); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone ); static getDimension = function() { #region var domain = getInputData(0); diff --git a/scripts/node_FLIP_spawner/node_FLIP_spawner.gml b/scripts/node_FLIP_spawner/node_FLIP_spawner.gml index 954d16cad..093fc0849 100644 --- a/scripts/node_FLIP_spawner/node_FLIP_spawner.gml +++ b/scripts/node_FLIP_spawner/node_FLIP_spawner.gml @@ -6,49 +6,45 @@ function Node_FLIP_Spawner(_x, _y, _group = noone) : Node(_x, _y, _group) constr manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone ) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone ) .setVisible(true, true); inputs[| 1] = nodeValue_Enum_Scroll("Spawn Shape", self, 0 , [ new scrollItem("Circle", s_node_shape_circle, 0), new scrollItem("Rectangle", s_node_shape_rectangle, 0), "Surface" ]); - inputs[| 2] = nodeValue("Spawn Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.25 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Spawn Position", self, [ 0.5, 0.25 ] ) .setUnitRef(function(index) { return getDimension(); }, VALUE_UNIT.reference); inputs[| 3] = nodeValue_Enum_Button("Spawn Type", self, 0 , [ "Stream", "Splash" ]); - inputs[| 4] = nodeValue("Spawn Frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0 ); + inputs[| 4] = nodeValue_Int("Spawn Frame", self, 0 ); - inputs[| 5] = nodeValue("Spawn Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 8 ); + inputs[| 5] = nodeValue_Float("Spawn Amount", self, 8 ); - inputs[| 6] = nodeValue("Spawn Velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 6] = nodeValue_Range("Spawn Velocity", self, [ 0, 0 ] ); inputs[| 7] = nodeValue_Surface("Spawn Surface", self); - inputs[| 8] = nodeValue("Spawn Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2 ) + inputs[| 8] = nodeValue_Float("Spawn Radius", self, 2 ) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); - inputs[| 9] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 9] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 9].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 10] = nodeValue("Spawn Direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 45, 135, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.rotation_random); + inputs[| 10] = nodeValue_Rotation_Random("Spawn Direction", self, [ 0, 45, 135, 0, 0 ] ); - inputs[| 11] = nodeValue("Inherit Velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 11] = nodeValue_Float("Inherit Velocity", self, 0 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 12] = nodeValue("Spawn Duration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ); + inputs[| 12] = nodeValue_Int("Spawn Duration", self, 1 ); - inputs[| 13] = nodeValue("Spawn Szie", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 2, 2 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 13] = nodeValue_Vector("Spawn Szie", self, [ 2, 2 ] ); input_display_list = [ 0, 9, ["Spawner", false], 1, 7, 8, 13, 2, 3, 4, 12, 5, ["Physics", false], 10, 6, 11, ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone ); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone ); spawn_amo = 0; prev_position = [ 0, 0 ]; diff --git a/scripts/node_FLIP_to_VFX/node_FLIP_to_VFX.gml b/scripts/node_FLIP_to_VFX/node_FLIP_to_VFX.gml index bfe4d00b5..b3ee47e7b 100644 --- a/scripts/node_FLIP_to_VFX/node_FLIP_to_VFX.gml +++ b/scripts/node_FLIP_to_VFX/node_FLIP_to_VFX.gml @@ -6,10 +6,10 @@ function Node_FLIP_to_VFX(_x, _y, _group = noone) : Node(_x, _y, _group) constru manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone) .setVisible(true, true); - outputs[| 0] = nodeValue("Particles", self, JUNCTION_CONNECT.output, VALUE_TYPE.particle, [] ); + outputs[| 0] = nodeValue_Output("Particles", self, VALUE_TYPE.particle, [] ); attributes.part_amount = 512; array_push(attributeEditors, ["Maximum particles", function() { return attributes.part_amount; }, diff --git a/scripts/node_FLIP_update/node_FLIP_update.gml b/scripts/node_FLIP_update/node_FLIP_update.gml index 447c1d61e..424d064a8 100644 --- a/scripts/node_FLIP_update/node_FLIP_update.gml +++ b/scripts/node_FLIP_update/node_FLIP_update.gml @@ -6,20 +6,20 @@ function Node_FLIP_Update(_x, _y, _group = noone) : Node(_x, _y, _group) constru manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Update", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Update", self, true); - inputs[| 2] = nodeValue("Override timestep", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Override timestep", self, false); - inputs[| 3] = nodeValue("Timestep", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.01); + inputs[| 3] = nodeValue_Float("Timestep", self, 0.01); input_display_list = [ 0, 1, ["Timestep", false], 2, 3, ]; - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone); static update = function(frame = CURRENT_FRAME) { var domain = getInputData(0); diff --git a/scripts/node_FLIP_vortex/node_FLIP_vortex.gml b/scripts/node_FLIP_vortex/node_FLIP_vortex.gml index 10472baf5..4fb88ff18 100644 --- a/scripts/node_FLIP_vortex/node_FLIP_vortex.gml +++ b/scripts/node_FLIP_vortex/node_FLIP_vortex.gml @@ -6,26 +6,25 @@ function Node_FLIP_Vortex(_x, _y, _group = noone) : Node(_x, _y, _group) constru manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone ) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone ) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(); }); - inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ); + inputs[| 2] = nodeValue_Float("Radius", self, 4 ); - inputs[| 3] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ) + inputs[| 3] = nodeValue_Float("Strength", self, 4 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ -8, 8, 0.01 ] }); - inputs[| 4] = nodeValue("Attraction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 4] = nodeValue_Float("Attraction", self, 0 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ -8, 8, 0.01 ] }); input_display_list = [ 0, ["Vertex", false], 1, 2, 3, 4, ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone ); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone ); static getDimension = function() { #region var domain = getInputData(0); diff --git a/scripts/node_FLIP_wall/node_FLIP_wall.gml b/scripts/node_FLIP_wall/node_FLIP_wall.gml index 609a2cf77..abf51c2ab 100644 --- a/scripts/node_FLIP_wall/node_FLIP_wall.gml +++ b/scripts/node_FLIP_wall/node_FLIP_wall.gml @@ -6,17 +6,16 @@ function Node_FLIP_Wall(_x, _y, _group = noone) : Node(_x, _y, _group) construct manual_ungroupable = false; - inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.fdomain, noone ) + inputs[| 0] = nodeValue_Fdomain("Domain", self, noone ) .setVisible(true, true); - inputs[| 1] = nodeValue("Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA ) - .setDisplay(VALUE_DISPLAY.area, { useShape : false }); + inputs[| 1] = nodeValue_Area("Area", self, DEF_AREA , { useShape : false }); input_display_list = [ 0, ["Collider", false], 1 ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.fdomain, noone ); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.fdomain, noone ); obstracle = new FLIP_Obstracle(); diff --git a/scripts/node_FXAA/node_FXAA.gml b/scripts/node_FXAA/node_FXAA.gml index 2527c2e77..84f6a64ca 100644 --- a/scripts/node_FXAA/node_FXAA.gml +++ b/scripts/node_FXAA/node_FXAA.gml @@ -3,12 +3,12 @@ function Node_FXAA(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); - inputs[| 2] = nodeValue("Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Distance", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); active_index = 1; @@ -18,7 +18,7 @@ function Node_FXAA(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons ["Effect", false], 2, 3, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_FXAA/node_bw.gml b/scripts/node_FXAA/node_bw.gml index af27efe62..1d28185b4 100644 --- a/scripts/node_FXAA/node_bw.gml +++ b/scripts/node_FXAA/node_bw.gml @@ -11,13 +11,13 @@ function Node_BW(_x, _y) : Node_Processor(_x, _y) constructor { uniform_con = shader_get_uniform(sh_bw, "contrast"); inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Brightness", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "Contrast", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ -1, 4, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_inSurf, _outSurf, _data) { var _exp = _data[1]; diff --git a/scripts/node_PCX_array_get/node_PCX_array_get.gml b/scripts/node_PCX_array_get/node_PCX_array_get.gml index 018b91a6f..43519d38f 100644 --- a/scripts/node_PCX_array_get/node_PCX_array_get.gml +++ b/scripts/node_PCX_array_get/node_PCX_array_get.gml @@ -5,7 +5,7 @@ function Node_PCX_Array_Get(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) c inputs[| 1] = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); static update = function() { var _arr = getInputData(0); diff --git a/scripts/node_PCX_array_set/node_PCX_array_set.gml b/scripts/node_PCX_array_set/node_PCX_array_set.gml index 4ee40836b..8f3f1bd3f 100644 --- a/scripts/node_PCX_array_set/node_PCX_array_set.gml +++ b/scripts/node_PCX_array_set/node_PCX_array_set.gml @@ -7,7 +7,7 @@ function Node_PCX_Array_Set(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) c inputs[| 2] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); static update = function() { var _arr = getInputData(0); diff --git a/scripts/node_PCX_condition/node_PCX_condition.gml b/scripts/node_PCX_condition/node_PCX_condition.gml index 0859def96..dbc7eb11f 100644 --- a/scripts/node_PCX_condition/node_PCX_condition.gml +++ b/scripts/node_PCX_condition/node_PCX_condition.gml @@ -7,7 +7,7 @@ function Node_PCX_Condition(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) c inputs[| 2] = nodeValue("False", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); static update = function() { var _cond = getInputData(0); diff --git a/scripts/node_PCX_equation/node_PCX_equation.gml b/scripts/node_PCX_equation/node_PCX_equation.gml index cdfc20173..cf68fe462 100644 --- a/scripts/node_PCX_equation/node_PCX_equation.gml +++ b/scripts/node_PCX_equation/node_PCX_equation.gml @@ -4,9 +4,9 @@ function Node_PCX_Equation(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) co setDimension(96, 48); ast = noone; - inputs[| 0] = nodeValue("Equation", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 0] = nodeValue_Text("Equation", self, ""); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone ); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.PCXnode, noone ); argument_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { #region argument_renderer.x = _x; @@ -50,7 +50,7 @@ function Node_PCX_Equation(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) co static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index + 0] = nodeValue("Argument name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) + inputs[| index + 0] = nodeValue_Text("Argument name", self, "" ) .setDisplay(VALUE_DISPLAY.text_box); inputs[| index + 1] = nodeValue("Argument value", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone ) diff --git a/scripts/node_PCX_fn_math/node_PCX_fn_math.gml b/scripts/node_PCX_fn_math/node_PCX_fn_math.gml index f378fba99..b6c744596 100644 --- a/scripts/node_PCX_fn_math/node_PCX_fn_math.gml +++ b/scripts/node_PCX_fn_math/node_PCX_fn_math.gml @@ -13,7 +13,7 @@ function Node_PCX_fn_Math(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) con inputs[| 3] = nodeValue("z", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); static update = function() { static syms = [ "+", "-", "*", "/", "$", "%", "abs", -1, "round", "floor", "ceil", diff --git a/scripts/node_PCX_fn_random/node_PCX_fn_random.gml b/scripts/node_PCX_fn_random/node_PCX_fn_random.gml index 4090ce825..1ae16470f 100644 --- a/scripts/node_PCX_fn_random/node_PCX_fn_random.gml +++ b/scripts/node_PCX_fn_random/node_PCX_fn_random.gml @@ -5,9 +5,9 @@ function Node_PCX_fn_Random(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) c inputs[| 1] = nodeValue("Max", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - inputs[| 2] = nodeValue("Integer", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Integer", self, false); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); input_display_list = [ 2, 0, 1 ]; diff --git a/scripts/node_PCX_fn_surface_height/node_PCX_fn_surface_height.gml b/scripts/node_PCX_fn_surface_height/node_PCX_fn_surface_height.gml index 88e3c0d69..57c045792 100644 --- a/scripts/node_PCX_fn_surface_height/node_PCX_fn_surface_height.gml +++ b/scripts/node_PCX_fn_surface_height/node_PCX_fn_surface_height.gml @@ -3,7 +3,7 @@ function Node_PCX_fn_Surface_Height(_x, _y, _group = noone) : Node_PCX(_x, _y, _ inputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); static update = function() { var _surf = getInputData(0); diff --git a/scripts/node_PCX_fn_surface_width/node_PCX_fn_surface_width.gml b/scripts/node_PCX_fn_surface_width/node_PCX_fn_surface_width.gml index e27eac2fb..9f3d22142 100644 --- a/scripts/node_PCX_fn_surface_width/node_PCX_fn_surface_width.gml +++ b/scripts/node_PCX_fn_surface_width/node_PCX_fn_surface_width.gml @@ -3,7 +3,7 @@ function Node_PCX_fn_Surface_Width(_x, _y, _group = noone) : Node_PCX(_x, _y, _g inputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); static update = function() { var _surf = getInputData(0); diff --git a/scripts/node_PCX_fn_var/node_PCX_fn_var.gml b/scripts/node_PCX_fn_var/node_PCX_fn_var.gml index b69c597ee..520f7db3c 100644 --- a/scripts/node_PCX_fn_var/node_PCX_fn_var.gml +++ b/scripts/node_PCX_fn_var/node_PCX_fn_var.gml @@ -4,7 +4,7 @@ function Node_PCX_fn_var(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) cons inputs[| 0] = nodeValue("Default Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); static update = function() { var _def = getInputData(0); diff --git a/scripts/node_PCX_var/node_PCX_var.gml b/scripts/node_PCX_var/node_PCX_var.gml index f191ce064..430479f16 100644 --- a/scripts/node_PCX_var/node_PCX_var.gml +++ b/scripts/node_PCX_var/node_PCX_var.gml @@ -1,11 +1,11 @@ function Node_PCX_var(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) constructor { name = "Variable"; - inputs[| 0] = nodeValue("Name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 0] = nodeValue_Text("Name", self, ""); inputs[| 1] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, -1); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone); static update = function() { var _name = getInputData(0); diff --git a/scripts/node_VCT/node_VCT.gml b/scripts/node_VCT/node_VCT.gml index c5461e9d9..826c5b36e 100644 --- a/scripts/node_VCT/node_VCT.gml +++ b/scripts/node_VCT/node_VCT.gml @@ -4,12 +4,12 @@ function Node_VCT(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) const color = COLORS.node_blend_vct; vct = new VCT(self); - inputs[| 0] = nodeValue("Editor", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 0] = nodeValue_Int("Editor", self, 0) .setDisplay(VALUE_DISPLAY.button, { name: "Editor", onClick: function() { vct.createDialog(); } }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Automations", false], diff --git a/scripts/node_VFX_attract/node_VFX_attract.gml b/scripts/node_VFX_attract/node_VFX_attract.gml index 05d3233cf..29458cd25 100644 --- a/scripts/node_VFX_attract/node_VFX_attract.gml +++ b/scripts/node_VFX_attract/node_VFX_attract.gml @@ -4,7 +4,7 @@ function Node_VFX_Attract(_x, _y, _group = noone) : Node_VFX_effector(_x, _y, _g inputs[| 4].setVisible(false, false); - inputs[| effector_input_length + 0] = nodeValue("Destroy when reach middle", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| effector_input_length + 0] = nodeValue_Bool("Destroy when reach middle", self, false ); array_push(input_display_list, effector_input_length + 0); diff --git a/scripts/node_VFX_group/node_VFX_group.gml b/scripts/node_VFX_group/node_VFX_group.gml index 9bb52549d..c7d47983d 100644 --- a/scripts/node_VFX_group/node_VFX_group.gml +++ b/scripts/node_VFX_group/node_VFX_group.gml @@ -15,7 +15,7 @@ function Node_VFX_Group(_x, _y, _group = noone) : Node_Collection(_x, _y, _group preview_node = noone; allCached = false; - inputs[| 0] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ) + inputs[| 0] = nodeValue_Bool("Loop", self, true ) .rejectArray(); custom_input_index = ds_list_size(inputs); diff --git a/scripts/node_VFX_group_inline/node_VFX_group_inline.gml b/scripts/node_VFX_group_inline/node_VFX_group_inline.gml index 4e6edf2b9..ffb00bf51 100644 --- a/scripts/node_VFX_group_inline/node_VFX_group_inline.gml +++ b/scripts/node_VFX_group_inline/node_VFX_group_inline.gml @@ -6,7 +6,7 @@ function Node_VFX_Group_Inline(_x, _y, _group = noone) : Node_Collection_Inline( is_root = false; topoList = []; - inputs[| 0] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ) + inputs[| 0] = nodeValue_Bool("Loop", self, true ) .rejectArray(); is_simulation = true; diff --git a/scripts/node_VFX_oscillate/node_VFX_oscillate.gml b/scripts/node_VFX_oscillate/node_VFX_oscillate.gml index 1d5467b79..e92781a91 100644 --- a/scripts/node_VFX_oscillate/node_VFX_oscillate.gml +++ b/scripts/node_VFX_oscillate/node_VFX_oscillate.gml @@ -6,11 +6,11 @@ function Node_VFX_Oscillate(_x, _y, _group = noone) : Node_VFX_effector(_x, _y, inputs[| 6].setVisible(false, false); inputs[| 7].setVisible(false, false); - inputs[| effector_input_length + 0] = nodeValue("Amplitude", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2 ); + inputs[| effector_input_length + 0] = nodeValue_Float("Amplitude", self, 2 ); - inputs[| effector_input_length + 1] = nodeValue("Frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2 ); + inputs[| effector_input_length + 1] = nodeValue_Float("Frequency", self, 0.2 ); - inputs[| effector_input_length + 2] = nodeValue("Multiply by speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| effector_input_length + 2] = nodeValue_Bool("Multiply by speed", self, false ); array_push(input_display_list, effector_input_length + 0, effector_input_length + 1, effector_input_length + 2); diff --git a/scripts/node_VFX_override/node_VFX_override.gml b/scripts/node_VFX_override/node_VFX_override.gml index 38db4d530..2f9d5a4fb 100644 --- a/scripts/node_VFX_override/node_VFX_override.gml +++ b/scripts/node_VFX_override/node_VFX_override.gml @@ -7,23 +7,23 @@ function Node_VFX_Override(_x, _y, _group = noone) : Node(_x, _y, _group) constr manual_ungroupable = false; setDimension(96, 48); - inputs[| 0] = nodeValue("Particles", self, JUNCTION_CONNECT.input, VALUE_TYPE.particle, -1 ) + inputs[| 0] = nodeValue_Particle("Particles", self, -1 ) .setVisible(true, true); - inputs[| 1] = nodeValue("Positions", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, noone ); + inputs[| 1] = nodeValue_Float("Positions", self, noone ); - inputs[| 2] = nodeValue("Rotations", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, noone ); + inputs[| 2] = nodeValue_Float("Rotations", self, noone ); - inputs[| 3] = nodeValue("Scales", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, noone ); + inputs[| 3] = nodeValue_Float("Scales", self, noone ); - inputs[| 4] = nodeValue("Blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, noone ); + inputs[| 4] = nodeValue_Color("Blend", self, noone ); - inputs[| 5] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, noone ); + inputs[| 5] = nodeValue_Float("Alpha", self, noone ); inputs[| 6] = nodeValue_Surface("Surface", self) .setVisible(true, false); - outputs[| 0] = nodeValue("Particles", self, JUNCTION_CONNECT.output, VALUE_TYPE.particle, -1 ); + outputs[| 0] = nodeValue_Output("Particles", self, VALUE_TYPE.particle, -1 ); static update = function(frame = CURRENT_FRAME) { var parts = getInputData(0); diff --git a/scripts/node_VFX_renderer/node_VFX_renderer.gml b/scripts/node_VFX_renderer/node_VFX_renderer.gml index a4cd92f3e..0d8c32d0d 100644 --- a/scripts/node_VFX_renderer/node_VFX_renderer.gml +++ b/scripts/node_VFX_renderer/node_VFX_renderer.gml @@ -6,16 +6,15 @@ function Node_VFX_Renderer(_x, _y, _group = noone) : Node(_x, _y, _group) constr manual_ungroupable = false; - inputs[| 0] = nodeValue("Output dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 0] = nodeValue_Vector("Output dimension", self, DEF_SURF ); - inputs[| 1] = nodeValue("Round position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Round position to the closest integer value to avoid jittering.") + inputs[| 1] = nodeValue_Bool("Round position", self, true, "Round position to the closest integer value to avoid jittering.") .rejectArray(); inputs[| 2] = nodeValue_Enum_Button("Render Type", self, PARTICLE_RENDER_TYPE.surface , [ "Surface", "Line" ]) .rejectArray(); - inputs[| 3] = nodeValue("Line life", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4 ) + inputs[| 3] = nodeValue_Int("Line life", self, 4 ) .rejectArray(); input_display_list = [ @@ -32,7 +31,7 @@ function Node_VFX_Renderer(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| index + 0] = nodeValue_Enum_Scroll("Blend mode", self, 0 , [ "Normal", "Alpha", "Additive" ]) .rejectArray(); - inputs[| index + 1] = nodeValue("Particles", self, JUNCTION_CONNECT.input, VALUE_TYPE.particle, noone ) + inputs[| index + 1] = nodeValue_Particle("Particles", self, noone ) .setVisible(true, true); array_push(input_display_list, ["Particle", false], index + 0, index + 1); @@ -43,7 +42,7 @@ function Node_VFX_Renderer(_x, _y, _group = noone) : Node(_x, _y, _group) constr setDynamicInput(2, true, VALUE_TYPE.particle); dyna_input_check_shift = 1; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); insp2UpdateTooltip = "Clear cache"; insp2UpdateIcon = [ THEME.cache, 0, COLORS._main_icon ]; diff --git a/scripts/node_VFX_renderer_output/node_VFX_renderer_output.gml b/scripts/node_VFX_renderer_output/node_VFX_renderer_output.gml index ece1573dc..c3102be2c 100644 --- a/scripts/node_VFX_renderer_output/node_VFX_renderer_output.gml +++ b/scripts/node_VFX_renderer_output/node_VFX_renderer_output.gml @@ -7,16 +7,15 @@ function Node_VFX_Renderer_Output(_x, _y, _group = noone) : Node_Group_Output(_x manual_ungroupable = false; previewable = true; - inputs[| 0] = nodeValue("Output dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 0] = nodeValue_Vector("Output dimension", self, DEF_SURF); - inputs[| 1] = nodeValue("Round position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Round position to the closest integer value to avoid jittering.") + inputs[| 1] = nodeValue_Bool("Round position", self, true, "Round position to the closest integer value to avoid jittering.") .rejectArray(); inputs[| 2] = nodeValue_Enum_Button("Render Type", self, PARTICLE_RENDER_TYPE.surface , [ "Surface", "Line" ]) .rejectArray(); - inputs[| 3] = nodeValue("Line life", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4 ) + inputs[| 3] = nodeValue_Int("Line life", self, 4 ) .rejectArray(); input_display_list = [ @@ -38,7 +37,7 @@ function Node_VFX_Renderer_Output(_x, _y, _group = noone) : Node_Group_Output(_x inputs[| index + 0] = nodeValue_Enum_Scroll("Blend mode", self, 0 , [ "Normal", "Alpha", "Additive" ]) .rejectArray(); - inputs[| index + 1] = nodeValue("Particles", self, JUNCTION_CONNECT.input, VALUE_TYPE.particle, noone ) + inputs[| index + 1] = nodeValue_Particle("Particles", self, noone ) .setVisible(true, true); array_push(input_display_list, ["Particle", false], index + 0, index + 1); diff --git a/scripts/node_VFX_spawner/node_VFX_spawner.gml b/scripts/node_VFX_spawner/node_VFX_spawner.gml index 05f94ff91..3a4c388a0 100644 --- a/scripts/node_VFX_spawner/node_VFX_spawner.gml +++ b/scripts/node_VFX_spawner/node_VFX_spawner.gml @@ -15,12 +15,12 @@ function Node_VFX_Spawner(_x, _y, _group = noone) : Node_VFX_Spawner_Base(_x, _y inputs[| input_len + 0] = nodeValue("Spawn trigger", self, JUNCTION_CONNECT.input, VALUE_TYPE.node, false) .setVisible(true, true); - inputs[| input_len + 1] = nodeValue("Step interval", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1, "How often the 'on step' event is triggered.\nWith 1 being trigger every frame, 2 means triggered once every 2 frames."); + inputs[| input_len + 1] = nodeValue_Int("Step interval", self, 1, "How often the 'on step' event is triggered.\nWith 1 being trigger every frame, 2 means triggered once every 2 frames."); - outputs[| 0] = nodeValue("Particles", self, JUNCTION_CONNECT.output, VALUE_TYPE.particle, [] ); - outputs[| 1] = nodeValue("On create", self, JUNCTION_CONNECT.output, VALUE_TYPE.node, noone ); - outputs[| 2] = nodeValue("On step", self, JUNCTION_CONNECT.output, VALUE_TYPE.node, noone ); - outputs[| 3] = nodeValue("On destroy", self, JUNCTION_CONNECT.output, VALUE_TYPE.node, noone ); + outputs[| 0] = nodeValue_Output("Particles", self, VALUE_TYPE.particle, [] ); + outputs[| 1] = nodeValue_Output("On create", self, VALUE_TYPE.node, noone ); + outputs[| 2] = nodeValue_Output("On step", self, VALUE_TYPE.node, noone ); + outputs[| 3] = nodeValue_Output("On destroy", self, VALUE_TYPE.node, noone ); array_insert(input_display_list, 0, ["Trigger", true], input_len + 0, input_len + 1); diff --git a/scripts/node_VFX_trail/node_VFX_trail.gml b/scripts/node_VFX_trail/node_VFX_trail.gml index dcab78233..25e62670c 100644 --- a/scripts/node_VFX_trail/node_VFX_trail.gml +++ b/scripts/node_VFX_trail/node_VFX_trail.gml @@ -10,14 +10,14 @@ function Node_VFX_Trail(_x, _y, _group = noone) : Node(_x, _y, _group) construct lineLength = []; lineData = []; - inputs[| 0] = nodeValue("Particles", self, JUNCTION_CONNECT.input, VALUE_TYPE.particle, -1 ) + inputs[| 0] = nodeValue_Particle("Particles", self, -1 ) .setVisible(true, true); - inputs[| 1] = nodeValue("Life", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4 ); + inputs[| 1] = nodeValue_Int("Life", self, 4 ); - inputs[| 2] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 2] = nodeValue_Bool("Color", self, false ); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region draw_set_color(COLORS._main_accent); diff --git a/scripts/node_VFX_triangulate/node_VFX_triangulate.gml b/scripts/node_VFX_triangulate/node_VFX_triangulate.gml index 658053bc0..5c3c65a3c 100644 --- a/scripts/node_VFX_triangulate/node_VFX_triangulate.gml +++ b/scripts/node_VFX_triangulate/node_VFX_triangulate.gml @@ -14,21 +14,20 @@ function Node_VFX_Triangulate(_x, _y, _group = noone) : Node(_x, _y, _group) con manual_ungroupable = false; - inputs[| 0] = nodeValue("Output dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 0] = nodeValue_Vector("Output dimension", self, DEF_SURF ); - inputs[| 1] = nodeValue("Particles", self, JUNCTION_CONNECT.input, VALUE_TYPE.particle, -1 ) + inputs[| 1] = nodeValue_Particle("Particles", self, -1 ) .setVisible(true, true); - inputs[| 2] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ); + inputs[| 2] = nodeValue_Float("Thickness", self, 1 ); - inputs[| 3] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 3] = nodeValue_Color("Color", self, c_white ); - inputs[| 4] = nodeValue("Inherit Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 4] = nodeValue_Bool("Inherit Thickness", self, false ); - inputs[| 5] = nodeValue("Inherit Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 5] = nodeValue_Bool("Inherit Color", self, false ); - outputs[| 0] = nodeValue("Triangles", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Triangles", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, [ "Particles", false], 1, diff --git a/scripts/node_VFX_turbulence/node_VFX_turbulence.gml b/scripts/node_VFX_turbulence/node_VFX_turbulence.gml index dd0a0b73c..e993687ce 100644 --- a/scripts/node_VFX_turbulence/node_VFX_turbulence.gml +++ b/scripts/node_VFX_turbulence/node_VFX_turbulence.gml @@ -4,9 +4,9 @@ function Node_VFX_Turbulence(_x, _y, _group = noone) : Node_VFX_effector(_x, _y, inputs[| 4].setVisible(false, false); - inputs[| effector_input_length + 0] = nodeValue("Turbulence scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ); + inputs[| effector_input_length + 0] = nodeValue_Float("Turbulence scale", self, 1 ); - inputs[| effector_input_length + 1] = nodeValue("Constant seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| effector_input_length + 1] = nodeValue_Bool("Constant seed", self, false ); array_push(input_display_list, effector_input_length + 0, effector_input_length + 1); diff --git a/scripts/node_VFX_variable/node_VFX_variable.gml b/scripts/node_VFX_variable/node_VFX_variable.gml index 5ccc27b2f..421eb410f 100644 --- a/scripts/node_VFX_variable/node_VFX_variable.gml +++ b/scripts/node_VFX_variable/node_VFX_variable.gml @@ -8,48 +8,48 @@ function Node_VFX_Variable(_x, _y, _group = noone) : Node(_x, _y, _group) constr manual_ungroupable = false; - inputs[| 0] = nodeValue("Particles", self, JUNCTION_CONNECT.input, VALUE_TYPE.particle, -1 ) + inputs[| 0] = nodeValue_Particle("Particles", self, -1 ) .setVisible(true, true); input_display_list = [ 0 ]; - outputs[| 0] = nodeValue("Positions", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [] ) + outputs[| 0] = nodeValue_Output("Positions", self, VALUE_TYPE.float, [] ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 1] = nodeValue("Scales", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [] ) + outputs[| 1] = nodeValue_Output("Scales", self, VALUE_TYPE.float, [] ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 2] = nodeValue("Rotations", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ) + outputs[| 2] = nodeValue_Output("Rotations", self, VALUE_TYPE.float, 0 ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 3] = nodeValue("Blending", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, 0 ) + outputs[| 3] = nodeValue_Output("Blending", self, VALUE_TYPE.color, 0 ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 4] = nodeValue("Alpha", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ) + outputs[| 4] = nodeValue_Output("Alpha", self, VALUE_TYPE.float, 0 ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 5] = nodeValue("Life", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ) + outputs[| 5] = nodeValue_Output("Life", self, VALUE_TYPE.float, 0 ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 6] = nodeValue("Max life", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ) + outputs[| 6] = nodeValue_Output("Max life", self, VALUE_TYPE.float, 0 ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 7] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ) + outputs[| 7] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 8] = nodeValue("Velocity", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [] ) + outputs[| 8] = nodeValue_Output("Velocity", self, VALUE_TYPE.float, [] ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); - outputs[| 9] = nodeValue("Seed", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ) + outputs[| 9] = nodeValue_Output("Seed", self, VALUE_TYPE.float, 0 ) .setDisplay(VALUE_DISPLAY.none) .setVisible(false); diff --git a/scripts/node_VFX_vortex/node_VFX_vortex.gml b/scripts/node_VFX_vortex/node_VFX_vortex.gml index 93e3da185..f47d91a77 100644 --- a/scripts/node_VFX_vortex/node_VFX_vortex.gml +++ b/scripts/node_VFX_vortex/node_VFX_vortex.gml @@ -4,11 +4,11 @@ function Node_VFX_Vortex(_x, _y, _group = noone) : Node_VFX_effector(_x, _y, _gr inputs[| 4].setVisible(false, false); - inputs[| effector_input_length + 0] = nodeValue("Attraction force", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2 ); + inputs[| effector_input_length + 0] = nodeValue_Float("Attraction force", self, 2 ); - inputs[| effector_input_length + 1] = nodeValue("Clockwise", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| effector_input_length + 1] = nodeValue_Bool("Clockwise", self, true ); - inputs[| effector_input_length + 2] = nodeValue("Destroy when reach middle", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| effector_input_length + 2] = nodeValue_Bool("Destroy when reach middle", self, false ); array_push(input_display_list, effector_input_length + 0, effector_input_length + 1, effector_input_length + 2); diff --git a/scripts/node_active_canvas/node_active_canvas.gml b/scripts/node_active_canvas/node_active_canvas.gml index 8b1284992..50e140c9b 100644 --- a/scripts/node_active_canvas/node_active_canvas.gml +++ b/scripts/node_active_canvas/node_active_canvas.gml @@ -5,25 +5,22 @@ function Node_Active_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) const inputs[| 1] = nodeValue_Surface("Texture", self); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0 ] ); inputs[| 3] = nodeValue_Rotation("Rotation", self, 0); - inputs[| 4] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Scale", self, [ 1, 1 ] ); - inputs[| 5] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 5] = nodeValue_Color("Color", self, c_white ); - inputs[| 6] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 6] = nodeValue_Float("Alpha", self, 1 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 7] = nodeValue_Bool("Active", self, true ); - inputs[| 8] = nodeValue("Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 8] = nodeValue_Range("Distance", self, [ 1, 1 ] , { linked : true }); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.surface, noone ); input_display_list = [ 0, [ "Brush transform", false ], 7, 2, 3, 4, diff --git a/scripts/node_alpha_cutoff/node_alpha_cutoff.gml b/scripts/node_alpha_cutoff/node_alpha_cutoff.gml index 1566becb2..95e27ac10 100644 --- a/scripts/node_alpha_cutoff/node_alpha_cutoff.gml +++ b/scripts/node_alpha_cutoff/node_alpha_cutoff.gml @@ -3,15 +3,15 @@ function Node_Alpha_Cutoff(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Minimum", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2, "Any pixel with less alpha (more transparent) than this will be removed.") + inputs[| 1] = nodeValue_Float("Minimum", self, 0.2, "Any pixel with less alpha (more transparent) than this will be removed.") .setDisplay(VALUE_DISPLAY.slider); inputs[| 2] = nodeValue_Surface("Mask", self); - inputs[| 3] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Active", self, true); active_index = 4; __init_mask_modifier(2); // inputs 5, 6, @@ -21,7 +21,7 @@ function Node_Alpha_Cutoff(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro ["Cutoff", false], 1, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_alpha_grey/node_alpha_grey.gml b/scripts/node_alpha_grey/node_alpha_grey.gml index c9ad92101..bb7399a82 100644 --- a/scripts/node_alpha_grey/node_alpha_grey.gml +++ b/scripts/node_alpha_grey/node_alpha_grey.gml @@ -3,10 +3,10 @@ function Node_Alpha_Grey(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", false], 0, diff --git a/scripts/node_alpha_hash/node_alpha_hash.gml b/scripts/node_alpha_hash/node_alpha_hash.gml index 6f82e1a4c..7ba31b9df 100644 --- a/scripts/node_alpha_hash/node_alpha_hash.gml +++ b/scripts/node_alpha_hash/node_alpha_hash.gml @@ -16,7 +16,7 @@ function Node_Alpha_Hash(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_anim_curve/node_anim_curve.gml b/scripts/node_anim_curve/node_anim_curve.gml index c58a43619..dc4f7205a 100644 --- a/scripts/node_anim_curve/node_anim_curve.gml +++ b/scripts/node_anim_curve/node_anim_curve.gml @@ -5,15 +5,15 @@ function Node_Anim_Curve(_x, _y, _group = noone) : Node_Processor(_x, _y, _group setDimension(96, 48); inputs[| 0] = nodeValue("Curve", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_01); - inputs[| 1] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("Progress", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 2] = nodeValue("Minimum", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); - inputs[| 3] = nodeValue("Maximum", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = nodeValue_Float("Minimum", self, 0); + inputs[| 3] = nodeValue_Float("Maximum", self, 1); - inputs[| 4] = nodeValue("Animated", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 4] = nodeValue_Bool("Animated", self, false); - outputs[| 0] = nodeValue("Curve", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []); + outputs[| 0] = nodeValue_Output("Curve", self, VALUE_TYPE.float, []); input_display_list = [ 0, 4, 1, 2, 3 ]; diff --git a/scripts/node_animation_control/node_animation_control.gml b/scripts/node_animation_control/node_animation_control.gml index bdb744b79..403e8f1fd 100644 --- a/scripts/node_animation_control/node_animation_control.gml +++ b/scripts/node_animation_control/node_animation_control.gml @@ -2,19 +2,19 @@ function Node_Animation_Control(_x, _y, _group = noone) : Node(_x, _y, _group) c name = "Animation Control"; setDimension(96, 96); - inputs[| 0] = nodeValue("Toggle Play / Pause", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ); + inputs[| 0] = nodeValue_Trigger("Toggle Play / Pause", self, false ); - inputs[| 1] = nodeValue("Pause", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ); + inputs[| 1] = nodeValue_Trigger("Pause", self, false ); - inputs[| 2] = nodeValue("Resume", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ); + inputs[| 2] = nodeValue_Trigger("Resume", self, false ); - inputs[| 3] = nodeValue("Play From Beginning", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ); + inputs[| 3] = nodeValue_Trigger("Play From Beginning", self, false ); - inputs[| 4] = nodeValue("Play once", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ); + inputs[| 4] = nodeValue_Trigger("Play once", self, false ); - inputs[| 5] = nodeValue("Skip Frames", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ); + inputs[| 5] = nodeValue_Trigger("Skip Frames", self, false ); - inputs[| 6] = nodeValue("Skip Frames Count", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 6] = nodeValue_Int("Skip Frames Count", self, 1); static step = function() { if(getInputData(0)) diff --git a/scripts/node_application_out/node_application_out.gml b/scripts/node_application_out/node_application_out.gml index 21a2f51e1..ee4fa350e 100644 --- a/scripts/node_application_out/node_application_out.gml +++ b/scripts/node_application_out/node_application_out.gml @@ -8,7 +8,7 @@ function Node_Application_Out(_x, _y, _group = noone) : Node(_x, _y, _group) con name = "GUI Out"; update_on_frame = true; - outputs[| 0] = nodeValue("GUI", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("GUI", self, VALUE_TYPE.surface, noone); APP_SURF_OVERRIDE = true; diff --git a/scripts/node_area/node_area.gml b/scripts/node_area/node_area.gml index ffec99cdb..b9fa38d98 100644 --- a/scripts/node_area/node_area.gml +++ b/scripts/node_area/node_area.gml @@ -3,12 +3,10 @@ function Node_Area(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons color = COLORS.node_blend_number; setDimension(96, 48); - inputs[| 0] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setVisible(true, true); - inputs[| 1] = nodeValue("Span", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Span", self, [ 16, 16 ] ) .setVisible(true, true); inputs[| 2] = nodeValue_Enum_Scroll("Shape", self, AREA_SHAPE.rectangle, [ @@ -18,7 +16,7 @@ function Node_Area(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 3] = nodeValue_Enum_Scroll("Type", self, 0, [ "Center Span", "Two Point" ]); - outputs[| 0] = nodeValue("Area", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0, 0, 0, AREA_SHAPE.rectangle ]) + outputs[| 0] = nodeValue_Output("Area", self, VALUE_TYPE.float, [ 0, 0, 0, 0, AREA_SHAPE.rectangle ]) .setDisplay(VALUE_DISPLAY.vector); input_display_list = [ 3, diff --git a/scripts/node_argument/node_argument.gml b/scripts/node_argument/node_argument.gml index 7f4b60f16..a53154e7f 100644 --- a/scripts/node_argument/node_argument.gml +++ b/scripts/node_argument/node_argument.gml @@ -4,13 +4,13 @@ function Node_Argument(_x, _y, _group = noone) : Node(_x, _y, _group) constructo draw_padding = 8; - inputs[| 0] = nodeValue("Tag", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 0] = nodeValue_Text("Tag", self, ""); inputs[| 1] = nodeValue_Enum_Scroll("Type", self, 0, [ "String", "Number" ]); - inputs[| 2] = nodeValue("Default value", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 2] = nodeValue_Text("Default value", self, ""); - outputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Value", self, VALUE_TYPE.text, ""); static step = function() { #region var typ = getInputData(1); diff --git a/scripts/node_armature/node_armature.gml b/scripts/node_armature/node_armature.gml index cceec9b7c..582640e20 100644 --- a/scripts/node_armature/node_armature.gml +++ b/scripts/node_armature/node_armature.gml @@ -2,7 +2,7 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo name = "Armature Create"; setDimension(96, 72); - //inputs[| 0] = nodeValue("Axis", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + //inputs[| 0] = nodeValue_Int("Axis", self, 0); bone_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { #region var _b = attributes.bones; @@ -138,7 +138,7 @@ function Node_Armature(_x, _y, _group = noone) : Node(_x, _y, _group) constructo return bone; } #endregion - outputs[| 0] = nodeValue("Armature", self, JUNCTION_CONNECT.output, VALUE_TYPE.armature, noone); + outputs[| 0] = nodeValue_Output("Armature", self, VALUE_TYPE.armature, noone); #region ++++ attributes ++++ attributes.bones = new __Bone(,,,,, self); diff --git a/scripts/node_armature_bind/node_armature_bind.gml b/scripts/node_armature_bind/node_armature_bind.gml index a0105cbf5..1517ee72f 100644 --- a/scripts/node_armature_bind/node_armature_bind.gml +++ b/scripts/node_armature_bind/node_armature_bind.gml @@ -14,26 +14,25 @@ function Node_Armature_Bind(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Armature", self, JUNCTION_CONNECT.input, VALUE_TYPE.armature, noone) + inputs[| 1] = nodeValue_Armature("Armature", self, noone) .setVisible(true, true) .rejectArray(); - inputs[| 2] = nodeValue("Bind data", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, noone) + inputs[| 2] = nodeValue_Struct("Bind data", self, noone) .setVisible(true, true) .setArrayDepth(1); - inputs[| 3] = nodeValue("Bone transform", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Bone transform", self, [ 0, 0 ]); - inputs[| 4] = nodeValue("Bone scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Bone scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0.1, 2, 0.01 ] }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas data", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []) + outputs[| 1] = nodeValue_Output("Atlas data", self, VALUE_TYPE.surface, []) .rejectArrayProcess(); - outputs[| 2] = nodeValue("Bind data", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, []) + outputs[| 2] = nodeValue_Output("Bind data", self, VALUE_TYPE.struct, []) .setArrayDepth(1); attribute_surface_depth(); @@ -401,13 +400,13 @@ function Node_Armature_Bind(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| index + 0].hover_effect = 0; inputs[| index + 0].display_data.bone_id = ""; - inputs[| index + 1] = nodeValue("Transform", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 1, 1 ] ) + inputs[| index + 1] = nodeValue_Float("Transform", self, [ 0, 0, 0, 1, 1 ] ) .setDisplay(VALUE_DISPLAY.transform); - inputs[| index + 2] = nodeValue("Inherit Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); - inputs[| index + 3] = nodeValue("Apply Bone Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| index + 2] = nodeValue_Bool("Inherit Rotation", self, true ); + inputs[| index + 3] = nodeValue_Bool("Apply Bone Rotation", self, false ); - inputs[| index + 4] = nodeValue("Inherit Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); - inputs[| index + 5] = nodeValue("Apply Bone Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| index + 4] = nodeValue_Bool("Inherit Scale", self, false ); + inputs[| index + 5] = nodeValue_Bool("Apply Bone Scale", self, false ); for( var i = 0; i < data_length; i++ ) array_push(input_display_list, index + i); diff --git a/scripts/node_armature_path/node_armature_path.gml b/scripts/node_armature_path/node_armature_path.gml index db1c2f6f6..698e0617f 100644 --- a/scripts/node_armature_path/node_armature_path.gml +++ b/scripts/node_armature_path/node_armature_path.gml @@ -2,11 +2,11 @@ function Node_Armature_Path(_x, _y, _group = noone) : Node(_x, _y, _group) const name = "Armature Path"; setDimension(96, 72); - inputs[| 0] = nodeValue("Armature", self, JUNCTION_CONNECT.input, VALUE_TYPE.armature, noone) + inputs[| 0] = nodeValue_Armature("Armature", self, noone) .setVisible(true, true) .rejectArray(); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); lines = []; diff --git a/scripts/node_armature_pose/node_armature_pose.gml b/scripts/node_armature_pose/node_armature_pose.gml index bc27657a9..4a2e694a1 100644 --- a/scripts/node_armature_pose/node_armature_pose.gml +++ b/scripts/node_armature_pose/node_armature_pose.gml @@ -2,14 +2,14 @@ function Node_Armature_Pose(_x, _y, _group = noone) : Node(_x, _y, _group) const name = "Armature Pose"; setDimension(96, 72); - inputs[| 0] = nodeValue("Armature", self, JUNCTION_CONNECT.input, VALUE_TYPE.armature, noone) + inputs[| 0] = nodeValue_Armature("Armature", self, noone) .setVisible(true, true); input_display_list = [ 0, ["Bones", false] ] - outputs[| 0] = nodeValue("Armature", self, JUNCTION_CONNECT.output, VALUE_TYPE.armature, noone); + outputs[| 0] = nodeValue_Output("Armature", self, VALUE_TYPE.armature, noone); boneMap = ds_map_create(); diff --git a/scripts/node_armature_sample/node_armature_sample.gml b/scripts/node_armature_sample/node_armature_sample.gml index 6aae8b4e3..ad4945172 100644 --- a/scripts/node_armature_sample/node_armature_sample.gml +++ b/scripts/node_armature_sample/node_armature_sample.gml @@ -2,16 +2,16 @@ function Node_Armature_Sample(_x, _y, _group = noone) : Node(_x, _y, _group) con name = "Armature Sample"; setDimension(96, 72); - inputs[| 0] = nodeValue("Armature", self, JUNCTION_CONNECT.input, VALUE_TYPE.armature, noone) + inputs[| 0] = nodeValue_Armature("Armature", self, noone) .setVisible(true, true) .rejectArray(); - inputs[| 1] = nodeValue("Bone name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Bone name", self, ""); - inputs[| 2] = nodeValue("Sample point", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Sample point", self, 0) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Position", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, [ 0, 0 ]) + outputs[| 0] = nodeValue_Output("Position", self, VALUE_TYPE.integer, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); #region ++++ attributes ++++ diff --git a/scripts/node_array/node_array.gml b/scripts/node_array/node_array.gml index 6da1eca24..4013ae21a 100644 --- a/scripts/node_array/node_array.gml +++ b/scripts/node_array/node_array.gml @@ -6,7 +6,7 @@ function Node_Array(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { inputs[| 0] = nodeValue_Enum_Scroll("Type", self, 0, { data: [ "Any", "Surface", "Number", "Color", "Text" ], update_hover: false }) .rejectArray(); - inputs[| 1] = nodeValue("Spread array", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Unpack array and push the contents into the output one by one." ) + inputs[| 1] = nodeValue_Bool("Spread array", self, false, "Unpack array and push the contents into the output one by one." ) .rejectArray(); array_adjust_tool = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { @@ -30,7 +30,7 @@ function Node_Array(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { input_display_list = [ 0, 1, ["Contents", false], array_adjust_tool, ]; - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, []); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, []); static createNewInput = function() { var index = ds_list_size(inputs); diff --git a/scripts/node_array_add/node_array_add.gml b/scripts/node_array_add/node_array_add.gml index b2aea18a2..0f6052955 100644 --- a/scripts/node_array_add/node_array_add.gml +++ b/scripts/node_array_add/node_array_add.gml @@ -5,10 +5,10 @@ function Node_Array_Add(_x, _y, _group = noone) : Node(_x, _y, _group) construct inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - inputs[| 1] = nodeValue("Spread array", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 1] = nodeValue_Bool("Spread array", self, false ) .rejectArray(); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.integer, 0); input_display_list = [ 1, 0 ]; diff --git a/scripts/node_array_composite/node_array_composite.gml b/scripts/node_array_composite/node_array_composite.gml index d71e3a55a..a0c2b3a84 100644 --- a/scripts/node_array_composite/node_array_composite.gml +++ b/scripts/node_array_composite/node_array_composite.gml @@ -2,15 +2,15 @@ function Node_Array_Composite(_x, _y, _group = noone) : Node(_x, _y, _group) con name = "Array Composite"; setDimension(96, 32 + 24); - inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 0] = nodeValue_Float("Array", self, []) .setArrayDepth(1) .setVisible(true, true); - inputs[| 1] = nodeValue("Compose", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 1] = nodeValue_Float("Compose", self, []) .setArrayDepth(1) .setVisible(true, true); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0) + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.float, 0) .setArrayDepth(1); static composite = function(arr, com) { diff --git a/scripts/node_array_convolute/node_array_convolute.gml b/scripts/node_array_convolute/node_array_convolute.gml index 486860878..1506ae3b8 100644 --- a/scripts/node_array_convolute/node_array_convolute.gml +++ b/scripts/node_array_convolute/node_array_convolute.gml @@ -2,15 +2,15 @@ function Node_Array_Convolute(_x, _y, _group = noone) : Node(_x, _y, _group) con name = "Array Convolute"; setDimension(96, 32 + 24); - inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 0] = nodeValue_Float("Array", self, 0) .setArrayDepth(1) .setVisible(true, true); - inputs[| 1] = nodeValue("Kernel", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 1] = nodeValue_Float("Kernel", self, []) .setArrayDepth(1) .setVisible(true, true); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0) + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.float, 0) .setArrayDepth(1); static convolute = function(arr, ker) { diff --git a/scripts/node_array_copy/node_array_copy.gml b/scripts/node_array_copy/node_array_copy.gml index 9c8c47a1e..559acd79d 100644 --- a/scripts/node_array_copy/node_array_copy.gml +++ b/scripts/node_array_copy/node_array_copy.gml @@ -6,11 +6,11 @@ function Node_Array_Copy(_x, _y, _group = noone) : Node(_x, _y, _group) construc .setArrayDepth(1) .setVisible(true, true); - inputs[| 1] = nodeValue("Starting Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 1] = nodeValue_Int("Starting Index", self, 0); - inputs[| 2] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 2] = nodeValue_Int("Size", self, 1); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0) + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, 0) .setArrayDepth(1); static step = function() { diff --git a/scripts/node_array_csv_parse/node_array_csv_parse.gml b/scripts/node_array_csv_parse/node_array_csv_parse.gml index 829c92136..b100539e3 100644 --- a/scripts/node_array_csv_parse/node_array_csv_parse.gml +++ b/scripts/node_array_csv_parse/node_array_csv_parse.gml @@ -2,12 +2,12 @@ function Node_Array_CSV_Parse(_x, _y, _group = noone) : Node(_x, _y, _group) con name = "CSV Parse"; setDimension(96, 32 + 24); - inputs[| 0] = nodeValue("CSV string", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, 0) + inputs[| 0] = nodeValue_Text("CSV string", self, 0) .setVisible(true, true); - inputs[| 1] = nodeValue("Skip line", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 1] = nodeValue_Int("Skip line", self, 0); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0) + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, 0) .setArrayDepth(1); static update = function(frame = CURRENT_FRAME) { diff --git a/scripts/node_array_find/node_array_find.gml b/scripts/node_array_find/node_array_find.gml index 912817383..94013bc92 100644 --- a/scripts/node_array_find/node_array_find.gml +++ b/scripts/node_array_find/node_array_find.gml @@ -9,7 +9,7 @@ function Node_Array_Find(_x, _y, _group = noone) : Node(_x, _y, _group) construc .setVisible(true, true) .rejectArray(); - outputs[| 0] = nodeValue("Index", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); + outputs[| 0] = nodeValue_Output("Index", self, VALUE_TYPE.integer, 0); static update = function(frame = CURRENT_FRAME) { var _arr = getInputData(0); diff --git a/scripts/node_array_get/node_array_get.gml b/scripts/node_array_get/node_array_get.gml index d44761dad..17af02222 100644 --- a/scripts/node_array_get/node_array_get.gml +++ b/scripts/node_array_get/node_array_get.gml @@ -5,13 +5,13 @@ function Node_Array_Get(_x, _y, _group = noone) : Node(_x, _y, _group) construct inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - inputs[| 1] = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 1] = nodeValue_Int("Index", self, 0) .setVisible(true, true); inputs[| 2] = nodeValue_Enum_Scroll("Overflow", self, 0, [ "Clamp", "Loop", "Ping Pong" ]) .rejectArray(); - outputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("Value", self, VALUE_TYPE.any, 0); static step = function() { inputs[| 0].setType(VALUE_TYPE.any); diff --git a/scripts/node_array_insert/node_array_insert.gml b/scripts/node_array_insert/node_array_insert.gml index 2af23287b..d77cac19b 100644 --- a/scripts/node_array_insert/node_array_insert.gml +++ b/scripts/node_array_insert/node_array_insert.gml @@ -5,15 +5,15 @@ function Node_Array_Insert(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - inputs[| 1] = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 1] = nodeValue_Int("Index", self, 0); inputs[| 2] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - inputs[| 3] = nodeValue("Spread array", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 3] = nodeValue_Bool("Spread array", self, false ) .rejectArray(); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, 0); static update = function(frame = CURRENT_FRAME) { var _arr = getInputData(0); diff --git a/scripts/node_array_length/node_array_length.gml b/scripts/node_array_length/node_array_length.gml index dbf092703..72345e874 100644 --- a/scripts/node_array_length/node_array_length.gml +++ b/scripts/node_array_length/node_array_length.gml @@ -5,7 +5,7 @@ function Node_Array_Length(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - outputs[| 0] = nodeValue("Size", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); + outputs[| 0] = nodeValue_Output("Size", self, VALUE_TYPE.integer, 0); static step = function() { #region inputs[| 0].setType(inputs[| 0].value_from == noone? VALUE_TYPE.any : inputs[| 0].value_from.type); diff --git a/scripts/node_array_pin/node_array_pin.gml b/scripts/node_array_pin/node_array_pin.gml index 8506262f7..52ad06e25 100644 --- a/scripts/node_array_pin/node_array_pin.gml +++ b/scripts/node_array_pin/node_array_pin.gml @@ -12,7 +12,7 @@ function Node_Array_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) construct bg_spr_add = 0; - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, []); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, []); static createNewInput = function() { var index = ds_list_size(inputs); diff --git a/scripts/node_array_range/node_array_range.gml b/scripts/node_array_range/node_array_range.gml index 462d536a9..fc29e6802 100644 --- a/scripts/node_array_range/node_array_range.gml +++ b/scripts/node_array_range/node_array_range.gml @@ -2,16 +2,16 @@ function Node_Array_Range(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou name = "Array Range"; setDimension(96, 48); - inputs[| 0] = nodeValue("Start", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 0] = nodeValue_Float("Start", self, 0) .rejectArray(); - inputs[| 1] = nodeValue("End", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 10) + inputs[| 1] = nodeValue_Float("End", self, 10) .rejectArray(); - inputs[| 2] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Step", self, 1) .rejectArray(); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.float, []); static processData = function(_outSurf, _data, _output_index, _array_index) { var st = _data[0]; diff --git a/scripts/node_array_rearrange/node_array_rearrange.gml b/scripts/node_array_rearrange/node_array_rearrange.gml index b75a43835..6c618a0c4 100644 --- a/scripts/node_array_rearrange/node_array_rearrange.gml +++ b/scripts/node_array_rearrange/node_array_rearrange.gml @@ -8,10 +8,10 @@ function Node_Array_Rearrange(_x, _y, _group = noone) : Node(_x, _y, _group) con .setArrayDepth(1) .setVisible(true, true); - inputs[| 1] = nodeValue("Orders", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, []) + inputs[| 1] = nodeValue_Int("Orders", self, []) .setArrayDepth(1); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0) + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, 0) .setArrayDepth(1); type = VALUE_TYPE.any; diff --git a/scripts/node_array_remove/node_array_remove.gml b/scripts/node_array_remove/node_array_remove.gml index b18923931..00001e9d9 100644 --- a/scripts/node_array_remove/node_array_remove.gml +++ b/scripts/node_array_remove/node_array_remove.gml @@ -8,15 +8,15 @@ function Node_Array_Remove(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 1] = nodeValue_Enum_Button("Type", self, 0, [ "Index", "Value" ]) .rejectArray(); - inputs[| 2] = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 2] = nodeValue_Int("Index", self, 0); inputs[| 3] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - inputs[| 4] = nodeValue("Spread array", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 4] = nodeValue_Bool("Spread array", self, false ) .rejectArray(); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, 0); static step = function() { var type = getInputData(1); diff --git a/scripts/node_array_reverse/node_array_reverse.gml b/scripts/node_array_reverse/node_array_reverse.gml index 34bc038ea..0c3b1bd40 100644 --- a/scripts/node_array_reverse/node_array_reverse.gml +++ b/scripts/node_array_reverse/node_array_reverse.gml @@ -5,7 +5,7 @@ function Node_Array_Reverse(_x, _y, _group = noone) : Node(_x, _y, _group) const inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, 0); static update = function(frame = CURRENT_FRAME) { var _arr = getInputData(0); diff --git a/scripts/node_array_sample/node_array_sample.gml b/scripts/node_array_sample/node_array_sample.gml index 8b1d133f8..91f9e80d5 100644 --- a/scripts/node_array_sample/node_array_sample.gml +++ b/scripts/node_array_sample/node_array_sample.gml @@ -2,14 +2,14 @@ function Node_Array_Sample(_x, _y, _group = noone) : Node(_x, _y, _group) constr name = "Array Sample"; setDimension(96, 32 + 24); - inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 0] = nodeValue_Float("Array", self, []) .setArrayDepth(1) .setVisible(true, true); - inputs[| 1] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 1] = nodeValue_Float("Step", self, 1) .setVisible(true, true); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0) + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.float, 0) .setArrayDepth(1); static sample = function(arr, stp) { diff --git a/scripts/node_array_set/node_array_set.gml b/scripts/node_array_set/node_array_set.gml index e65794ef4..313ee2c66 100644 --- a/scripts/node_array_set/node_array_set.gml +++ b/scripts/node_array_set/node_array_set.gml @@ -5,12 +5,12 @@ function Node_Array_Set(_x, _y, _group = noone) : Node(_x, _y, _group) construct inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - inputs[| 1] = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 1] = nodeValue_Int("Index", self, 0); inputs[| 2] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, 0); static update = function(frame = CURRENT_FRAME) { var _arr = getInputData(0); diff --git a/scripts/node_array_shift/node_array_shift.gml b/scripts/node_array_shift/node_array_shift.gml index 03d885ee4..c0f6721e7 100644 --- a/scripts/node_array_shift/node_array_shift.gml +++ b/scripts/node_array_shift/node_array_shift.gml @@ -6,9 +6,9 @@ function Node_Array_Shift(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou .setArrayDepth(99) .setVisible(true, true); - inputs[| 1] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 1] = nodeValue_Int("Shift", self, 0) - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, 0); static processData = function(_outSurf, _data, _output_index, _array_index) { var _arr = _data[0]; diff --git a/scripts/node_array_shuffle/node_array_shuffle.gml b/scripts/node_array_shuffle/node_array_shuffle.gml index 77eec603c..4b04a8342 100644 --- a/scripts/node_array_shuffle/node_array_shuffle.gml +++ b/scripts/node_array_shuffle/node_array_shuffle.gml @@ -6,11 +6,11 @@ function Node_Array_Shuffle(_x, _y, _group = noone) : Node(_x, _y, _group) const inputs[| 0] = nodeValue("Array in", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, []) .setVisible(true, true); - inputs[| 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 1] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }) .rejectArray(); - outputs[| 0] = nodeValue("Shuffled array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, []); + outputs[| 0] = nodeValue_Output("Shuffled array", self, VALUE_TYPE.any, []); static update = function(frame = CURRENT_FRAME) { var arr = getInputData(0); diff --git a/scripts/node_array_sort/node_array_sort.gml b/scripts/node_array_sort/node_array_sort.gml index 80d1bbade..92ee40a37 100644 --- a/scripts/node_array_sort/node_array_sort.gml +++ b/scripts/node_array_sort/node_array_sort.gml @@ -9,9 +9,9 @@ function Node_Array_Sort(_x, _y, _group = noone) : Node(_x, _y, _group) construc inputs[| 1] = nodeValue_Enum_Button("Order", self, 0, [ "Ascending", "Descending" ]) .rejectArray(); - outputs[| 0] = nodeValue("Sorted array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, []); + outputs[| 0] = nodeValue_Output("Sorted array", self, VALUE_TYPE.any, []); - outputs[| 1] = nodeValue("Sorted index", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, []) + outputs[| 1] = nodeValue_Output("Sorted index", self, VALUE_TYPE.integer, []) .setVisible(false); static sortAcs = function(v1, v2) { return v2.val - v1.val; } diff --git a/scripts/node_array_split/node_array_split.gml b/scripts/node_array_split/node_array_split.gml index 389e8f696..da0337949 100644 --- a/scripts/node_array_split/node_array_split.gml +++ b/scripts/node_array_split/node_array_split.gml @@ -7,7 +7,7 @@ function Node_Array_Split(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, []) .setVisible(true, true); - outputs[| 0] = nodeValue("val 0", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("val 0", self, VALUE_TYPE.any, 0); attributes.output_amount = 1; @@ -27,7 +27,7 @@ function Node_Array_Split(_x, _y, _group = noone) : Node(_x, _y, _group) constru for (var i = 0; i < amo; i++) { if(i >= ds_list_size(outputs)) - outputs[| i] = nodeValue($"val {i}", self, JUNCTION_CONNECT.output, type, 0) + outputs[| i] = nodeValue_Output($"val {i}", self, type, 0) outputs[| i].setValue(_inp[i]); } @@ -51,7 +51,7 @@ function Node_Array_Split(_x, _y, _group = noone) : Node(_x, _y, _group) constru ds_list_clear(outputs); repeat(_outAmo) { - ds_list_add(outputs, nodeValue($"val {_ind}", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0)); + ds_list_add(outputs, nodeValue_Output($"val {_ind}", self, VALUE_TYPE.any, 0)); _ind++; } } diff --git a/scripts/node_array_zip/node_array_zip.gml b/scripts/node_array_zip/node_array_zip.gml index 32102efdc..4b3daee10 100644 --- a/scripts/node_array_zip/node_array_zip.gml +++ b/scripts/node_array_zip/node_array_zip.gml @@ -5,7 +5,7 @@ function Node_Array_Zip(_x, _y, _group = noone) : Node(_x, _y, _group) construct inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.integer, 0); static createNewInput = function() { var index = ds_list_size(inputs); diff --git a/scripts/node_ase_file_read/node_ase_file_read.gml b/scripts/node_ase_file_read/node_ase_file_read.gml index 4fa9e9630..a1d3744b9 100644 --- a/scripts/node_ase_file_read/node_ase_file_read.gml +++ b/scripts/node_ase_file_read/node_ase_file_read.gml @@ -29,23 +29,23 @@ function Node_ASE_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "Aseprite file|*.ase;*.aseprite" }); - inputs[| 1] = nodeValue("Generate layers", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 1] = nodeValue_Trigger("Generate layers", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Generate", UI : true, onClick: function() { refreshLayers(); } }); - inputs[| 2] = nodeValue("Current tag", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 2] = nodeValue_Text("Current tag", self, ""); - inputs[| 3] = nodeValue("Use cel dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Use cel dimension", self, false); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Content", self, JUNCTION_CONNECT.output, VALUE_TYPE.object, self); + outputs[| 1] = nodeValue_Output("Content", self, VALUE_TYPE.object, self); - outputs[| 2] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, ""); + outputs[| 2] = nodeValue_Output("Path", self, VALUE_TYPE.path, ""); - outputs[| 3] = nodeValue("Palette", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, []) + outputs[| 3] = nodeValue_Output("Palette", self, VALUE_TYPE.color, []) .setDisplay(VALUE_DISPLAY.palette); hold_visibility = true; diff --git a/scripts/node_ase_layer/node_ase_layer.gml b/scripts/node_ase_layer/node_ase_layer.gml index b216a8171..bd2a1d039 100644 --- a/scripts/node_ase_layer/node_ase_layer.gml +++ b/scripts/node_ase_layer/node_ase_layer.gml @@ -5,10 +5,10 @@ function Node_ASE_layer(_x, _y, _group = noone) : Node(_x, _y, _group) construct .setVisible(false, true) .rejectArray(); - inputs[| 1] = nodeValue("Crop Output", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 1] = nodeValue_Bool("Crop Output", self, false) .rejectArray(); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); layer_object = noone; _name = ""; diff --git a/scripts/node_atlas/node_atlas.gml b/scripts/node_atlas/node_atlas.gml index 5b561ecc6..add622487 100644 --- a/scripts/node_atlas/node_atlas.gml +++ b/scripts/node_atlas/node_atlas.gml @@ -3,12 +3,12 @@ function Node_Atlas(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; inputs[| 2] = nodeValue_Enum_Scroll("Method", self, 0, [ "Radial", "Scan" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, 0, 2 ]; diff --git a/scripts/node_atlas_draw/node_atlas_draw.gml b/scripts/node_atlas_draw/node_atlas_draw.gml index 5fcdd1088..024d1f753 100644 --- a/scripts/node_atlas_draw/node_atlas_draw.gml +++ b/scripts/node_atlas_draw/node_atlas_draw.gml @@ -7,7 +7,7 @@ function Node_Atlas_Draw(_x, _y, _group = noone) : Node(_x, _y, _group) construc inputs[| 1] = nodeValue_Surface("Atlas", self) .setVisible(true, true); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone); attribute_interpolation(true); diff --git a/scripts/node_atlas_get/node_atlas_get.gml b/scripts/node_atlas_get/node_atlas_get.gml index d14c4bfe1..d2f696d84 100644 --- a/scripts/node_atlas_get/node_atlas_get.gml +++ b/scripts/node_atlas_get/node_atlas_get.gml @@ -5,24 +5,24 @@ function Node_Atlas_Get(_x, _y, _group = noone) : Node(_x, _y, _group) construct inputs[| 0] = nodeValue_Surface("Atlas", self) .setVisible(true, true); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []) + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, []) .setArrayDepth(1); - outputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []) + outputs[| 1] = nodeValue_Output("Position", self, VALUE_TYPE.float, []) .setDisplay(VALUE_DISPLAY.vector) .setArrayDepth(1); - outputs[| 2] = nodeValue("Rotation", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []) + outputs[| 2] = nodeValue_Output("Rotation", self, VALUE_TYPE.float, []) .setArrayDepth(1); - outputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []) + outputs[| 3] = nodeValue_Output("Scale", self, VALUE_TYPE.float, []) .setDisplay(VALUE_DISPLAY.vector) .setArrayDepth(1); - outputs[| 4] = nodeValue("Blend", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, []) + outputs[| 4] = nodeValue_Output("Blend", self, VALUE_TYPE.color, []) .setArrayDepth(1); - outputs[| 5] = nodeValue("Alpha", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []) + outputs[| 5] = nodeValue_Output("Alpha", self, VALUE_TYPE.float, []) .setArrayDepth(1); static update = function(frame = CURRENT_FRAME) { diff --git a/scripts/node_atlas_set/node_atlas_set.gml b/scripts/node_atlas_set/node_atlas_set.gml index 08f631d5c..3422237fb 100644 --- a/scripts/node_atlas_set/node_atlas_set.gml +++ b/scripts/node_atlas_set/node_atlas_set.gml @@ -7,21 +7,19 @@ function Node_Atlas_Set(_x, _y, _group = noone) : Node(_x, _y, _group) construct inputs[| 1] = nodeValue_Surface("Surface", self); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0 ]); inputs[| 3] = nodeValue_Rotation("Rotation", self, 0); - inputs[| 4] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Scale", self, [ 0, 0 ]); - inputs[| 5] = nodeValue("Blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 5] = nodeValue_Color("Blend", self, c_white); - inputs[| 6] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 6] = nodeValue_Float("Alpha", self, 1); - inputs[| 7] = nodeValue("Recalculate Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Recalculate Position", self, true); - outputs[| 0] = nodeValue("Atlas", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Atlas", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, 1, 2, 3, 7, 4, 5, 6, diff --git a/scripts/node_atlas_to_struct/node_atlas_to_struct.gml b/scripts/node_atlas_to_struct/node_atlas_to_struct.gml index 7fe4b4479..f73ed0190 100644 --- a/scripts/node_atlas_to_struct/node_atlas_to_struct.gml +++ b/scripts/node_atlas_to_struct/node_atlas_to_struct.gml @@ -5,7 +5,7 @@ function Node_Atlas_Struct(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 0] = nodeValue_Surface("Atlas", self) .setVisible(true, true); - outputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, []) + outputs[| 0] = nodeValue_Output("Struct", self, VALUE_TYPE.struct, []) .setArrayDepth(1); static update = function(frame = CURRENT_FRAME) { diff --git a/scripts/node_audio_loudness/node_audio_loudness.gml b/scripts/node_audio_loudness/node_audio_loudness.gml index feb87fd0a..1bf6ff18b 100644 --- a/scripts/node_audio_loudness/node_audio_loudness.gml +++ b/scripts/node_audio_loudness/node_audio_loudness.gml @@ -2,11 +2,11 @@ function Node_Audio_Loudness(_x, _y, _group = noone) : Node_Processor(_x, _y, _g name = "Audio Loudness"; setDimension(96, 72); - inputs[| 0] = nodeValue("Audio Data", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 0] = nodeValue_Float("Audio Data", self, []) .setArrayDepth(1) .setVisible(true, true); - outputs[| 0] = nodeValue("Loudness", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Loudness", self, VALUE_TYPE.float, 0); static processData = function(_outSurf, _data, _output_index, _array_index) { var _dat = _data[0]; diff --git a/scripts/node_audio_window/node_audio_window.gml b/scripts/node_audio_window/node_audio_window.gml index 27d3c4f32..6f4dfefd7 100644 --- a/scripts/node_audio_window/node_audio_window.gml +++ b/scripts/node_audio_window/node_audio_window.gml @@ -1,12 +1,12 @@ function Node_Audio_Window(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Audio Window"; - inputs[| 0] = nodeValue("Audio data", self, JUNCTION_CONNECT.input, VALUE_TYPE.audioBit, noone) + inputs[| 0] = nodeValue_AudioBit("Audio data", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4096, "Amount of bits to extract."); + inputs[| 1] = nodeValue_Int("Width", self, 4096, "Amount of bits to extract."); - inputs[| 2] = nodeValue("Location", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Location", self, 0) .setDisplay(VALUE_DISPLAY._default, { unit: 0, side_button: button(function() { inputs[| 2].display_data.unit = (inputs[| 2].display_data.unit + 1) % 3; inputs[| 2].display_data.side_button.tooltip.index = inputs[| 2].display_data.unit; @@ -18,11 +18,11 @@ function Node_Audio_Window(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 3] = nodeValue_Enum_Button("Cursor location", self, 1, [ "Start", "Middle", "End" ]); - inputs[| 4] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 16); + inputs[| 4] = nodeValue_Int("Step", self, 16); - inputs[| 5] = nodeValue("Match timeline", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Set window cursor to match animation timeline."); + inputs[| 5] = nodeValue_Bool("Match timeline", self, true, "Set window cursor to match animation timeline."); - outputs[| 0] = nodeValue("Bit Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []) + outputs[| 0] = nodeValue_Output("Bit Array", self, VALUE_TYPE.float, []) .setArrayDepth(1); input_display_list = [ 0, diff --git a/scripts/node_average/node_average.gml b/scripts/node_average/node_average.gml index bd101d198..df059a061 100644 --- a/scripts/node_average/node_average.gml +++ b/scripts/node_average/node_average.gml @@ -5,14 +5,13 @@ function Node_Average(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 1] = nodeValue_Surface("Mask", self); - inputs[| 2] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - inputs[| 4] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 4] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(1); // inputs 5, 6, @@ -20,9 +19,9 @@ function Node_Average(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c ["Surfaces", false], 0, 1, 2, 5, 6, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Color", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, c_black); + outputs[| 1] = nodeValue_Output("Color", self, VALUE_TYPE.color, c_black); attribute_surface_depth(); diff --git a/scripts/node_base_convert/node_base_convert.gml b/scripts/node_base_convert/node_base_convert.gml index a587abeb1..37d1ce8ad 100644 --- a/scripts/node_base_convert/node_base_convert.gml +++ b/scripts/node_base_convert/node_base_convert.gml @@ -4,14 +4,14 @@ function Node_Base_Convert(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro setDimension(96, 48); - inputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Value", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Base from", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 10); + inputs[| 1] = nodeValue_Int("Base from", self, 10); - inputs[| 2] = nodeValue("Base to", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 10); + inputs[| 2] = nodeValue_Int("Base to", self, 10); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.text, ""); static processData = function(_output, _data, _output_index, _array_index = 0) { var val = _data[0]; diff --git a/scripts/node_bend/node_bend.gml b/scripts/node_bend/node_bend.gml index 2ee94833d..2dd7b140a 100644 --- a/scripts/node_bend/node_bend.gml +++ b/scripts/node_bend/node_bend.gml @@ -3,7 +3,7 @@ function Node_Bend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; inputs[| 2] = nodeValue_Enum_Scroll("Type", self, 0, [ new scrollItem("Arc", s_node_bend_type, 0), @@ -11,14 +11,14 @@ function Node_Bend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 3] = nodeValue_Enum_Button("Axis", self, 0, [ "x", "y" ]); - inputs[| 4] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.25) + inputs[| 4] = nodeValue_Float("Amount", self, 0.25) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 5] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 5] = nodeValue_Float("Scale", self, 1); - inputs[| 6] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.); + inputs[| 6] = nodeValue_Float("Shift", self, 0.); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", false], 0, diff --git a/scripts/node_bevel/node_bevel.gml b/scripts/node_bevel/node_bevel.gml index 66e8cff59..b0ad6b827 100644 --- a/scripts/node_bevel/node_bevel.gml +++ b/scripts/node_bevel/node_bevel.gml @@ -3,14 +3,12 @@ function Node_Bevel(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Height", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 1] = nodeValue_Int("Height", self, 4) .setMappable(11); - inputs[| 2] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Shift", self, [ 0, 0 ]); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Scale", self, [ 1, 1 ] ); inputs[| 4] = nodeValue_Enum_Scroll("Slope", self, 0, [ new scrollItem("Linear", s_node_curve, 2), new scrollItem("Smooth", s_node_curve, 4), @@ -18,10 +16,10 @@ function Node_Bevel(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; inputs[| 8] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -35,7 +33,7 @@ function Node_Bevel(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con ////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 7, ["Surfaces", true], 0, 5, 6, 9, 10, diff --git a/scripts/node_blend/node_blend.gml b/scripts/node_blend/node_blend.gml index e405c7a2e..1fc16366e 100644 --- a/scripts/node_blend/node_blend.gml +++ b/scripts/node_blend/node_blend.gml @@ -39,7 +39,7 @@ function Node_Blend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 2] = nodeValue_Enum_Scroll("Blend mode", self, 0, BLEND_TYPES ); - inputs[| 3] = nodeValue("Opacity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Opacity", self, 1) .setDisplay(VALUE_DISPLAY.slider); inputs[| 4] = nodeValue_Surface("Mask", self); @@ -49,13 +49,12 @@ function Node_Blend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 6] = nodeValue_Enum_Scroll("Output dimension", self, 0, [ "Background", "Forground", "Mask", "Maximum", "Constant" ]) .rejectArray(); - inputs[| 7] = nodeValue("Constant dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Constant dimension", self, DEF_SURF); - inputs[| 8] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Active", self, true); active_index = 8; - inputs[| 9] = nodeValue("Preserve alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 9] = nodeValue_Bool("Preserve alpha", self, false); inputs[| 10] = nodeValue_Enum_Button("Horizontal Align", self, 0, [ THEME.inspector_surface_halign, THEME.inspector_surface_halign, THEME.inspector_surface_halign]); @@ -63,15 +62,14 @@ function Node_Blend(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 11] = nodeValue_Enum_Button("Vertical Align", self, 0, [ THEME.inspector_surface_valign, THEME.inspector_surface_valign, THEME.inspector_surface_valign]); - inputs[| 12] = nodeValue("Invert mask", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 12] = nodeValue_Bool("Invert mask", self, false); - inputs[| 13] = nodeValue("Mask feather", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 13] = nodeValue_Float("Mask feather", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); - inputs[| 14] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 14] = nodeValue_Vector("Position", self, [ 0.5, 0.5 ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 8, ["Surfaces", true], 0, 1, 4, 12, 13, 6, 7, diff --git a/scripts/node_blend_edge/node_blend_edge.gml b/scripts/node_blend_edge/node_blend_edge.gml index b08e1e54d..da756abb2 100644 --- a/scripts/node_blend_edge/node_blend_edge.gml +++ b/scripts/node_blend_edge/node_blend_edge.gml @@ -3,17 +3,16 @@ function Node_Blend_Edge(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 1] = nodeValue_Float("Width", self, 0.1) .setDisplay(VALUE_DISPLAY.slider) .setMappable(5); inputs[| 2] = nodeValue_Enum_Button("Types",self, 0, [ "Both", "Horizontal", "Vertical" ]); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - inputs[| 4] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 4] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); ///////////////////////////////////////////////////////////////////////////////////////////////////// @@ -22,10 +21,10 @@ function Node_Blend_Edge(_x, _y, _group = noone) : Node_Processor(_x, _y, _group ///////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 6] = nodeValue("Blending", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Blending", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Smoothness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 7] = nodeValue_Float("Smoothness", self, 0) .setDisplay(VALUE_DISPLAY.slider); input_display_list = [ 3, 4, @@ -33,7 +32,7 @@ function Node_Blend_Edge(_x, _y, _group = noone) : Node_Processor(_x, _y, _group ["Blend", false], 2, 1, 5, 6, 7, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); temp_surface = array_create(1); diff --git a/scripts/node_blobify/node_blobify.gml b/scripts/node_blobify/node_blobify.gml index 091dccd65..c5bb6d5ae 100644 --- a/scripts/node_blobify/node_blobify.gml +++ b/scripts/node_blobify/node_blobify.gml @@ -3,12 +3,12 @@ function Node_Blobify(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); - inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 3) + inputs[| 2] = nodeValue_Int("Radius", self, 3) .setValidator(VV_min(0)); - inputs[| 3] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 3] = nodeValue_Float("Threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); active_index = 1; @@ -18,7 +18,7 @@ function Node_Blobify(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c ["Blobify", false], 2, 3, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_blobify/node_bw.gml b/scripts/node_blobify/node_bw.gml index af27efe62..1d28185b4 100644 --- a/scripts/node_blobify/node_bw.gml +++ b/scripts/node_blobify/node_bw.gml @@ -11,13 +11,13 @@ function Node_BW(_x, _y) : Node_Processor(_x, _y) constructor { uniform_con = shader_get_uniform(sh_bw, "contrast"); inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Brightness", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "Contrast", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ -1, 4, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_inSurf, _outSurf, _data) { var _exp = _data[1]; diff --git a/scripts/node_bloom/node_bloom.gml b/scripts/node_bloom/node_bloom.gml index e87709767..36ecc4f87 100644 --- a/scripts/node_bloom/node_bloom.gml +++ b/scripts/node_bloom/node_bloom.gml @@ -2,39 +2,37 @@ function Node_Bloom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con name = "Bloom"; inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3, "Bloom blur radius.") + inputs[| 1] = nodeValue_Float("Size", self, 3, "Bloom blur radius.") .setDisplay(VALUE_DISPLAY.slider, { range: [1, 32, 0.1] }); - inputs[| 2] = nodeValue("Tolerance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5, "How bright a pixel should be to start blooming.") + inputs[| 2] = nodeValue_Float("Tolerance", self, 0.5, "How bright a pixel should be to start blooming.") .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .25, "Blend intensity.") + inputs[| 3] = nodeValue_Float("Strength", self, .25, "Blend intensity.") .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01] }); inputs[| 4] = nodeValue_Surface("Bloom mask", self); inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; - inputs[| 8] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 8] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(5); // inputs 9, 10 - inputs[| 11] = nodeValue("Aspect Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 11] = nodeValue_Float("Aspect Ratio", self, 1) .setDisplay(VALUE_DISPLAY.slider); inputs[| 12] = nodeValue_Rotation("Direction", self, 0); inputs[| 13] = nodeValue_Enum_Scroll("Types", self, 0, [ "Gaussian", "Zoom" ]); - inputs[| 14] = nodeValue("Zoom Origin", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 14] = nodeValue_Vector("Zoom Origin", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); input_display_list = [ 7, 8, @@ -43,7 +41,7 @@ function Node_Bloom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con ["Blur", false], 13, 11, 12, 14, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); temp_surface = [ 0 ]; diff --git a/scripts/node_blur/node_blur.gml b/scripts/node_blur/node_blur.gml index 4c4d94094..d42ccbb54 100644 --- a/scripts/node_blur/node_blur.gml +++ b/scripts/node_blur/node_blur.gml @@ -2,37 +2,36 @@ function Node_Blur(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons name = "Blur"; inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 3) + inputs[| 1] = nodeValue_Int("Size", self, 3) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 32, 0.1 ] }); inputs[| 2] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) .setTooltip("How to deal with pixel outside the surface.\n - Empty: Use empty pixel\n - Clamp: Repeat edge pixel\n - Repeat: Repeat texture."); - inputs[| 3] = nodeValue("Override color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Replace all color while keeping the alpha. Used to\nfix grey outline when bluring transparent pixel."); + inputs[| 3] = nodeValue_Bool("Override color", self, false, "Replace all color while keeping the alpha. Used to\nfix grey outline when bluring transparent pixel."); - inputs[| 4] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 4] = nodeValue_Color("Color", self, c_black); inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; - inputs[| 8] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 8] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(5); // inputs 9, 10 - inputs[| 11] = nodeValue("Gamma Correction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Gamma Correction", self, false); - inputs[| 12] = nodeValue("Aspect Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Aspect Ratio", self, 1) .setDisplay(VALUE_DISPLAY.slider); inputs[| 13] = nodeValue_Rotation("Direction", self, 0); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 7, 8, ["Surfaces", true], 0, 5, 6, 9, 10, diff --git a/scripts/node_blur_bokeh/node_blur_bokeh.gml b/scripts/node_blur_bokeh/node_blur_bokeh.gml index bdee8bb47..2cd86e78b 100644 --- a/scripts/node_blur_bokeh/node_blur_bokeh.gml +++ b/scripts/node_blur_bokeh/node_blur_bokeh.gml @@ -3,20 +3,19 @@ function Node_Blur_Bokeh(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 1] = nodeValue_Float("Strength", self, 0.2) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 16, 0.01] }) .setMappable(8); inputs[| 2] = nodeValue_Surface("Mask", self); - inputs[| 3] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Active", self, true); active_index = 4; - inputs[| 5] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 5] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(2); // inputs 6, 7 @@ -31,7 +30,7 @@ function Node_Blur_Bokeh(_x, _y, _group = noone) : Node_Processor(_x, _y, _group ["Blur", false], 1, 8, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_blur_bokeh/node_bw.gml b/scripts/node_blur_bokeh/node_bw.gml index af27efe62..1d28185b4 100644 --- a/scripts/node_blur_bokeh/node_bw.gml +++ b/scripts/node_blur_bokeh/node_bw.gml @@ -11,13 +11,13 @@ function Node_BW(_x, _y) : Node_Processor(_x, _y) constructor { uniform_con = shader_get_uniform(sh_bw, "contrast"); inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Brightness", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "Contrast", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ -1, 4, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_inSurf, _outSurf, _data) { var _exp = _data[1]; diff --git a/scripts/node_blur_contrast/node_blur_contrast.gml b/scripts/node_blur_contrast/node_blur_contrast.gml index f7f0e8861..130c20ce8 100644 --- a/scripts/node_blur_contrast/node_blur_contrast.gml +++ b/scripts/node_blur_contrast/node_blur_contrast.gml @@ -3,33 +3,32 @@ function Node_Blur_Contrast(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3) + inputs[| 1] = nodeValue_Float("Size", self, 3) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 32, 0.1] }); - inputs[| 2] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2, "Brightness different to be blur together.") + inputs[| 2] = nodeValue_Float("Threshold", self, 0.2, "Brightness different to be blur together.") .setDisplay(VALUE_DISPLAY.slider); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 - inputs[| 9] = nodeValue("Gamma Correction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 9] = nodeValue_Bool("Gamma Correction", self, false); input_display_list = [ 5, 6, ["Surfaces", true], 0, 3, 4, 7, 8, ["Blur", false], 1, 2, 9, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); temp_surface = [ surface_create(1, 1) ]; diff --git a/scripts/node_blur_directional/node_blur_directional.gml b/scripts/node_blur_directional/node_blur_directional.gml index df3774a19..5a8a9ae56 100644 --- a/scripts/node_blur_directional/node_blur_directional.gml +++ b/scripts/node_blur_directional/node_blur_directional.gml @@ -3,7 +3,7 @@ function Node_Blur_Directional(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 1] = nodeValue_Float("Strength", self, 0.2) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(9); @@ -12,14 +12,13 @@ function Node_Blur_Directional(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 @@ -31,16 +30,16 @@ function Node_Blur_Directional(_x, _y, _group = noone) : Node_Processor(_x, _y, ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 11] = nodeValue("Single direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Single direction", self, false); - inputs[| 12] = nodeValue("Gamma Correction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 12] = nodeValue_Bool("Gamma Correction", self, false); input_display_list = [ 5, 6, ["Surfaces", true], 0, 3, 4, 7, 8, ["Blur", false], 1, 9, 2, 10, 11, 12, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_blur_directional/node_bw.gml b/scripts/node_blur_directional/node_bw.gml index af27efe62..1d28185b4 100644 --- a/scripts/node_blur_directional/node_bw.gml +++ b/scripts/node_blur_directional/node_bw.gml @@ -11,13 +11,13 @@ function Node_BW(_x, _y) : Node_Processor(_x, _y) constructor { uniform_con = shader_get_uniform(sh_bw, "contrast"); inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Brightness", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "Contrast", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ -1, 4, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_inSurf, _outSurf, _data) { var _exp = _data[1]; diff --git a/scripts/node_blur_path/node_blur_path.gml b/scripts/node_blur_path/node_blur_path.gml index ebda20e39..4b320462a 100644 --- a/scripts/node_blur_path/node_blur_path.gml +++ b/scripts/node_blur_path/node_blur_path.gml @@ -2,32 +2,30 @@ function Node_Blur_Path(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) name = "Path Blur"; inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Blur Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 1] = nodeValue_PathNode("Blur Path", self, noone) .setVisible(true, true); - inputs[| 2] = nodeValue("Resolution", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 32); + inputs[| 2] = nodeValue_Int("Resolution", self, 32); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 - inputs[| 9] = nodeValue("Intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 9] = nodeValue_Float("Intensity", self, 1); inputs[| 10] = nodeValue("Intensity Along Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 11] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 11] = nodeValue_Slider_Range("Range", self, [ 0, 1 ]); - inputs[| 12] = nodeValue("Path Origin", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 12] = nodeValue_Float("Path Origin", self, 0) .setDisplay(VALUE_DISPLAY.slider); input_display_list = [ 5, 6, @@ -36,7 +34,7 @@ function Node_Blur_Path(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Blur", false], 2, 9, 10, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_blur_radial/node_blur_radial.gml b/scripts/node_blur_radial/node_blur_radial.gml index 57f3ca20a..74e9a03d5 100644 --- a/scripts/node_blur_radial/node_blur_radial.gml +++ b/scripts/node_blur_radial/node_blur_radial.gml @@ -6,8 +6,7 @@ function Node_Blur_Radial(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 1] = nodeValue_Rotation("Strength", self, 45) .setMappable(10); - inputs[| 2] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Center", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); inputs[| 3] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -15,14 +14,13 @@ function Node_Blur_Radial(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 4] = nodeValue_Surface("Mask", self); - inputs[| 5] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 5] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Active", self, true); active_index = 6; - inputs[| 7] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 7] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(4); // inputs 8, 9, @@ -32,9 +30,9 @@ function Node_Blur_Radial(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 11] = nodeValue("Gamma Correction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Gamma Correction", self, false); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 6, 7, ["Surfaces", true], 0, 4, 5, 8, 9, diff --git a/scripts/node_blur_radial/node_bw.gml b/scripts/node_blur_radial/node_bw.gml index af27efe62..1d28185b4 100644 --- a/scripts/node_blur_radial/node_bw.gml +++ b/scripts/node_blur_radial/node_bw.gml @@ -11,13 +11,13 @@ function Node_BW(_x, _y) : Node_Processor(_x, _y) constructor { uniform_con = shader_get_uniform(sh_bw, "contrast"); inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Brightness", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "Contrast", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ -1, 4, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_inSurf, _outSurf, _data) { var _exp = _data[1]; diff --git a/scripts/node_blur_shape/node_blur_shape.gml b/scripts/node_blur_shape/node_blur_shape.gml index 04ff84d4a..8a07b7d75 100644 --- a/scripts/node_blur_shape/node_blur_shape.gml +++ b/scripts/node_blur_shape/node_blur_shape.gml @@ -8,27 +8,26 @@ function Node_Blur_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); inputs[| 7] = nodeValue_Enum_Button("Mode", self, 0, [ "Blur", "Max" ]); __init_mask_modifier(3); // inputs 8, 9, - inputs[| 10] = nodeValue("Gamma Correction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 10] = nodeValue_Bool("Gamma Correction", self, false); input_display_list = [ 5, 6, ["Surfaces", true], 0, 3, 4, 8, 9, ["Blur", false], 7, 1, 2, 10, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_blur_simple/node_blur_simple.gml b/scripts/node_blur_simple/node_blur_simple.gml index a9bcaacc8..02bae444d 100644 --- a/scripts/node_blur_simple/node_blur_simple.gml +++ b/scripts/node_blur_simple/node_blur_simple.gml @@ -2,7 +2,7 @@ function Node_Blur_Simple(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou name = "Non-Uniform Blur"; inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3) + inputs[| 1] = nodeValue_Float("Size", self, 3) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 32, 0.1] }); inputs[| 2] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -10,33 +10,32 @@ function Node_Blur_Simple(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 3] = nodeValue_Surface("Blur mask", self); - inputs[| 4] = nodeValue("Override color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Replace all color while keeping the alpha. Used to\nfix grey outline when bluring transparent pixel."); + inputs[| 4] = nodeValue_Bool("Override color", self, false, "Replace all color while keeping the alpha. Used to\nfix grey outline when bluring transparent pixel."); - inputs[| 5] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 5] = nodeValue_Color("Color", self, c_black); inputs[| 6] = nodeValue_Surface("Mask", self); - inputs[| 7] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 7] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Active", self, true); active_index = 8; - inputs[| 9] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 9] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(6); // inputs 10, 11, - inputs[| 12] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject([ cola(c_black), cola(c_white) ]) ) + inputs[| 12] = nodeValue_Gradient("Gradient", self, new gradientObject([ cola(c_black), cola(c_white) ])) .setMappable(13); inputs[| 13] = nodeValueMap("Gradient map", self); inputs[| 14] = nodeValueGradientRange("Gradient map range", self, inputs[| 1]); - inputs[| 15] = nodeValue("Use Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 15] = nodeValue_Bool("Use Gradient", self, false); - inputs[| 16] = nodeValue("Gamma Correction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 16] = nodeValue_Bool("Gamma Correction", self, false); input_display_list = [ 8, 9, ["Surfaces", true], 0, 6, 7, 10, 11, @@ -44,7 +43,7 @@ function Node_Blur_Simple(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ["Effects", false, 15], 12, 13, 14, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_blur_slope/node_blur_slope.gml b/scripts/node_blur_slope/node_blur_slope.gml index 6e50d6c75..3b0407049 100644 --- a/scripts/node_blur_slope/node_blur_slope.gml +++ b/scripts/node_blur_slope/node_blur_slope.gml @@ -3,7 +3,7 @@ function Node_Blur_Slope(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4) + inputs[| 1] = nodeValue_Float("Strength", self, 4) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 32, 0.1 ] }) .setMappable(9); @@ -11,14 +11,13 @@ function Node_Blur_Slope(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 @@ -28,17 +27,17 @@ function Node_Blur_Slope(_x, _y, _group = noone) : Node_Processor(_x, _y, _group ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 10] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 10] = nodeValue_Float("Step", self, 0.1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 1, 0.01] }); - inputs[| 11] = nodeValue("Gamma Correction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Gamma Correction", self, false); input_display_list = [ 5, 6, ["Surfaces", true], 0, 3, 4, 7, 8, ["Blur", false], 2, 1, 9, 10, 11, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_blur_slope/node_bw.gml b/scripts/node_blur_slope/node_bw.gml index af27efe62..1d28185b4 100644 --- a/scripts/node_blur_slope/node_bw.gml +++ b/scripts/node_blur_slope/node_bw.gml @@ -11,13 +11,13 @@ function Node_BW(_x, _y) : Node_Processor(_x, _y) constructor { uniform_con = shader_get_uniform(sh_bw, "contrast"); inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Brightness", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "Contrast", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ -1, 4, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_inSurf, _outSurf, _data) { var _exp = _data[1]; diff --git a/scripts/node_blur_zoom/node_blur_zoom.gml b/scripts/node_blur_zoom/node_blur_zoom.gml index 01bcff955..ea5e30947 100644 --- a/scripts/node_blur_zoom/node_blur_zoom.gml +++ b/scripts/node_blur_zoom/node_blur_zoom.gml @@ -3,11 +3,10 @@ function Node_Blur_Zoom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 1] = nodeValue_Float("Strength", self, 0.2) .setMappable(12); - inputs[| 2] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Center", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }); inputs[| 3] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -19,14 +18,13 @@ function Node_Blur_Zoom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 6] = nodeValue_Surface("Mask", self); - inputs[| 7] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 7] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Active", self, true); active_index = 8; - inputs[| 9] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 9] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(6); // inputs 10, 11 @@ -36,9 +34,9 @@ function Node_Blur_Zoom(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 13] = nodeValue("Gamma Correction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 13] = nodeValue_Bool("Gamma Correction", self, false); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 8, 9, ["Surfaces", true], 0, 6, 7, 10, 11, diff --git a/scripts/node_blur_zoom/node_bw.gml b/scripts/node_blur_zoom/node_bw.gml index af27efe62..1d28185b4 100644 --- a/scripts/node_blur_zoom/node_bw.gml +++ b/scripts/node_blur_zoom/node_bw.gml @@ -11,13 +11,13 @@ function Node_BW(_x, _y) : Node_Processor(_x, _y) constructor { uniform_con = shader_get_uniform(sh_bw, "contrast"); inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Brightness", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "Contrast", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ -1, 4, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_inSurf, _outSurf, _data) { var _exp = _data[1]; diff --git a/scripts/node_boolean/node_boolean.gml b/scripts/node_boolean/node_boolean.gml index fef2fba73..90e9beeb4 100644 --- a/scripts/node_boolean/node_boolean.gml +++ b/scripts/node_boolean/node_boolean.gml @@ -8,14 +8,14 @@ function Node_Boolean(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c wd_checkBox = new checkBox( function() { inputs[| 0].setValue(!getInputData(0)); } ); - inputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 0] = nodeValue_Bool("Value", self, false) .setVisible(true, true); - inputs[| 1] = nodeValue("Hide Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Hide Background", self, false); inputs[| 2] = nodeValue_Enum_Button("Name location", self, 1, [ "Top", "Bottom" ]); - outputs[| 0] = nodeValue("Boolean", self, JUNCTION_CONNECT.output, VALUE_TYPE.boolean, false); + outputs[| 0] = nodeValue_Output("Boolean", self, VALUE_TYPE.boolean, false); input_display_list = [ 0, ["Display", false], 1, 2, diff --git a/scripts/node_box_pattern/node_box_pattern.gml b/scripts/node_box_pattern/node_box_pattern.gml index 955d7ca32..1d06a1248 100644 --- a/scripts/node_box_pattern/node_box_pattern.gml +++ b/scripts/node_box_pattern/node_box_pattern.gml @@ -3,20 +3,19 @@ function Node_Box_Pattern(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2) + inputs[| 1] = nodeValue_Float("Scale", self, 2) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }) .setMappable(6); inputs[| 2] = nodeValue_Rotation("Angle", self, 0) .setMappable(7); - inputs[| 3] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Position", self, [0, 0] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 4] = nodeValue("Color 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 4] = nodeValue_Color("Color 1", self, c_white); - inputs[| 5] = nodeValue("Color 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 5] = nodeValue_Color("Color 2", self, c_black); ////////////////////////////////////////////////////////////////////////////////// @@ -28,7 +27,7 @@ function Node_Box_Pattern(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 8] = nodeValue_Enum_Button("Type", self, 0, [ "Solid", "Smooth", "AA" ]); - inputs[| 9] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.25) + inputs[| 9] = nodeValue_Float("Width", self, 0.25) .setDisplay(VALUE_DISPLAY.slider) .setMappable(10); @@ -36,9 +35,9 @@ function Node_Box_Pattern(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 11] = nodeValue_Enum_Button("Pattern", self, 0, [ "Cross", "Xor" ]); - inputs[| 12] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 12] = nodeValue_Int("Iteration", self, 4) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", true], 0, diff --git a/scripts/node_brush_linear/node_brush_linear.gml b/scripts/node_brush_linear/node_brush_linear.gml index 1aff5afcc..056568662 100644 --- a/scripts/node_brush_linear/node_brush_linear.gml +++ b/scripts/node_brush_linear/node_brush_linear.gml @@ -3,34 +3,33 @@ function Node_Brush_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; - inputs[| 2] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 10) + inputs[| 2] = nodeValue_Int("Iteration", self, 10) .setValidator(VV_min(1)); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }) - inputs[| 4] = nodeValue("Length", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 10); + inputs[| 4] = nodeValue_Float("Length", self, 10); - inputs[| 5] = nodeValue("Attenuation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.99) + inputs[| 5] = nodeValue_Float("Attenuation", self, 0.99) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Circulation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.8) + inputs[| 6] = nodeValue_Float("Circulation", self, 0.8) .setDisplay(VALUE_DISPLAY.slider); inputs[| 7] = nodeValue_Surface("Mask", self); - inputs[| 8] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 8] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 9] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(7); // inputs 10, 11 - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surface", false], 0, 7, 8, 9, 10, 11, diff --git a/scripts/node_bw/node_bw.gml b/scripts/node_bw/node_bw.gml index bf635e5d7..a6a94b615 100644 --- a/scripts/node_bw/node_bw.gml +++ b/scripts/node_bw/node_bw.gml @@ -3,24 +3,23 @@ function Node_BW(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constr inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("Brightness", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01] }) .setMappable(9); - inputs[| 2] = nodeValue("Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Contrast", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 4, 0.01] }) .setMappable(10); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 @@ -37,7 +36,7 @@ function Node_BW(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constr ["BW", false], 1, 9, 2, 10, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_byte_file_read/node_byte_file_read.gml b/scripts/node_byte_file_read/node_byte_file_read.gml index fe5a8ca1d..d4dddca85 100644 --- a/scripts/node_byte_file_read/node_byte_file_read.gml +++ b/scripts/node_byte_file_read/node_byte_file_read.gml @@ -4,12 +4,12 @@ function Node_Byte_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) cons w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "any file|*" }) .rejectArray(); - outputs[| 0] = nodeValue("Content", self, JUNCTION_CONNECT.output, VALUE_TYPE.buffer, noone); - outputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, "") + outputs[| 0] = nodeValue_Output("Content", self, VALUE_TYPE.buffer, noone); + outputs[| 1] = nodeValue_Output("Path", self, VALUE_TYPE.path, "") .setVisible(true, true); content = noone; diff --git a/scripts/node_byte_file_write/node_byte_file_write.gml b/scripts/node_byte_file_write/node_byte_file_write.gml index 7f683120a..adc297b11 100644 --- a/scripts/node_byte_file_write/node_byte_file_write.gml +++ b/scripts/node_byte_file_write/node_byte_file_write.gml @@ -4,11 +4,11 @@ function Node_Byte_File_Write(_x, _y, _group = noone) : Node(_x, _y, _group) con w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_save, { filter: "any file|*" }) .rejectArray(); - inputs[| 1] = nodeValue("Content", self, JUNCTION_CONNECT.input, VALUE_TYPE.buffer, noone) + inputs[| 1] = nodeValue_Buffer("Content", self, noone) .setVisible(true, true); static writeFile = function() { diff --git a/scripts/node_cache/node_cache.gml b/scripts/node_cache/node_cache.gml index bb1f10b22..d4c4ff9f8 100644 --- a/scripts/node_cache/node_cache.gml +++ b/scripts/node_cache/node_cache.gml @@ -4,7 +4,7 @@ function Node_Cache(_x, _y, _group = noone) : __Node_Cache(_x, _y, _group) const inputs[| 0] = nodeValue_Surface("Surface in", self); - outputs[| 0] = nodeValue("Cache surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Cache surface", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surfaces", true], 0, diff --git a/scripts/node_cache_array/node_cache_array.gml b/scripts/node_cache_array/node_cache_array.gml index 829981383..2ea1a4fcc 100644 --- a/scripts/node_cache_array/node_cache_array.gml +++ b/scripts/node_cache_array/node_cache_array.gml @@ -4,13 +4,13 @@ function Node_Cache_Array(_x, _y, _group = noone) : __Node_Cache(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Start frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, -1, "Frame index to start caching, set to -1 to start at the first frame."); + inputs[| 1] = nodeValue_Int("Start frame", self, -1, "Frame index to start caching, set to -1 to start at the first frame."); - inputs[| 2] = nodeValue("Stop frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, -1, "Frame index to stop caching (inclusive), set to -1 to stop at the last frame."); + inputs[| 2] = nodeValue_Int("Stop frame", self, -1, "Frame index to stop caching (inclusive), set to -1 to stop at the last frame."); - inputs[| 3] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1, "Cache every N frames, set to 1 to cache every frame."); + inputs[| 3] = nodeValue_Int("Step", self, 1, "Cache every N frames, set to 1 to cache every frame."); - outputs[| 0] = nodeValue("Cache array", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []); + outputs[| 0] = nodeValue_Output("Cache array", self, VALUE_TYPE.surface, []); input_display_list = [ ["Surfaces", true], 0, diff --git a/scripts/node_camera/node_camera.gml b/scripts/node_camera/node_camera.gml index b716a34e7..7500d9880 100644 --- a/scripts/node_camera/node_camera.gml +++ b/scripts/node_camera/node_camera.gml @@ -3,21 +3,20 @@ function Node_Camera(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co preview_alpha = 0.5; onSurfaceSize = function() { return surface_get_dimension(getInputData(0)); }; - inputs[| 0] = nodeValue("Focus area", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_AREA) - .setDisplay(VALUE_DISPLAY.area, { onSurfaceSize, useShape : false }); + inputs[| 0] = nodeValue_Area("Focus area", self, DEF_AREA, { onSurfaceSize, useShape : false }); - inputs[| 1] = nodeValue("Zoom", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 1] = nodeValue_Float("Zoom", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0.01, 4, 0.01 ] }); - inputs[| 2] = nodeValue("Depth of Field", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Depth of Field", self, false); - inputs[| 3] = nodeValue("Focal distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 3] = nodeValue_Float("Focal distance", self, 0); - inputs[| 4] = nodeValue("Defocus", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 4] = nodeValue_Float("Defocus", self, 1); - inputs[| 5] = nodeValue("Focal range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 5] = nodeValue_Float("Focal range", self, 0); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Camera", false], 0, 1, @@ -35,12 +34,11 @@ function Node_Camera(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co if(_s) array_push(input_display_list, new Inspector_Spacer(20, true)); - inputs[| index + 0] = nodeValue($"Element {_s}", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone); + inputs[| index + 0] = nodeValue_Surface($"Element {_s}", self, noone); inputs[| index + 1] = nodeValue_Enum_Button($"Positioning {_s}", self, false, [ "Space", "Camera" ]); - inputs[| index + 2] = nodeValue($"Position {_s}", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| index + 2] = nodeValue_Vector($"Position {_s}", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); inputs[| index + 3] = nodeValue_Enum_Scroll($"Oversample {_s}", self, 0, [ new scrollItem("Empty ", s_node_camera_repeat, 0), @@ -48,8 +46,7 @@ function Node_Camera(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co new scrollItem("Repeat X", s_node_camera_repeat, 2), new scrollItem("Repeat Y", s_node_camera_repeat, 3), ]); - inputs[| index + 4] = nodeValue($"Parallax {_s}", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| index + 4] = nodeValue_Vector($"Parallax {_s}", self, [ 0, 0 ]); inputs[| index + 5] = nodeValue($"Depth {_s}", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); diff --git a/scripts/node_canvas/node_canvas.gml b/scripts/node_canvas/node_canvas.gml index 5c492c72c..0b20373b6 100644 --- a/scripts/node_canvas/node_canvas.gml +++ b/scripts/node_canvas/node_canvas.gml @@ -5,49 +5,47 @@ function Node_Canvas(_x, _y, _group = noone) : Node(_x, _y, _group) constructor inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); - inputs[| 2] = nodeValue("Brush size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ) + inputs[| 1] = nodeValue_Color("Color", self, c_white ); + inputs[| 2] = nodeValue_Int("Brush size", self, 1 ) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 32, 0.1] }); - inputs[| 3] = nodeValue("Fill threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 3] = nodeValue_Float("Fill threshold", self, 0.) .setDisplay(VALUE_DISPLAY.slider); inputs[| 4] = nodeValue_Enum_Scroll("Fill type", self, 0, ["4 connect", "8 connect", "Entire canvas"]); - inputs[| 5] = nodeValue("Draw preview overlay", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Draw preview overlay", self, true); inputs[| 6] = nodeValue_Surface("Brush", self) .setVisible(true, false); - inputs[| 7] = nodeValue("Surface amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 7] = nodeValue_Int("Surface amount", self, 1); inputs[| 8] = nodeValue_Surface("Background", self); - inputs[| 9] = nodeValue("Background alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.) + inputs[| 9] = nodeValue_Float("Background alpha", self, 1.) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Render background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 10] = nodeValue_Bool("Render background", self, true); - inputs[| 11] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 11] = nodeValue_Float("Alpha", self, 1 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 12] = nodeValue("Frames animation", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 12] = nodeValue_Bool("Frames animation", self, true ); - inputs[| 13] = nodeValue("Animation speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ); + inputs[| 13] = nodeValue_Float("Animation speed", self, 1 ); - inputs[| 14] = nodeValue("Use background dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 14] = nodeValue_Bool("Use background dimension", self, true ); - inputs[| 15] = nodeValue("Brush distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 15] = nodeValue_Range("Brush distance", self, [ 1, 1 ] , { linked : true }); - inputs[| 16] = nodeValue("Rotate brush by direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 16] = nodeValue_Bool("Rotate brush by direction", self, false ); - inputs[| 17] = nodeValue("Random direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.rotation_random); + inputs[| 17] = nodeValue_Rotation_Random("Random direction", self, [ 0, 0, 0, 0, 0 ] ); inputs[| 18] = nodeValue_Enum_Scroll("Animation Type", self, 0, [ "Loop", "Hold", "Clear" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); frame_renderer_x = 0; frame_renderer_x_to = 0; diff --git a/scripts/node_caustic/node_caustic.gml b/scripts/node_caustic/node_caustic.gml index df474d398..ee83a98ca 100644 --- a/scripts/node_caustic/node_caustic.gml +++ b/scripts/node_caustic/node_caustic.gml @@ -2,23 +2,21 @@ function Node_Caustic(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y, _g name = "Caustic"; shader = sh_water_caustic; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 4 ]); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 4] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 4] = nodeValue_Float("Progress", self, 0) addShaderProp(SHADER_UNIFORM.float, "progress"); - inputs[| 5] = nodeValue("Detail", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.24) + inputs[| 5] = nodeValue_Float("Detail", self, 1.24) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }); addShaderProp(SHADER_UNIFORM.float, "detail"); diff --git a/scripts/node_cellular/node_cellular.gml b/scripts/node_cellular/node_cellular.gml index 68ea11afc..57bd85c10 100644 --- a/scripts/node_cellular/node_cellular.gml +++ b/scripts/node_cellular/node_cellular.gml @@ -3,34 +3,33 @@ function Node_Cellular(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W / 2, DEF_SURF_H / 2]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ DEF_SURF_W / 2, DEF_SURF_H / 2]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4) + inputs[| 2] = nodeValue_Float("Scale", self, 4) .setMappable(11); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 4] = nodeValue_Enum_Scroll("Type", self, 0, [ "Point", "Edge", "Cell", "Crystal" ]); - inputs[| 5] = nodeValue("Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 5] = nodeValue_Float("Contrast", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 4, 0.01] }); inputs[| 6] = nodeValue_Enum_Button("Pattern", self, 0, [ "Tiled", "Uniform", "Radial" ]); - inputs[| 7] = nodeValue("Middle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 7] = nodeValue_Float("Middle", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [0., 1., 0.01] }); - inputs[| 8] = nodeValue("Radial scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2) + inputs[| 8] = nodeValue_Float("Radial scale", self, 2) .setDisplay(VALUE_DISPLAY.slider, { range: [1., 10., 0.01] }); - inputs[| 9] = nodeValue("Radial shatter", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 9] = nodeValue_Float("Radial shatter", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-10., 10., 0.01] }) .setVisible(false); - inputs[| 10] = nodeValue("Colored", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 10] = nodeValue_Bool("Colored", self, false) ////////////////////////////////////////////////////////////////////////////////// @@ -47,7 +46,7 @@ function Node_Cellular(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Rendering", false], 5, 7, 10, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_checker/node_checker.gml b/scripts/node_checker/node_checker.gml index 062a7c6e7..489e2d531 100644 --- a/scripts/node_checker/node_checker.gml +++ b/scripts/node_checker/node_checker.gml @@ -3,20 +3,19 @@ function Node_Checker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2) + inputs[| 1] = nodeValue_Float("Amount", self, 2) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }) .setMappable(6); inputs[| 2] = nodeValue_Rotation("Angle", self, 0) .setMappable(7); - inputs[| 3] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Position", self, [0, 0] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 4] = nodeValue("Color 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 4] = nodeValue_Color("Color 1", self, c_white); - inputs[| 5] = nodeValue("Color 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 5] = nodeValue_Color("Color 2", self, c_black); ////////////////////////////////////////////////////////////////////////////////// @@ -28,7 +27,7 @@ function Node_Checker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 8] = nodeValue_Enum_Button("Type", self, 0, [ "Solid", "Smooth", "AA" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", true], 0, diff --git a/scripts/node_chromatic_aberration/node_chromatic_aberration.gml b/scripts/node_chromatic_aberration/node_chromatic_aberration.gml index 82cad89a7..fb54c3f00 100644 --- a/scripts/node_chromatic_aberration/node_chromatic_aberration.gml +++ b/scripts/node_chromatic_aberration/node_chromatic_aberration.gml @@ -3,15 +3,14 @@ function Node_Chromatic_Aberration(_x, _y, _group = noone) : Node_Processor(_x, inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Center", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - inputs[| 2] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Strength", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [-16, 16, 0.01] }) .setMappable(4); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -20,7 +19,7 @@ function Node_Chromatic_Aberration(_x, _y, _group = noone) : Node_Processor(_x, ////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 3, ["Surface", false], 0, diff --git a/scripts/node_color/node_color.gml b/scripts/node_color/node_color.gml index a985580e1..8b9974b97 100644 --- a/scripts/node_color/node_color.gml +++ b/scripts/node_color/node_color.gml @@ -2,9 +2,9 @@ function Node_Color(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con name = "Color"; setDimension(96, 48); - inputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 0] = nodeValue_Color("Color", self, c_white); - outputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, c_white); + outputs[| 0] = nodeValue_Output("Color", self, VALUE_TYPE.color, c_white); static processData = function(_output, _data, _output_index, _array_index = 0) { return _data[0]; diff --git a/scripts/node_color_adjust/node_color_adjust.gml b/scripts/node_color_adjust/node_color_adjust.gml index bd3fbaa9c..479cd04f3 100644 --- a/scripts/node_color_adjust/node_color_adjust.gml +++ b/scripts/node_color_adjust/node_color_adjust.gml @@ -4,59 +4,57 @@ function Node_Color_adjust(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("Brightness", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }) .setMappable(18); - inputs[| 2] = nodeValue("Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Contrast", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) .setMappable(19); - inputs[| 3] = nodeValue("Hue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 3] = nodeValue_Float("Hue", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }) .setMappable(20); - inputs[| 4] = nodeValue("Saturation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 4] = nodeValue_Float("Saturation", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }) .setMappable(21); - inputs[| 5] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 5] = nodeValue_Float("Value", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }) .setMappable(22); - inputs[| 6] = nodeValue("Blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, cola(c_white)); + inputs[| 6] = nodeValue_Color("Blend", self, cola(c_white)); - inputs[| 7] = nodeValue("Blend amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 7] = nodeValue_Float("Blend amount", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(23); inputs[| 8] = nodeValue_Surface("Mask", self); - inputs[| 9] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 9] = nodeValue_Float("Alpha", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setMappable(24); - inputs[| 10] = nodeValue("Exposure", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 10] = nodeValue_Float("Exposure", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }) .setMappable(25); - inputs[| 11] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 11] = nodeValue_Bool("Active", self, true); active_index = 11; inputs[| 12] = nodeValue_Enum_Button("Input Type", self, 0, [ "Surface", "Color" ]); - inputs[| 13] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette) + inputs[| 13] = nodeValue_Palette("Color", self, array_clone(DEF_PALETTE)) .setVisible(true, true); inputs[| 14] = nodeValue_Enum_Scroll("Blend mode", self, 0, BLEND_TYPES); - inputs[| 15] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 15] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); - inputs[| 16] = nodeValue("Invert mask", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 16] = nodeValue_Bool("Invert mask", self, false); - inputs[| 17] = nodeValue("Mask feather", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 17] = nodeValue_Float("Mask feather", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); //////////////////////////////////////////////////////////////////////////////////////// @@ -87,9 +85,9 @@ function Node_Color_adjust(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro //////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Color out", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, []) + outputs[| 1] = nodeValue_Output("Color out", self, VALUE_TYPE.color, []) .setDisplay(VALUE_DISPLAY.palette); input_display_list = [11, 12, 15, 9, 24, diff --git a/scripts/node_color_data/node_color_data.gml b/scripts/node_color_data/node_color_data.gml index 78ce959bf..332380ce4 100644 --- a/scripts/node_color_data/node_color_data.gml +++ b/scripts/node_color_data/node_color_data.gml @@ -3,21 +3,21 @@ function Node_Color_Data(_x, _y, _group = noone) : Node_Processor(_x, _y, _group batch_output = false; setDimension(96, 48); - inputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white) + inputs[| 0] = nodeValue_Color("Color", self, c_white) .setVisible(true, true); - inputs[| 1] = nodeValue("Normalize", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Normalize", self, true); - outputs[| 0] = nodeValue("Red", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); - outputs[| 1] = nodeValue("Green", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); - outputs[| 2] = nodeValue("Blue", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Red", self, VALUE_TYPE.float, 0); + outputs[| 1] = nodeValue_Output("Green", self, VALUE_TYPE.float, 0); + outputs[| 2] = nodeValue_Output("Blue", self, VALUE_TYPE.float, 0); - outputs[| 3] = nodeValue("Hue", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0).setVisible(false); - outputs[| 4] = nodeValue("Saturation", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0).setVisible(false); - outputs[| 5] = nodeValue("Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0).setVisible(false); + outputs[| 3] = nodeValue_Output("Hue", self, VALUE_TYPE.float, 0).setVisible(false); + outputs[| 4] = nodeValue_Output("Saturation", self, VALUE_TYPE.float, 0).setVisible(false); + outputs[| 5] = nodeValue_Output("Value", self, VALUE_TYPE.float, 0).setVisible(false); - outputs[| 6] = nodeValue("Brightness", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0).setVisible(false); - outputs[| 7] = nodeValue("Alpha", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0).setVisible(false); + outputs[| 6] = nodeValue_Output("Brightness", self, VALUE_TYPE.float, 0).setVisible(false); + outputs[| 7] = nodeValue_Output("Alpha", self, VALUE_TYPE.float, 0).setVisible(false); static processData = function(_output, _data, _output_index, _array_index = 0) { var _c = _data[0]; diff --git a/scripts/node_color_hsv/node_color_hsv.gml b/scripts/node_color_hsv/node_color_hsv.gml index dfccf5e03..1cc061b2f 100644 --- a/scripts/node_color_hsv/node_color_hsv.gml +++ b/scripts/node_color_hsv/node_color_hsv.gml @@ -2,24 +2,24 @@ function Node_Color_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) name = "HSV Color"; setDimension(96, 48); - inputs[| 0] = nodeValue("Hue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 0] = nodeValue_Float("Hue", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setVisible(true, true); - inputs[| 1] = nodeValue("Saturation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 1] = nodeValue_Float("Saturation", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setVisible(true, true); - inputs[| 2] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Value", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setVisible(true, true); - inputs[| 3] = nodeValue("Normalized", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 1); + inputs[| 3] = nodeValue_Bool("Normalized", self, 1); - inputs[| 4] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Alpha", self, 1) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, c_white); + outputs[| 0] = nodeValue_Output("Color", self, VALUE_TYPE.color, c_white); input_display_list = [ 3, 0, 1, 2, 4 ]; diff --git a/scripts/node_color_mix/node_color_mix.gml b/scripts/node_color_mix/node_color_mix.gml index e59801cc8..5a2fa26be 100644 --- a/scripts/node_color_mix/node_color_mix.gml +++ b/scripts/node_color_mix/node_color_mix.gml @@ -2,16 +2,16 @@ function Node_Color_Mix(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) name = "Mix Color"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Color from", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 0] = nodeValue_Color("Color from", self, c_white); - inputs[| 1] = nodeValue("Color to", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 1] = nodeValue_Color("Color to", self, c_white); - inputs[| 2] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Mix", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); inputs[| 3] = nodeValue_Enum_Button("Color space", self, 0, [ "RGB", "HSV", "OKLAB" ]); - outputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, c_white); + outputs[| 0] = nodeValue_Output("Color", self, VALUE_TYPE.color, c_white); input_display_list = [ 3, 0, 1, 2 ]; diff --git a/scripts/node_color_remove/node_color_remove.gml b/scripts/node_color_remove/node_color_remove.gml index 1ca0cef0b..b1e25146b 100644 --- a/scripts/node_color_remove/node_color_remove.gml +++ b/scripts/node_color_remove/node_color_remove.gml @@ -3,25 +3,23 @@ function Node_Color_Remove(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 1] = nodeValue_Palette("Colors", self, array_clone(DEF_PALETTE)); - inputs[| 2] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 2] = nodeValue_Float("Threshold", self, 0.1) .setDisplay(VALUE_DISPLAY.slider) .setMappable(10); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Keep the selected colors and remove the rest."); + inputs[| 6] = nodeValue_Bool("Invert", self, false, "Keep the selected colors and remove the rest."); - inputs[| 7] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 7] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 8, 9, @@ -36,7 +34,7 @@ function Node_Color_Remove(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro ["Remove", false], 1, 2, 10, 6, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_color_replace/node_color_replace.gml b/scripts/node_color_replace/node_color_replace.gml index f75fb81bd..d63850825 100644 --- a/scripts/node_color_replace/node_color_replace.gml +++ b/scripts/node_color_replace/node_color_replace.gml @@ -2,31 +2,28 @@ function Node_Color_replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr name = "Replace Palette"; inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Palette from", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE), "Color to be replaced.") - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 1] = nodeValue_Palette("Palette from", self, array_clone(DEF_PALETTE), "Color to be replaced."); - inputs[| 2] = nodeValue("Palette to", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE), "Palette to be replaced to.") - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 2] = nodeValue_Palette("Palette to", self, array_clone(DEF_PALETTE), "Palette to be replaced to."); - inputs[| 3] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 3] = nodeValue_Float("Threshold", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Set others to black", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Set pixel that doesn't match any color in 'palette from' to black."); + inputs[| 4] = nodeValue_Bool("Set others to black", self, false, "Set pixel that doesn't match any color in 'palette from' to black."); - inputs[| 5] = nodeValue("Multiply alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Multiply alpha", self, true); - inputs[| 6] = nodeValue("Hard replace", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Completely override pixel with new color instead of blending between it."); + inputs[| 6] = nodeValue_Bool("Hard replace", self, true, "Completely override pixel with new color instead of blending between it."); inputs[| 7] = nodeValue_Surface("Mask", self); - inputs[| 8] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 8] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 9] = nodeValue_Bool("Active", self, true); active_index = 9; - inputs[| 10] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 10] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(7); // inputs 11, 12 @@ -41,7 +38,7 @@ function Node_Color_replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr ["Render", false], 4, 6 ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_color_rgb/node_color_rgb.gml b/scripts/node_color_rgb/node_color_rgb.gml index a0cc897bd..f8026df8e 100644 --- a/scripts/node_color_rgb/node_color_rgb.gml +++ b/scripts/node_color_rgb/node_color_rgb.gml @@ -3,24 +3,24 @@ function Node_Color_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) setDimension(96, 48); - inputs[| 0] = nodeValue("Red", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 0] = nodeValue_Float("Red", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setVisible(true, true); - inputs[| 1] = nodeValue("Green", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 1] = nodeValue_Float("Green", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setVisible(true, true); - inputs[| 2] = nodeValue("Blue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Blue", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setVisible(true, true); - inputs[| 3] = nodeValue("Normalized", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 1); + inputs[| 3] = nodeValue_Bool("Normalized", self, 1); - inputs[| 4] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Alpha", self, 1) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, c_white); + outputs[| 0] = nodeValue_Output("Color", self, VALUE_TYPE.color, c_white); input_display_list = [ 3, 0, 1, 2, 4 ]; diff --git a/scripts/node_colorize/node_colorize.gml b/scripts/node_colorize/node_colorize.gml index 13537857f..a6d6b9a3f 100644 --- a/scripts/node_colorize/node_colorize.gml +++ b/scripts/node_colorize/node_colorize.gml @@ -3,25 +3,24 @@ function Node_Colorize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject([ cola(c_black), cola(c_white) ]) ) + inputs[| 1] = nodeValue_Gradient("Gradient", self, new gradientObject([ cola(c_black), cola(c_white) ])) .setMappable(11); - inputs[| 2] = nodeValue("Gradient shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Gradient shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, .01 ] }) .setMappable(10); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Multiply alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Multiply alpha", self, true); - inputs[| 7] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 7] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 8, 9, @@ -40,7 +39,7 @@ function Node_Colorize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Colorize", false], 1, 11, 2, 10, 6, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_colors_replace/node_colors_replace.gml b/scripts/node_colors_replace/node_colors_replace.gml index 816bb70a3..00b312527 100644 --- a/scripts/node_colors_replace/node_colors_replace.gml +++ b/scripts/node_colors_replace/node_colors_replace.gml @@ -2,22 +2,20 @@ function Node_Colors_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _g name = "Replace Colors"; inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Palette from", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, []) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 1] = nodeValue_Palette("Palette from", self, []); - inputs[| 2] = nodeValue("Palette to", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, []) - .setDisplay(VALUE_DISPLAY.palette) + inputs[| 2] = nodeValue_Palette("Palette to", self, []) .setVisible(false, false); - inputs[| 3] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 3] = nodeValue_Float("Threshold", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); inputs[| 4] = nodeValue_Surface("Mask", self); - inputs[| 5] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 5] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Active", self, true); active_index = 6; __init_mask_modifier(4); // inputs 7, 8, @@ -187,7 +185,7 @@ function Node_Colors_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _g //["Comparison", false], 3, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_combine_hsv/node_combine_hsv.gml b/scripts/node_combine_hsv/node_combine_hsv.gml index c272c0feb..f36424f5b 100644 --- a/scripts/node_combine_hsv/node_combine_hsv.gml +++ b/scripts/node_combine_hsv/node_combine_hsv.gml @@ -6,12 +6,12 @@ function Node_Combine_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 2] = nodeValue_Surface("Value", self); inputs[| 3] = nodeValue_Surface("Alpha", self); - inputs[| 4] = nodeValue("Array Input", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 4] = nodeValue_Bool("Array Input", self, false); inputs[| 5] = nodeValue_Surface("HSV Array", self, []) .setArrayDepth(1); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surfaces", true], 4, 0, 1, 2, 3, 5, diff --git a/scripts/node_combine_rgb/node_combine_rgb.gml b/scripts/node_combine_rgb/node_combine_rgb.gml index 3356e1a5d..4cf5e34d3 100644 --- a/scripts/node_combine_rgb/node_combine_rgb.gml +++ b/scripts/node_combine_rgb/node_combine_rgb.gml @@ -9,7 +9,7 @@ function Node_Combine_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 4] = nodeValue_Enum_Scroll("Sampling type", self, 0, ["Channel value", "Greyscale"]); - inputs[| 5] = nodeValue("Base value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0, "Set value to the unconnected color channels.") + inputs[| 5] = nodeValue_Float("Base value", self, 0, "Set value to the unconnected color channels.") .setDisplay(VALUE_DISPLAY.slider) .setMappable(6); @@ -19,12 +19,12 @@ function Node_Combine_RGB(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 7] = nodeValue("Array Input", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 7] = nodeValue_Bool("Array Input", self, false); inputs[| 8] = nodeValue_Surface("RGBA Array", self, []) .setArrayDepth(1); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Sampling", false], 4, 5, 6, diff --git a/scripts/node_compare/node_compare.gml b/scripts/node_compare/node_compare.gml index f67b3946d..f4d15e8bd 100644 --- a/scripts/node_compare/node_compare.gml +++ b/scripts/node_compare/node_compare.gml @@ -40,13 +40,13 @@ function Node_Compare(_x, _y, _group = noone) : Node(_x, _y, _group) constructor new scrollItem("Lesser", s_node_condition_type, 2), new scrollItem("Lesser or equal", s_node_condition_type, 3), ]); - inputs[| 1] = nodeValue("a", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("a", self, 0) .setVisible(true, true); - inputs[| 2] = nodeValue("b", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("b", self, 0) .setVisible(true, true); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.boolean, false); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.boolean, false); static _compare = function(mode, a, b) { switch(mode) { diff --git a/scripts/node_composite/node_composite.gml b/scripts/node_composite/node_composite.gml index f3bf7efc3..024694186 100644 --- a/scripts/node_composite/node_composite.gml +++ b/scripts/node_composite/node_composite.gml @@ -13,8 +13,7 @@ enum COMPOSE_OUTPUT_SCALING { function Node_Composite(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Composite"; - inputs[| 0] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 0] = nodeValue_Padding("Padding", self, [ 0, 0, 0, 0 ]); inputs[| 1] = nodeValue_Enum_Scroll("Output dimension", self, COMPOSE_OUTPUT_SCALING.first, [ "First surface", "Largest surface", "Constant" ]); @@ -413,21 +412,19 @@ function Node_Composite(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) var index = ds_list_size(inputs); var _s = floor((index - input_fix_len) / data_length); - inputs[| index + 0] = nodeValue($"Surface {_s}", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, noone); + inputs[| index + 0] = nodeValue_Surface($"Surface {_s}", self, noone); inputs[| index + 0].hover_effect = 0; - inputs[| index + 1] = nodeValue($"Position {_s}", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| index + 1] = nodeValue_Vector($"Position {_s}", self, [ 0, 0 ] ) .setUnitRef(function(index) { return [ overlay_w, overlay_h ]; }); inputs[| index + 2] = nodeValue_Rotation($"Rotation {_s}", self, 0); - inputs[| index + 3] = nodeValue($"Scale {_s}", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| index + 3] = nodeValue_Vector($"Scale {_s}", self, [ 1, 1 ] ); inputs[| index + 4] = nodeValue_Enum_Scroll($"Blend {_s}", self, 0, BLEND_TYPES ); - inputs[| index + 5] = nodeValue($"Opacity {_s}", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| index + 5] = nodeValue_Float($"Opacity {_s}", self, 1) .setDisplay(VALUE_DISPLAY.slider); for( var i = 0; i < data_length; i++ ) { @@ -446,11 +443,11 @@ function Node_Composite(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) setDynamicInput(6, true, VALUE_TYPE.surface); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas data", self, JUNCTION_CONNECT.output, VALUE_TYPE.atlas, []); + outputs[| 1] = nodeValue_Output("Atlas data", self, VALUE_TYPE.atlas, []); - outputs[| 2] = nodeValue_Dimension(self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, [1, 1]) + outputs[| 2] = nodeValue_Output_Dimension(self, VALUE_TYPE.integer, [1, 1]) .setVisible(false) .setDisplay(VALUE_DISPLAY.vector); diff --git a/scripts/node_condition/node_condition.gml b/scripts/node_condition/node_condition.gml index 36eb510e2..e79f72e88 100644 --- a/scripts/node_condition/node_condition.gml +++ b/scripts/node_condition/node_condition.gml @@ -3,7 +3,7 @@ function Node_Condition(_x, _y, _group = noone) : Node(_x, _y, _group) construct setDimension(96, 48); - inputs[| 0] = nodeValue("Check value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 0] = nodeValue_Float("Check value", self, 0 ) .setVisible(true, true); inputs[| 1] = nodeValue_Enum_Scroll("Condition", self, 0 , [ new scrollItem("Equal", s_node_condition_type, 0), @@ -14,7 +14,7 @@ function Node_Condition(_x, _y, _group = noone) : Node(_x, _y, _group) construct new scrollItem("Greater or equal", s_node_condition_type, 5), ]) .rejectArray(); - inputs[| 2] = nodeValue("Compare to", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 2] = nodeValue_Float("Compare to", self, 0 ) .rejectArray(); inputs[| 3] = nodeValue("True", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, -1 ) @@ -26,21 +26,21 @@ function Node_Condition(_x, _y, _group = noone) : Node(_x, _y, _group) construct inputs[| 5] = nodeValue_Enum_Scroll("Eval mode", self, 0 , ["Boolean", "Number compare", "Text compare" ]) .rejectArray(); - inputs[| 6] = nodeValue("Boolean", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 6] = nodeValue_Bool("Boolean", self, false ) .setVisible(true, true) .rejectArray(); - inputs[| 7] = nodeValue("Text 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ); + inputs[| 7] = nodeValue_Text("Text 1", self, "" ); - inputs[| 8] = nodeValue("Text 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ); + inputs[| 8] = nodeValue_Text("Text 2", self, "" ); input_display_list = [ 5, ["Condition", false], 0, 1, 2, 6, 7, 8, ["Result", true], 3, 4 ] - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, []); - outputs[| 1] = nodeValue("Bool", self, JUNCTION_CONNECT.output, VALUE_TYPE.boolean, false); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.any, []); + outputs[| 1] = nodeValue_Output("Bool", self, VALUE_TYPE.boolean, false); static step = function() { #region var _mode = getInputData(5); diff --git a/scripts/node_convolution/node_convolution.gml b/scripts/node_convolution/node_convolution.gml index 46e70e036..804d4e388 100644 --- a/scripts/node_convolution/node_convolution.gml +++ b/scripts/node_convolution/node_convolution.gml @@ -3,7 +3,7 @@ function Node_Convolution(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Kernel", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, array_create(9)) + inputs[| 1] = nodeValue_Float("Kernel", self, array_create(9)) .setDisplay(VALUE_DISPLAY.matrix, { size: 3 }); inputs[| 2] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -11,18 +11,17 @@ function Node_Convolution(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8, - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 5, 6, ["Surfaces", true], 0, 3, 4, 7, 8, diff --git a/scripts/node_corner/node_corner.gml b/scripts/node_corner/node_corner.gml index 4d43d4a2e..7ca09368e 100644 --- a/scripts/node_corner/node_corner.gml +++ b/scripts/node_corner/node_corner.gml @@ -3,19 +3,18 @@ function Node_Corner(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2) + inputs[| 1] = nodeValue_Float("Radius", self, 2) .setDisplay(VALUE_DISPLAY.slider, { range: [2, 16, 0.1] }); inputs[| 2] = nodeValue_Surface("Mask", self); - inputs[| 3] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Active", self, true); active_index = 4; - inputs[| 5] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 5] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(2); // inputs 6, 7 @@ -24,7 +23,7 @@ function Node_Corner(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co ["Corner", false], 1, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_counter/node_counter.gml b/scripts/node_counter/node_counter.gml index 16d2a3ea6..82f9752c8 100644 --- a/scripts/node_counter/node_counter.gml +++ b/scripts/node_counter/node_counter.gml @@ -4,17 +4,17 @@ function Node_Counter(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c setDimension(96, 48); - inputs[| 0] = nodeValue("Start", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 0] = nodeValue_Float("Start", self, 1); - inputs[| 1] = nodeValue("Speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 1] = nodeValue_Float("Speed", self, 1); - inputs[| 2] = nodeValue("Mode", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0, @"Counting mode + inputs[| 2] = nodeValue_Int("Mode", self, 0, @"Counting mode - Frame count: Count value up/down per frame. - Animation progress: Count from 0 (first frame) to 1 (last frame). ") .setDisplay(VALUE_DISPLAY.enum_scroll, ["Frame count", "Animation progress"]) .rejectArray(); - outputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Value", self, VALUE_TYPE.float, 0); input_display_list = [ 2, 0, 1 diff --git a/scripts/node_crop/node_crop.gml b/scripts/node_crop/node_crop.gml index 6c41be448..e9db2099d 100644 --- a/scripts/node_crop/node_crop.gml +++ b/scripts/node_crop/node_crop.gml @@ -4,27 +4,24 @@ function Node_Crop(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Crop", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 1] = nodeValue_Padding("Crop", self, [ 0, 0, 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Active", self, true); active_index = 2; inputs[| 3] = nodeValue_Enum_Scroll("Aspect Ratio", self, 0, [ "None", "Manual", "1:1", "3:2", "4:3", "16:9" ]); - inputs[| 4] = nodeValue("Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Ratio", self, [ 1, 1 ]); - inputs[| 5] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ .5, .5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 5] = nodeValue_Vector("Center", self, [ .5, .5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - inputs[| 6] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 8 ); + inputs[| 6] = nodeValue_Float("Width", self, 8 ); inputs[| 7] = nodeValue_Enum_Scroll("Fit Mode", self, 0, [ "Manual", "Width", "Height", "Minimum" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 2, ["Surface", true], 0, diff --git a/scripts/node_crop_content/node_crop_content.gml b/scripts/node_crop_content/node_crop_content.gml index 6d0a7bbf9..e139e2c18 100644 --- a/scripts/node_crop_content/node_crop_content.gml +++ b/scripts/node_crop_content/node_crop_content.gml @@ -3,15 +3,14 @@ function Node_Crop_Content(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); inputs[| 2] = nodeValue_Enum_Scroll("Array Sizing", self, 1, [ "Largest, same size", "Independent" ]) .setTooltip("Cropping mode for dealing with image array."); - inputs[| 3] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0 ], "Add padding back after crop.") - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 3] = nodeValue_Padding("Padding", self, [ 0, 0, 0, 0 ], "Add padding back after crop."); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", false], 0, 2, diff --git a/scripts/node_cross_section/node_cross_section.gml b/scripts/node_cross_section/node_cross_section.gml index 28de21bc3..6eb3b188e 100644 --- a/scripts/node_cross_section/node_cross_section.gml +++ b/scripts/node_cross_section/node_cross_section.gml @@ -5,14 +5,14 @@ function Node_Cross_Section(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 1] = nodeValue_Enum_Button("Axis", self, 0 , [ "X", "Y" ]); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 2] = nodeValue_Float("Position", self, 0 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Anti Aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 3] = nodeValue_Bool("Anti Aliasing", self, false ); inputs[| 4] = nodeValue_Enum_Button("Mode", self, 0 , [ "BW", "Colored" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone ); input_display_list = [ ["Surfaces", false], 0, diff --git a/scripts/node_csv_file_read/node_csv_file_read.gml b/scripts/node_csv_file_read/node_csv_file_read.gml index b97796b08..53d8c1f26 100644 --- a/scripts/node_csv_file_read/node_csv_file_read.gml +++ b/scripts/node_csv_file_read/node_csv_file_read.gml @@ -29,16 +29,16 @@ function Node_CSV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "CSV file|*.csv" }) .rejectArray(); - inputs[| 1] = nodeValue("Convert to number", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 1] = nodeValue_Bool("Convert to number", self, false) .rejectArray(); - outputs[| 0] = nodeValue("Content", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Content", self, VALUE_TYPE.text, ""); - outputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, "") + outputs[| 1] = nodeValue_Output("Path", self, VALUE_TYPE.path, "") .setVisible(true, true); content = ""; diff --git a/scripts/node_csv_file_write/node_csv_file_write.gml b/scripts/node_csv_file_write/node_csv_file_write.gml index cab54e105..079805b97 100644 --- a/scripts/node_csv_file_write/node_csv_file_write.gml +++ b/scripts/node_csv_file_write/node_csv_file_write.gml @@ -14,7 +14,7 @@ function Node_CSV_File_Write(_x, _y, _group = noone) : Node(_x, _y, _group) cons w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_save, { filter: "csv file|*.csv" }) .rejectArray(); diff --git a/scripts/node_curve/node_curve.gml b/scripts/node_curve/node_curve.gml index 8679e9e01..87d6dc39d 100644 --- a/scripts/node_curve/node_curve.gml +++ b/scripts/node_curve/node_curve.gml @@ -13,20 +13,19 @@ function Node_Curve(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; - inputs[| 8] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 8] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(5); // inputs 9, 10 inputs[| 11] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_01); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 7, 8, ["Surfaces", true], 0, 5, 6, 9, 10, diff --git a/scripts/node_curve_hsv/node_curve_hsv.gml b/scripts/node_curve_hsv/node_curve_hsv.gml index 2f17a37bc..352f82071 100644 --- a/scripts/node_curve_hsv/node_curve_hsv.gml +++ b/scripts/node_curve_hsv/node_curve_hsv.gml @@ -11,18 +11,17 @@ function Node_Curve_HSV(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 4] = nodeValue_Surface("Mask", self); - inputs[| 5] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 5] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Active", self, true); active_index = 6; - inputs[| 7] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 7] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(4); // inputs 8, 9, - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 6, 7, ["Surfaces", true], 0, 4, 5, 8, 9, diff --git a/scripts/node_data/node_data.gml b/scripts/node_data/node_data.gml index e30aaaf7e..b9365230b 100644 --- a/scripts/node_data/node_data.gml +++ b/scripts/node_data/node_data.gml @@ -156,7 +156,7 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor { inspectInput2.index = -1; updatedInTrigger = nodeValue("Update", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false).setVisible(true, true); - updatedOutTrigger = nodeValue("Updated", self, JUNCTION_CONNECT.output, VALUE_TYPE.trigger, false).setVisible(true, true); + updatedOutTrigger = nodeValue_Output("Updated", self, VALUE_TYPE.trigger, false).setVisible(true, true); updatedInTrigger.index = -1; updatedOutTrigger.index = -1; diff --git a/scripts/node_de_corner/node_de_corner.gml b/scripts/node_de_corner/node_de_corner.gml index 6176fe0cf..f92134273 100644 --- a/scripts/node_de_corner/node_de_corner.gml +++ b/scripts/node_de_corner/node_de_corner.gml @@ -3,27 +3,26 @@ function Node_De_Corner(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; - inputs[| 2] = nodeValue("Tolerance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Tolerance", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2) + inputs[| 3] = nodeValue_Int("Iteration", self, 2) inputs[| 4] = nodeValue_Enum_Button("Type", self, 0, [ "Double", "Diagonal" ]); inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); __init_mask_modifier(5); // inputs 7, 8, - inputs[| 9] = nodeValue("Include", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b11) - .setDisplay(VALUE_DISPLAY.toggle, { data: [ "Inner", "Side" ] }); + inputs[| 9] = nodeValue_Toggle("Include", self, 0b11, { data: [ "Inner", "Side" ] }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", true], 0, 5, 6, 7, 8, diff --git a/scripts/node_de_stray/node_de_stray.gml b/scripts/node_de_stray/node_de_stray.gml index 55ed974f9..5c623c54b 100644 --- a/scripts/node_de_stray/node_de_stray.gml +++ b/scripts/node_de_stray/node_de_stray.gml @@ -3,26 +3,26 @@ function Node_De_Stray(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Tolerance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("Tolerance", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 2] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Active", self, true); active_index = 2; - inputs[| 3] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2) + inputs[| 3] = nodeValue_Int("Iteration", self, 2) inputs[| 4] = nodeValue_Enum_Button("Strictness", self, 0, [ "Low", "High", "Stray-only" ]); inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); __init_mask_modifier(5); // inputs 7, 8, - inputs[| 9] = nodeValue("Fill Empty", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 9] = nodeValue_Bool("Fill Empty", self, false); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 2, ["Surfaces", true], 0, 5, 6, 7, 8, diff --git a/scripts/node_delay/node_delay.gml b/scripts/node_delay/node_delay.gml index c7249dfca..ff615eff8 100644 --- a/scripts/node_delay/node_delay.gml +++ b/scripts/node_delay/node_delay.gml @@ -5,9 +5,9 @@ function Node_Delay(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Surface("Surface", self); - inputs[| 1] = nodeValue("Frames", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 1] = nodeValue_Int("Frames", self, 1); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Delay", false], 1, diff --git a/scripts/node_diffuse/node_diffuse.gml b/scripts/node_diffuse/node_diffuse.gml index 300c97a8b..f3183248f 100644 --- a/scripts/node_diffuse/node_diffuse.gml +++ b/scripts/node_diffuse/node_diffuse.gml @@ -3,34 +3,33 @@ function Node_Diffuse(_x, _y, _group = noone) : Node(_x, _y, _group) constructor inputs[| 0] = nodeValue_Surface("Density field", self); - inputs[| 1] = nodeValue("Dissipation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.05) + inputs[| 1] = nodeValue_Float("Dissipation", self, 0.05) .setDisplay(VALUE_DISPLAY.slider, { range: [ -0.2, 0.2, 0.001] }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = nodeValue_Float("Scale", self, 1); - inputs[| 3] = nodeValue("Randomness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 3] = nodeValue_Float("Randomness", self, 1); - inputs[| 4] = nodeValue("Flow rate", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 4] = nodeValue_Float("Flow rate", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 1, 0.01] }); - inputs[| 5] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.7 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 5] = nodeValue_Slider_Range("Threshold", self, [ 0.5, 0.7 ]); - inputs[| 6] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 6] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 6].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 7] = nodeValue_Surface("External", self); - inputs[| 8] = nodeValue("External Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 8] = nodeValue_Float("External Strength", self, 0.1) .setDisplay(VALUE_DISPLAY.slider, { range: [ -0.25, 0.25, 0.01] }); - inputs[| 9] = nodeValue("Detail", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 9] = nodeValue_Int("Detail", self, 1) inputs[| 10] = nodeValue_Enum_Scroll("External Type", self, 0, [ "Point", "Vector" ]); inputs[| 11] = nodeValue_Rotation("External Direction", self, 0); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, 6, ["Diffuse", false], 1, diff --git a/scripts/node_dilate/node_dilate.gml b/scripts/node_dilate/node_dilate.gml index e029dc6f2..915b53131 100644 --- a/scripts/node_dilate/node_dilate.gml +++ b/scripts/node_dilate/node_dilate.gml @@ -3,15 +3,14 @@ function Node_Dilate(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Center", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Strength", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [-3, 3, 0.01] }) .setMappable(11); - inputs[| 3] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 16) + inputs[| 3] = nodeValue_Float("Radius", self, 16) .setMappable(12); inputs[| 4] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -19,14 +18,13 @@ function Node_Dilate(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; - inputs[| 8] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 8] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(5); // inputs 9, 10 @@ -40,7 +38,7 @@ function Node_Dilate(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co ////////////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 7, 8, ["Surfaces", true], 0, 5, 6, 9, 10, diff --git a/scripts/node_directory_search/node_directory_search.gml b/scripts/node_directory_search/node_directory_search.gml index 7f2c8f07b..15ffd0e97 100644 --- a/scripts/node_directory_search/node_directory_search.gml +++ b/scripts/node_directory_search/node_directory_search.gml @@ -26,19 +26,19 @@ function Node_Directory_Search(_x, _y, _group = noone) : Node(_x, _y, _group) co name = "Directory Search"; color = COLORS.node_blend_input; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "dir" }); - inputs[| 1] = nodeValue("Extensions", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ".png"); + inputs[| 1] = nodeValue_Text("Extensions", self, ".png"); inputs[| 2] = nodeValue_Enum_Scroll("Type", self, 0, [ "Surface", "Text" ]); - inputs[| 3] = nodeValue("Recursive", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 3] = nodeValue_Bool("Recursive", self, false) - outputs[| 0] = nodeValue("Outputs", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []) + outputs[| 0] = nodeValue_Output("Outputs", self, VALUE_TYPE.surface, []) .setVisible(true, true); - outputs[| 1] = nodeValue("Paths", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, [""]) + outputs[| 1] = nodeValue_Output("Paths", self, VALUE_TYPE.path, [""]) .setVisible(true, true); attribute_surface_depth(); diff --git a/scripts/node_displace/node_displace.gml b/scripts/node_displace/node_displace.gml index ac0c58991..9271d657a 100644 --- a/scripts/node_displace/node_displace.gml +++ b/scripts/node_displace/node_displace.gml @@ -5,14 +5,14 @@ function Node_Displace(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 1] = nodeValue_Surface("Displace map", self); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 0 ], "Vector to displace pixel by." ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Position", self, [ 1, 0 ] ) + .setTooltip("Vector to displace pixel by.") .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 3] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Strength", self, 1) .setMappable(15); - inputs[| 4] = nodeValue("Mid value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0., "Brightness value to be use as a basis for 'no displacement'.") + inputs[| 4] = nodeValue_Float("Mid value", self, 0., "Brightness value to be use as a basis for 'no displacement'.") .setDisplay(VALUE_DISPLAY.slider); inputs[| 5] = nodeValue_Enum_Button("Mode", self, 0, [ "Linear", "Vector", "Angle", "Gradient" ]) @@ -22,7 +22,7 @@ function Node_Displace(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) - Angle: Use red as angle, green as distance. - Gradient: Displace down the brightness value defined by the Displace map."); - inputs[| 6] = nodeValue("Iterate", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, @"If not set, then strength value is multiplied directly to the displacement. + inputs[| 6] = nodeValue_Bool("Iterate", self, false, @"If not set, then strength value is multiplied directly to the displacement. If set, then strength value control how many times the effect applies on itself."); inputs[| 7] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -30,16 +30,15 @@ If set, then strength value control how many times the effect applies on itself. inputs[| 8] = nodeValue_Surface("Mask", self); - inputs[| 9] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 9] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 10] = nodeValue_Bool("Active", self, true); active_index = 10; inputs[| 11] = nodeValue_Enum_Scroll("Blend mode", self, 0, [ "Overwrite", "Min", "Max" ]); - inputs[| 12] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 12] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(8); // inputs 13, 14 @@ -50,7 +49,7 @@ If set, then strength value control how many times the effect applies on itself. //////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 16] = nodeValue("Separate axis", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 16] = nodeValue_Bool("Separate axis", self, false); inputs[| 17] = nodeValue_Surface("Displace map 2", self); @@ -61,7 +60,7 @@ If set, then strength value control how many times the effect applies on itself. ["Algorithm", true], 6, 11, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_display_image/node_display_image.gml b/scripts/node_display_image/node_display_image.gml index f8dd1b203..deb976f7b 100644 --- a/scripts/node_display_image/node_display_image.gml +++ b/scripts/node_display_image/node_display_image.gml @@ -26,20 +26,18 @@ function Node_Display_Image(_x, _y, _group = noone) : Node(_x, _y, _group) const name = "Display Image"; auto_height = false; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setVisible(false) .setDisplay(VALUE_DISPLAY.path_load, { filter: "image|*.png;*.jpg" }) .rejectArray(); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ x, y ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ x, y ]) .rejectArray(); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 1, 1 ]) .rejectArray(); - inputs[| 3] = nodeValue("Smooth transform", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 3] = nodeValue_Bool("Smooth transform", self, true) .rejectArray(); input_display_list = [ 0, diff --git a/scripts/node_display_text/node_display_text.gml b/scripts/node_display_text/node_display_text.gml index 31faabe1a..a08c4faf8 100644 --- a/scripts/node_display_text/node_display_text.gml +++ b/scripts/node_display_text/node_display_text.gml @@ -17,26 +17,25 @@ function Node_Display_Text(_x, _y, _group = noone) : Node(_x, _y, _group) constr ta_editor = new textArea(TEXTBOX_INPUT.text, function(val) { inputs[| 1].setValue(val); }) - inputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ) + inputs[| 0] = nodeValue_Color("Color", self, c_white ) .rejectArray(); - inputs[| 1] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "Text"); + inputs[| 1] = nodeValue_Text("Text", self, "Text"); inputs[| 2] = nodeValue_Enum_Scroll("Style", self, 2, [ "Header", "Sub header", "Normal" ]) .rejectArray(); - inputs[| 3] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.75) + inputs[| 3] = nodeValue_Float("Alpha", self, 0.75) .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); - inputs[| 4] = nodeValue("Line width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, -1) + inputs[| 4] = nodeValue_Float("Line width", self, -1) .rejectArray(); - inputs[| 5] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ x, y ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 5] = nodeValue_Vector("Position", self, [ x, y ]) .rejectArray(); - inputs[| 6] = nodeValue("Line height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 6] = nodeValue_Float("Line height", self, 0) .rejectArray(); input_display_list = [1, diff --git a/scripts/node_dither/node_dither.gml b/scripts/node_dither/node_dither.gml index 0f1b200af..e172f1cfb 100644 --- a/scripts/node_dither/node_dither.gml +++ b/scripts/node_dither/node_dither.gml @@ -18,15 +18,14 @@ function Node_Dither(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 1] = nodeValue_Palette("Palette", self, array_clone(DEF_PALETTE)); inputs[| 2] = nodeValue_Enum_Scroll("Pattern", self, 0, [ "2 x 2 Bayer", "4 x 4 Bayer", "8 x 8 Bayer", "White Noise", "Custom" ]); inputs[| 3] = nodeValue_Surface("Dither map", self) .setVisible(false); - inputs[| 4] = nodeValue("Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Contrast", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 5, 0.1] }); inputs[| 5] = nodeValue_Surface("Contrast map", self); @@ -35,26 +34,25 @@ function Node_Dither(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 7] = nodeValue_Surface("Mask", self); - inputs[| 8] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 8] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 9] = nodeValue_Bool("Active", self, true); active_index = 9; - inputs[| 10] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 10] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(7); // inputs 11, 12, - inputs[| 13] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 13] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 13].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 14] = nodeValue("Use palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 14] = nodeValue_Bool("Use palette", self, true); - inputs[| 15] = nodeValue("Steps", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 15] = nodeValue_Int("Steps", self, 4) .setDisplay(VALUE_DISPLAY.slider, { range: [2, 16, 0.1] }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 9, 10, 13, ["Surfaces", true], 0, 7, 8, 11, 12, diff --git a/scripts/node_dll/node_dll.gml b/scripts/node_dll/node_dll.gml index 1658efd6d..1f91ec226 100644 --- a/scripts/node_dll/node_dll.gml +++ b/scripts/node_dll/node_dll.gml @@ -2,15 +2,15 @@ function Node_DLL(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "DLL"; setDimension(96, 32 + 24 * 1); - inputs[| 0] = nodeValue("DLL File", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("DLL File", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "Dynamic-link library (.dll)|*.dll" }) .setVisible(true, false); - inputs[| 1] = nodeValue("Function name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Function name", self, ""); inputs[| 2] = nodeValue_Enum_Button("Return type", self, 0, [ "Number", "Buffer" ]); - outputs[| 0] = nodeValue("Return Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Return Value", self, VALUE_TYPE.float, 0); ext_cache = ""; ext_function = -1; @@ -47,7 +47,7 @@ function Node_DLL(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { inputs[| index + 0] = nodeValue_Enum_Button("Parameter type", self, 0, [ "Number", "Buffer" ]); - inputs[| index + 1] = nodeValue("Parameter value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| index + 1] = nodeValue_Float("Parameter value", self, 0 ) .setVisible(true, true); array_push(input_display_list, index + 0, index + 1); diff --git a/scripts/node_dust/node_dust.gml b/scripts/node_dust/node_dust.gml index 553c3e3cf..091bbb957 100644 --- a/scripts/node_dust/node_dust.gml +++ b/scripts/node_dust/node_dust.gml @@ -81,7 +81,7 @@ function Node_Dust(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { inputs[| 0] = nodeValue_Dimension(self); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", false], 0, diff --git a/scripts/node_dynasurf/node_dynasurf.gml b/scripts/node_dynasurf/node_dynasurf.gml index 38f35ef0f..ae50190ef 100644 --- a/scripts/node_dynasurf/node_dynasurf.gml +++ b/scripts/node_dynasurf/node_dynasurf.gml @@ -5,7 +5,7 @@ function Node_DynaSurf(_x, _y, _group = noone) : Node_Collection(_x, _y, _group) reset_all_child = true; draw_input_overlay = false; - outputs[| 0] = nodeValue("dynaSurf", self, JUNCTION_CONNECT.output, VALUE_TYPE.dynaSurface, noone); + outputs[| 0] = nodeValue_Output("dynaSurf", self, VALUE_TYPE.dynaSurface, noone); custom_input_index = ds_list_size(inputs); custom_output_index = ds_list_size(outputs); diff --git a/scripts/node_dynasurf_in/node_dynasurf_in.gml b/scripts/node_dynasurf_in/node_dynasurf_in.gml index 576c5942d..4bfeeb1cf 100644 --- a/scripts/node_dynasurf_in/node_dynasurf_in.gml +++ b/scripts/node_dynasurf_in/node_dynasurf_in.gml @@ -8,7 +8,7 @@ function Node_DynaSurf_In(_x, _y, _group = noone) : Node(_x, _y, _group) constru inParent = undefined; - outputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone); + outputs[| 0] = nodeValue_Output("Value", self, VALUE_TYPE.PCXnode, noone); static createInput = function() { #region if(group == noone || !is_struct(group)) return noone; diff --git a/scripts/node_dynasurf_out/node_dynasurf_out.gml b/scripts/node_dynasurf_out/node_dynasurf_out.gml index ed454733f..0b492bc93 100644 --- a/scripts/node_dynasurf_out/node_dynasurf_out.gml +++ b/scripts/node_dynasurf_out/node_dynasurf_out.gml @@ -21,7 +21,7 @@ function Node_DynaSurf_Out(_x, _y, _group = noone) : Node_PCX(_x, _y, _group) co inputs[| 7] = nodeValue("alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone) + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone) .setVisible(false); input_display_list = [ 0, diff --git a/scripts/node_dynasurf_out_height/node_dynasurf_out_height.gml b/scripts/node_dynasurf_out_height/node_dynasurf_out_height.gml index 5860a8406..ce0b2fa3a 100644 --- a/scripts/node_dynasurf_out_height/node_dynasurf_out_height.gml +++ b/scripts/node_dynasurf_out_height/node_dynasurf_out_height.gml @@ -7,7 +7,7 @@ function Node_DynaSurf_Out_Height(_x, _y, _group = noone) : Node_PCX(_x, _y, _gr inputs[| 0] = nodeValue("Height", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone) + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone) .setVisible(false); input_display_list = [ 0 ]; diff --git a/scripts/node_dynasurf_out_width/node_dynasurf_out_width.gml b/scripts/node_dynasurf_out_width/node_dynasurf_out_width.gml index 96da6bb53..b5ce92058 100644 --- a/scripts/node_dynasurf_out_width/node_dynasurf_out_width.gml +++ b/scripts/node_dynasurf_out_width/node_dynasurf_out_width.gml @@ -7,7 +7,7 @@ function Node_DynaSurf_Out_Width(_x, _y, _group = noone) : Node_PCX(_x, _y, _gro inputs[| 0] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.PCXnode, noone); - outputs[| 0] = nodeValue("PCX", self, JUNCTION_CONNECT.output, VALUE_TYPE.PCXnode, noone) + outputs[| 0] = nodeValue_Output("PCX", self, VALUE_TYPE.PCXnode, noone) .setVisible(false); input_display_list = [ 0 ]; diff --git a/scripts/node_edge_detect/node_edge_detect.gml b/scripts/node_edge_detect/node_edge_detect.gml index 022226043..bd17e0e8f 100644 --- a/scripts/node_edge_detect/node_edge_detect.gml +++ b/scripts/node_edge_detect/node_edge_detect.gml @@ -15,18 +15,17 @@ function Node_Edge_Detect(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 5, 6, ["Surfaces", true], 0, 3, 4, 7, 8, diff --git a/scripts/node_edge_shade/node_edge_shade.gml b/scripts/node_edge_shade/node_edge_shade.gml index a7c97857d..141e32a50 100644 --- a/scripts/node_edge_shade/node_edge_shade.gml +++ b/scripts/node_edge_shade/node_edge_shade.gml @@ -3,10 +3,10 @@ function Node_Edge_Shade(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; - inputs[| 2] = nodeValue("Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject( [ cola(c_black), cola(c_white) ] )) + inputs[| 2] = nodeValue_Gradient("Colors", self, new gradientObject( [ cola(c_black), cola(c_white) ] )) .setMappable(3); ////////////////////////////////////////////////////////////////////////////////// @@ -17,7 +17,7 @@ function Node_Edge_Shade(_x, _y, _group = noone) : Node_Processor(_x, _y, _group ////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", false], 0, diff --git a/scripts/node_equation/node_equation.gml b/scripts/node_equation/node_equation.gml index 4993386ee..0a3c5669d 100644 --- a/scripts/node_equation/node_equation.gml +++ b/scripts/node_equation/node_equation.gml @@ -39,9 +39,9 @@ function Node_Equation(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) attributes.size = 0; - inputs[| 0] = nodeValue("Equation", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 0] = nodeValue_Text("Equation", self, ""); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.float, 0); argument_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { #region argument_renderer.x = _x; @@ -104,10 +104,10 @@ function Node_Equation(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index + 0] = nodeValue("Argument name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) + inputs[| index + 0] = nodeValue_Text("Argument name", self, "" ) .setDisplay(VALUE_DISPLAY.text_box); - inputs[| index + 1] = nodeValue("Argument value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| index + 1] = nodeValue_Float("Argument value", self, 0 ) .setVisible(true, true); return inputs[| index + 0]; diff --git a/scripts/node_erode/node_erode.gml b/scripts/node_erode/node_erode.gml index b352e7b8f..0e3a22670 100644 --- a/scripts/node_erode/node_erode.gml +++ b/scripts/node_erode/node_erode.gml @@ -3,24 +3,23 @@ function Node_Erode(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 1] = nodeValue_Int("Width", self, 1) .setValidator(VV_min(0)) .setMappable(10); - inputs[| 2] = nodeValue("Preserve border",self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Preserve border",self, false); - inputs[| 3] = nodeValue("Use alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Use alpha", self, true); inputs[| 4] = nodeValue_Surface("Mask", self); - inputs[| 5] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 5] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Active", self, true); active_index = 6; - inputs[| 7] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 7] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(4); // inputs 8, 9, @@ -36,7 +35,7 @@ function Node_Erode(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con ["Erode", false], 1, 10, 2, 3, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_export/node_export.gml b/scripts/node_export/node_export.gml index 1586cb3f0..86706a0ff 100644 --- a/scripts/node_export/node_export.gml +++ b/scripts/node_export/node_export.gml @@ -48,11 +48,11 @@ function Node_Export(_x, _y, _group = noone) : Node(_x, _y, _group) constructor inputs[| 0] = nodeValue_Surface("Surface", self); - inputs[| 1] = nodeValue("Paths", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 1] = nodeValue_Text("Paths", self, "") .setDisplay(VALUE_DISPLAY.path_save, _format_still) .setVisible(true); - inputs[| 2] = nodeValue("Template", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "%d%n") + inputs[| 2] = nodeValue_Text("Template", self, "%d%n") .rejectArray(); inputs[| 2].editWidget.format = TEXT_AREA_FORMAT.path_template; inputs[| 2].editWidget.auto_update = true; @@ -63,7 +63,7 @@ function Node_Export(_x, _y, _group = noone) : Node(_x, _y, _group) constructor inputs[| 3] = nodeValue_Enum_Scroll("Type", self, 0, { data: format_single, update_hover: false }) .rejectArray(); - inputs[| 4] = nodeValue("Template guides", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 4] = nodeValue_Int("Template guides", self, 0) .setDisplay(VALUE_DISPLAY.label, @"%d Directory %1d Goes up 1 level @@ -71,20 +71,20 @@ function Node_Export(_x, _y, _group = noone) : Node(_x, _y, _group) constructor %f Frame %i Array index" ); - inputs[| 5] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 5] = nodeValue_Bool("Loop", self, true) .setVisible(false) .rejectArray(); - inputs[| 6] = nodeValue("Frame optimization", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 6] = nodeValue_Bool("Frame optimization", self, false) .setVisible(false) .rejectArray(); - inputs[| 7] = nodeValue("Color merge", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.02) + inputs[| 7] = nodeValue_Float("Color merge", self, 0.02) .setDisplay(VALUE_DISPLAY.slider) .setVisible(false) .rejectArray(); - inputs[| 8] = nodeValue("Framerate", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 30) + inputs[| 8] = nodeValue_Int("Framerate", self, 30) .rejectArray(); format_image = [ ".png", ".jpg", ".webp" ]; @@ -93,26 +93,25 @@ function Node_Export(_x, _y, _group = noone) : Node(_x, _y, _group) constructor inputs[| 9] = nodeValue_Enum_Scroll("Format", self, 0, { data: format_image, update_hover: false }) .rejectArray(); - inputs[| 10] = nodeValue("Quality", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 23) + inputs[| 10] = nodeValue_Float("Quality", self, 23) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 100, 0.1 ] }) .rejectArray(); - inputs[| 11] = nodeValue("Sequence begin", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 11] = nodeValue_Int("Sequence begin", self, 0); - inputs[| 12] = nodeValue("Frame range", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, -1]) - .setDisplay(VALUE_DISPLAY.slider_range, { range: [0, TOTAL_FRAMES, 0.1] }); + inputs[| 12] = nodeValue_Slider_Range("Frame range", self, [0, -1], { range: [0, TOTAL_FRAMES, 0.1] }); png_format = [ "INDEX4", "INDEX8", "Default (PNG32)" ]; inputs[| 13] = nodeValue_Enum_Scroll("Subformat", self, 2, { data: png_format, update_hover: false }); - inputs[| 14] = nodeValue("Frame step", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 14] = nodeValue_Int("Frame step", self, 1); - inputs[| 15] = nodeValue("Custom Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 15] = nodeValue_Bool("Custom Range", self, false) .rejectArray(); - inputs[| 16] = nodeValue("Export on Save", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 16] = nodeValue_Bool("Export on Save", self, false) - outputs[| 0] = nodeValue("Preview", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Preview", self, VALUE_TYPE.surface, noone); template_guide = [ ["%d", "Directory"], diff --git a/scripts/node_feedback_input/node_feedback_input.gml b/scripts/node_feedback_input/node_feedback_input.gml index 2b1dfc6cb..55e786c9e 100644 --- a/scripts/node_feedback_input/node_feedback_input.gml +++ b/scripts/node_feedback_input/node_feedback_input.gml @@ -22,5 +22,5 @@ function Node_Feedback_Input(_x, _y, _group = noone) : Node_Group_Input(_x, _y, outputs[| 0].getValueDefault(arr); } - outputs[| 1] = nodeValue("Feedback loop", self, JUNCTION_CONNECT.output, VALUE_TYPE.node, 0).nonForward(); + outputs[| 1] = nodeValue_Output("Feedback loop", self, VALUE_TYPE.node, 0).nonForward(); } \ No newline at end of file diff --git a/scripts/node_find_pixel/node_find_pixel.gml b/scripts/node_find_pixel/node_find_pixel.gml index 325a66872..3ec3379f9 100644 --- a/scripts/node_find_pixel/node_find_pixel.gml +++ b/scripts/node_find_pixel/node_find_pixel.gml @@ -4,21 +4,21 @@ function Node_Find_Pixel(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Search color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 1] = nodeValue_Color("Search color", self, c_black); - inputs[| 2] = nodeValue("Tolerance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Tolerance", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Find all", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Find all", self, false); - inputs[| 4] = nodeValue("Include alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 4] = nodeValue_Bool("Include alpha", self, false); - inputs[| 5] = nodeValue("Alpha tolerance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 5] = nodeValue_Float("Alpha tolerance", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); // inputs[| 6] = nodeValue_Enum_Button("Axis", self, 1, [ "X", "Y" ]); - outputs[| 0] = nodeValue("Position", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, [ 0, 0 ]) + outputs[| 0] = nodeValue_Output("Position", self, VALUE_TYPE.integer, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); input_display_list = [ 0, diff --git a/scripts/node_flip/node_flip.gml b/scripts/node_flip/node_flip.gml index 190d28c31..7fcc1389a 100644 --- a/scripts/node_flip/node_flip.gml +++ b/scripts/node_flip/node_flip.gml @@ -5,7 +5,7 @@ function Node_Flip(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 1] = nodeValue_Enum_Button("Axis", self, 0, [ "x", "y" ]); - inputs[| 2] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Active", self, true); active_index = 2; input_display_list = [ 2, @@ -13,7 +13,7 @@ function Node_Flip(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons ["Flip", false], 1, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_flood_fill/node_flood_fill.gml b/scripts/node_flood_fill/node_flood_fill.gml index d4a303b30..d494fb3f6 100644 --- a/scripts/node_flood_fill/node_flood_fill.gml +++ b/scripts/node_flood_fill/node_flood_fill.gml @@ -5,27 +5,26 @@ function Node_Flood_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 1] = nodeValue_Surface("Mask", self); - inputs[| 2] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - inputs[| 4] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Position", self, [ 1, 1 ]); - inputs[| 5] = nodeValue("Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, cola(c_black) ); + inputs[| 5] = nodeValue_Color("Colors", self, cola(c_black) ); - inputs[| 6] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 6] = nodeValue_Float("Threshold", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Diagonal", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 7] = nodeValue_Bool("Diagonal", self, false); __init_mask_modifier(1); // inputs 8, 9 inputs[| 10] = nodeValue_Enum_Scroll("Blend", self, 0, [ "Override", "Multiply" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 3, ["Surfaces", false], 0, 1, 2, 8, 9, diff --git a/scripts/node_flow_noise/node_flow_noise.gml b/scripts/node_flow_noise/node_flow_noise.gml index 2d52e167e..9b8f1a77d 100644 --- a/scripts/node_flow_noise/node_flow_noise.gml +++ b/scripts/node_flow_noise/node_flow_noise.gml @@ -2,20 +2,17 @@ function Node_Flow_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y, name = "Flow Noise"; shader = sh_noise_flow; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 2, 2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 2, 2 ]); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 3] = nodeValue_Float("Progress", self, 0) addShaderProp(SHADER_UNIFORM.float, "progress"); - inputs[| 4] = nodeValue("Detail", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 1, 8 ]) - .setDisplay(VALUE_DISPLAY.slider_range, { range: [ 1, 16, 0.1 ] }); + inputs[| 4] = nodeValue_Slider_Range("Detail", self, [ 1, 8 ], { range: [ 1, 16, 0.1 ] }); addShaderProp(SHADER_UNIFORM.float, "detail"); inputs[| 5] = nodeValue_Rotation("Rotation", self, 0); diff --git a/scripts/node_fn/node_fn.gml b/scripts/node_fn/node_fn.gml index 69a20f8b0..cab2b90ae 100644 --- a/scripts/node_fn/node_fn.gml +++ b/scripts/node_fn/node_fn.gml @@ -6,7 +6,7 @@ function Node_Fn(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constr inputs[| 0] = nodeValue_Enum_Scroll("Display", self, 1 , [ "Number", "Graph" ]); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.float, 0); inl = ds_list_size(inputs); diff --git a/scripts/node_fn_constant/node_fn_constant.gml b/scripts/node_fn_constant/node_fn_constant.gml index 1e2010e45..27334269b 100644 --- a/scripts/node_fn_constant/node_fn_constant.gml +++ b/scripts/node_fn_constant/node_fn_constant.gml @@ -1,7 +1,7 @@ function Node_Fn_Constant(_x, _y, _group = noone) : Node_Fn(_x, _y, _group) constructor { name = "Constant"; - inputs[| inl + 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ); + inputs[| inl + 0] = nodeValue_Float("Value", self, 0 ); array_append(input_display_list, [ ["Value", false], inl + 0 diff --git a/scripts/node_fn_ease/node_fn_ease.gml b/scripts/node_fn_ease/node_fn_ease.gml index be8e72d64..92c1f383e 100644 --- a/scripts/node_fn_ease/node_fn_ease.gml +++ b/scripts/node_fn_ease/node_fn_ease.gml @@ -1,11 +1,9 @@ function Node_Fn_Ease(_x, _y, _group = noone) : Node_Fn(_x, _y, _group) constructor { name = "Ease"; - inputs[| inl + 0] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ] ) - .setDisplay(VALUE_DISPLAY.slider_range ); + inputs[| inl + 0] = nodeValue_Slider_Range("Range", self, [ 0, 1 ] ); - inputs[| inl + 1] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.1, 0.9 ] ) - .setDisplay(VALUE_DISPLAY.slider_range ); + inputs[| inl + 1] = nodeValue_Slider_Range("Amount", self, [ 0.1, 0.9 ] ); inputs[| inl + 2] = nodeValue_Enum_Scroll("Smooth", self, 0 , [ "Cubic poly", "Quadratic rat", "Cubic rat", "Cosine" ] ); diff --git a/scripts/node_fn_math/node_fn_math.gml b/scripts/node_fn_math/node_fn_math.gml index e76d16326..2c20224d0 100644 --- a/scripts/node_fn_math/node_fn_math.gml +++ b/scripts/node_fn_math/node_fn_math.gml @@ -4,10 +4,10 @@ function Node_Fn_Math(_x, _y, _group = noone) : Node_Fn(_x, _y, _group) construc inputs[| inl + 0] = nodeValue_Enum_Scroll("Operation", self, 2 , [ "Add", "Minus", "Multiply" ] ); - inputs[| inl + 1] = nodeValue("Value 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| inl + 1] = nodeValue_Float("Value 1", self, 0 ) .setVisible(true, true); - inputs[| inl + 2] = nodeValue("Value 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| inl + 2] = nodeValue_Float("Value 2", self, 0 ) .setVisible(true, true); array_append(input_display_list, [ diff --git a/scripts/node_fn_smoothstep/node_fn_smoothstep.gml b/scripts/node_fn_smoothstep/node_fn_smoothstep.gml index 4a1f587f8..d35d2fda2 100644 --- a/scripts/node_fn_smoothstep/node_fn_smoothstep.gml +++ b/scripts/node_fn_smoothstep/node_fn_smoothstep.gml @@ -2,7 +2,7 @@ function Node_Fn_SmoothStep(_x, _y, _group = noone) : Node_Fn(_x, _y, _group) co name = "SmoothStep"; time_based = false; - inputs[| inl + 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| inl + 0] = nodeValue_Float("Value", self, 0 ) .setVisible(true, true); inputs[| inl + 1] = nodeValue_Enum_Scroll("Type", self, 0 , [ "Cubic poly", "Quadratic rat", "Cubic rat", "Cosine" ] ); diff --git a/scripts/node_fn_wave_table/node_fn_wave_table.gml b/scripts/node_fn_wave_table/node_fn_wave_table.gml index 2b3d02997..e4318a9f1 100644 --- a/scripts/node_fn_wave_table/node_fn_wave_table.gml +++ b/scripts/node_fn_wave_table/node_fn_wave_table.gml @@ -1,13 +1,12 @@ function Node_Fn_WaveTable(_x, _y, _group = noone) : Node_Fn(_x, _y, _group) constructor { name = "WaveTable"; - inputs[| inl + 0] = nodeValue("Pattern", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| inl + 0] = nodeValue_Float("Pattern", self, 0 ) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 3, 0.01] }); - inputs[| inl + 1] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| inl + 1] = nodeValue_Vector("Range", self, [ 0, 1 ]); - inputs[| inl + 2] = nodeValue("Frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2 ) + inputs[| inl + 2] = nodeValue_Float("Frequency", self, 2 ) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 8, 0.01] }); array_append(input_display_list, [ diff --git a/scripts/node_fn_wiggler/node_fn_wiggler.gml b/scripts/node_fn_wiggler/node_fn_wiggler.gml index 7ab59c53c..c6c3357fe 100644 --- a/scripts/node_fn_wiggler/node_fn_wiggler.gml +++ b/scripts/node_fn_wiggler/node_fn_wiggler.gml @@ -1,17 +1,15 @@ function Node_Wiggler(_x, _y, _group = noone) : Node_Fn(_x, _y, _group) constructor { name = "Wiggler"; - inputs[| inl + 0] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| inl + 0] = nodeValue_Vector("Range", self, [ 0, 1 ]); - inputs[| inl + 1] = nodeValue("Frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4 ) + inputs[| inl + 1] = nodeValue_Int("Frequency", self, 4 ) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 32, 0.1] }); - inputs[| inl + 2] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| inl + 2] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| inl + 2].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| inl + 3] = nodeValue("Clip", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b11 ) - .setDisplay(VALUE_DISPLAY.toggle, { data : [ "Start", "End" ] }); + inputs[| inl + 3] = nodeValue_Toggle("Clip", self, 0b11 , { data : [ "Start", "End" ] }); array_append(input_display_list, [ ["Wiggle", false], inl + 2, inl + 0, inl + 1, inl + 3, diff --git a/scripts/node_fold_noise/node_fold_noise.gml b/scripts/node_fold_noise/node_fold_noise.gml index a8029f665..c26223475 100644 --- a/scripts/node_fold_noise/node_fold_noise.gml +++ b/scripts/node_fold_noise/node_fold_noise.gml @@ -2,23 +2,21 @@ function Node_Fold_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y, name = "Fold Noise"; shader = sh_noise_fold; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 2, 2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 2, 2 ]); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2) + inputs[| 3] = nodeValue_Int("Iteration", self, 2) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 6, 0.1] }); addShaderProp(SHADER_UNIFORM.integer, "iteration"); - inputs[| 4] = nodeValue("Stretch", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2); + inputs[| 4] = nodeValue_Float("Stretch", self, 2); addShaderProp(SHADER_UNIFORM.float, "stretch"); - inputs[| 5] = nodeValue("Amplitude", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.3) + inputs[| 5] = nodeValue_Float("Amplitude", self, 1.3) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01] }); addShaderProp(SHADER_UNIFORM.float, "amplitude"); diff --git a/scripts/node_frame/node_frame.gml b/scripts/node_frame/node_frame.gml index c3193637d..3223a0f90 100644 --- a/scripts/node_frame/node_frame.gml +++ b/scripts/node_frame/node_frame.gml @@ -34,22 +34,21 @@ function Node_Frame(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { draw_y1 = 0; - inputs[| 0] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 240, 160 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Size", self, [ 240, 160 ] ) .rejectArray(); - inputs[| 1] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, cola(c_white) ) + inputs[| 1] = nodeValue_Color("Color", self, cola(c_white) ) .rejectArray(); - inputs[| 2] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.75 ) + inputs[| 2] = nodeValue_Float("Alpha", self, 0.75 ) .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); - inputs[| 3] = nodeValue("Label size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, global.__FRAME_LABEL_SCALE ) + inputs[| 3] = nodeValue_Float("Label size", self, global.__FRAME_LABEL_SCALE ) .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); - inputs[| 4] = nodeValue("Blend label", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 4] = nodeValue_Float("Blend label", self, 0 ) .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); diff --git a/scripts/node_gabor_noise/node_gabor_noise.gml b/scripts/node_gabor_noise/node_gabor_noise.gml index 76ea3e63c..8436ecc69 100644 --- a/scripts/node_gabor_noise/node_gabor_noise.gml +++ b/scripts/node_gabor_noise/node_gabor_noise.gml @@ -2,32 +2,29 @@ function Node_Gabor_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y name = "Gabor Noise"; shader = sh_noise_gabor; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 4 ]) .setMappable(8); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 4] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2) + inputs[| 4] = nodeValue_Float("Density", self, 2) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }) .setMappable(9); addShaderProp(SHADER_UNIFORM.float, "alignment"); - inputs[| 5] = nodeValue("Sharpness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4) + inputs[| 5] = nodeValue_Float("Sharpness", self, 4) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 5, 0.01 ] }) .setMappable(10); addShaderProp(SHADER_UNIFORM.float, "sharpness"); - inputs[| 6] = nodeValue("Augment", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 11, 31 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Augment", self, [ 11, 31 ]); addShaderProp(SHADER_UNIFORM.float, "augment"); inputs[| 7] = nodeValue_Rotation("Phase", self, 0) diff --git a/scripts/node_gamma_map/node_gamma_map.gml b/scripts/node_gamma_map/node_gamma_map.gml index 98dbd21a8..67af9bd3a 100644 --- a/scripts/node_gamma_map/node_gamma_map.gml +++ b/scripts/node_gamma_map/node_gamma_map.gml @@ -3,14 +3,14 @@ function Node_Gamma_Map(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Invert", self, false); - inputs[| 2] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Active", self, true); active_index = 2; input_display_list = [ 2, 0, 1, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_global/node_global.gml b/scripts/node_global/node_global.gml index 3c5ae8743..ec17accdf 100644 --- a/scripts/node_global/node_global.gml +++ b/scripts/node_global/node_global.gml @@ -196,7 +196,7 @@ function Node_Global(_x = 0, _y = 0) : __Node_Base(_x, _y) constructor { static valueUpdate = function(index) { RENDER_ALL } static createValue = function() { #region - var _in = nodeValue("NewValue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + var _in = nodeValue_Float("NewValue", self, 0); _in.editor = new variable_editor(_in); ds_list_add(inputs, _in); diff --git a/scripts/node_glow/node_glow.gml b/scripts/node_glow/node_glow.gml index cc05d58c9..68f33f0e5 100644 --- a/scripts/node_glow/node_glow.gml +++ b/scripts/node_glow/node_glow.gml @@ -3,30 +3,30 @@ function Node_Glow(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Border", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("Border", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 4, 0.1] }); - inputs[| 2] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3) + inputs[| 2] = nodeValue_Float("Size", self, 3) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); - inputs[| 3] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Strength", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ]}); - inputs[| 4] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 4] = nodeValue_Color("Color", self, c_white); inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; __init_mask_modifier(5); // inputs 8, 9, inputs[| 10] = nodeValue_Enum_Button("Mode", self, 0, [ "Greyscale", "Alpha" ]); - inputs[| 11] = nodeValue("Draw original", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 11] = nodeValue_Bool("Draw original", self, true); inputs[| 12] = nodeValue_Enum_Button("Side", self, 0, [ "Outer", "Inner" ]); @@ -36,7 +36,7 @@ function Node_Glow(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons ["Render", false], 4, 11, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_gradient/node_gradient.gml b/scripts/node_gradient/node_gradient.gml index df6716d6e..ddf090d2c 100644 --- a/scripts/node_gradient/node_gradient.gml +++ b/scripts/node_gradient/node_gradient.gml @@ -3,7 +3,7 @@ function Node_Gradient(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject([ cola(c_black), cola(c_white) ]) ) + inputs[| 1] = nodeValue_Gradient("Gradient", self, new gradientObject([ cola(c_black), cola(c_white) ])) .setMappable(15); inputs[| 2] = nodeValue_Enum_Scroll("Type", self, 0, [ new scrollItem("Linear", s_node_gradient_type, 0), @@ -13,22 +13,21 @@ function Node_Gradient(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 3] = nodeValue_Rotation("Angle", self, 0) .setMappable(10); - inputs[| 4] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .5) + inputs[| 4] = nodeValue_Float("Radius", self, .5) .setMappable(11); - inputs[| 5] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 5] = nodeValue_Float("Shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-2, 2, 0.01] }) .setMappable(12); - inputs[| 6] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 6] = nodeValue_Vector("Center", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); inputs[| 7] = nodeValue_Enum_Button("Loop", self, 0, [ "None", "Loop", "Pingpong" ]); inputs[| 8] = nodeValue_Surface("Mask", self); - inputs[| 9] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 9] = nodeValue_Float("Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 2, 0.01] }) .setMappable(13); @@ -44,7 +43,7 @@ function Node_Gradient(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 14] = nodeValue("Uniform ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 14] = nodeValue_Bool("Uniform ratio", self, true); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -54,7 +53,7 @@ function Node_Gradient(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", true], 0, 8, diff --git a/scripts/node_gradient_extract/node_gradient_extract.gml b/scripts/node_gradient_extract/node_gradient_extract.gml index faa1012fa..d7746e064 100644 --- a/scripts/node_gradient_extract/node_gradient_extract.gml +++ b/scripts/node_gradient_extract/node_gradient_extract.gml @@ -3,16 +3,16 @@ function Node_Gradient_Extract(_x, _y, _group = noone) : Node_Processor(_x, _y, batch_output = false; setDimension(96); - inputs[| 0] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 0] = nodeValue_Gradient("Gradient", self, new gradientObject(cola(c_white))) .setVisible(true, true); - outputs[| 0] = nodeValue("Colors", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, [] ) + outputs[| 0] = nodeValue_Output("Colors", self, VALUE_TYPE.color, [] ) .setDisplay(VALUE_DISPLAY.palette); - outputs[| 1] = nodeValue("Positions", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [] ); + outputs[| 1] = nodeValue_Output("Positions", self, VALUE_TYPE.float, [] ); outputs[| 1].array_depth = 1; - outputs[| 2] = nodeValue("Type", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0 ); + outputs[| 2] = nodeValue_Output("Type", self, VALUE_TYPE.integer, 0 ); static processData = function(_outSurf, _data, _output_index, _array_index) { var gra = _data[0]; diff --git a/scripts/node_gradient_out/node_gradient_out.gml b/scripts/node_gradient_out/node_gradient_out.gml index 7cb17d9bf..8c83ae115 100644 --- a/scripts/node_gradient_out/node_gradient_out.gml +++ b/scripts/node_gradient_out/node_gradient_out.gml @@ -3,15 +3,15 @@ function Node_Gradient_Out(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro batch_output = false; setDimension(96); - inputs[| 0] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject([ cola(c_black), cola(c_white) ]) ); + inputs[| 0] = nodeValue_Gradient("Gradient", self, new gradientObject([ cola(c_black), cola(c_white) ])); - inputs[| 1] = nodeValue("Sample", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0, "Position to sample a color from the gradient.") + inputs[| 1] = nodeValue_Float("Sample", self, 0, "Position to sample a color from the gradient.") .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); - outputs[| 0] = nodeValue("Gradient", self, JUNCTION_CONNECT.output, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); + outputs[| 0] = nodeValue_Output("Gradient", self, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); - outputs[| 1] = nodeValue("Color", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, c_white); + outputs[| 1] = nodeValue_Output("Color", self, VALUE_TYPE.color, c_white); _pal = -1; diff --git a/scripts/node_gradient_palette/node_gradient_palette.gml b/scripts/node_gradient_palette/node_gradient_palette.gml index e751ee2f6..9fd640c10 100644 --- a/scripts/node_gradient_palette/node_gradient_palette.gml +++ b/scripts/node_gradient_palette/node_gradient_palette.gml @@ -2,19 +2,18 @@ function Node_Gradient_Palette(_x, _y, _group = noone) : Node_Processor(_x, _y, name = "Palette to Gradient"; setDimension(96); - inputs[| 0] = nodeValue("Palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette) + inputs[| 0] = nodeValue_Palette("Palette", self, array_clone(DEF_PALETTE)) .setVisible(true, true); - inputs[| 1] = nodeValue("Custom positions", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Custom positions", self, false); - inputs[| 2] = nodeValue("Positions", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [], "Array of number indicating color position (0 - 1).") + inputs[| 2] = nodeValue_Float("Positions", self, [], "Array of number indicating color position (0 - 1).") .setVisible(true, true); inputs[| 2].array_depth = 1; inputs[| 3] = nodeValue_Enum_Button("Interpolation", self, 1, [ "None", "RGB", "HSV", "OKLAB", "sRGB" ]); - outputs[| 0] = nodeValue("Gradient", self, JUNCTION_CONNECT.output, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + outputs[| 0] = nodeValue_Output("Gradient", self, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) _pal = -1; diff --git a/scripts/node_gradient_points/node_gradient_points.gml b/scripts/node_gradient_points/node_gradient_points.gml index 4f19e0082..2975a3797 100644 --- a/scripts/node_gradient_points/node_gradient_points.gml +++ b/scripts/node_gradient_points/node_gradient_points.gml @@ -3,46 +3,41 @@ function Node_Gradient_Points(_x, _y, _group = noone) : Node_Processor(_x, _y, _ inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Center 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Center 1", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Color 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 2] = nodeValue_Color("Color 1", self, c_white ); - inputs[| 3] = nodeValue("Center 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Center 2", self, [ DEF_SURF_W, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 4] = nodeValue("Color 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 4] = nodeValue_Color("Color 2", self, c_white ); - inputs[| 5] = nodeValue("Center 3", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, DEF_SURF_H ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 5] = nodeValue_Vector("Center 3", self, [ 0, DEF_SURF_H ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 6] = nodeValue("Color 3", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 6] = nodeValue_Color("Color 3", self, c_white ); - inputs[| 7] = nodeValue("Center 4", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_SURF ) - .setDisplay(VALUE_DISPLAY.vector, { useGlobal : false }) + inputs[| 7] = nodeValue_Vector("Center 4", self, DEF_SURF , { useGlobal : false }) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 8] = nodeValue("Color 4", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 8] = nodeValue_Color("Color 4", self, c_white ); - inputs[| 9] = nodeValue("Use palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 9] = nodeValue_Bool("Use palette", self, false ); - inputs[| 10] = nodeValue("Palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 10] = nodeValue_Palette("Palette", self, array_clone(DEF_PALETTE)); - inputs[| 11] = nodeValue("Falloff 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 6 ) + inputs[| 11] = nodeValue_Float("Falloff 1", self, 6 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 32, 0.1 ] }); - inputs[| 12] = nodeValue("Falloff 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 6 ) + inputs[| 12] = nodeValue_Float("Falloff 2", self, 6 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 32, 0.1 ] }); - inputs[| 13] = nodeValue("Falloff 3", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 6 ) + inputs[| 13] = nodeValue_Float("Falloff 3", self, 6 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 32, 0.1 ] }); - inputs[| 14] = nodeValue("Falloff 4", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 6 ) + inputs[| 14] = nodeValue_Float("Falloff 4", self, 6 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 32, 0.1 ] }); - inputs[| 15] = nodeValue("Normalize weight", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 15] = nodeValue_Bool("Normalize weight", self, false ) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", true], 0, diff --git a/scripts/node_gradient_replace_color/node_gradient_replace_color.gml b/scripts/node_gradient_replace_color/node_gradient_replace_color.gml index 3e01d9e99..51a9367b4 100644 --- a/scripts/node_gradient_replace_color/node_gradient_replace_color.gml +++ b/scripts/node_gradient_replace_color/node_gradient_replace_color.gml @@ -2,19 +2,17 @@ function Node_Gradient_Replace_Color(_x, _y, _group = noone) : Node_Processor(_x name = "Gradient Replace"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 0] = nodeValue_Gradient("Gradient", self, new gradientObject(cola(c_white))) .setVisible(true, true); - inputs[| 1] = nodeValue("Color from", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 1] = nodeValue_Palette("Color from", self, array_clone(DEF_PALETTE)); - inputs[| 2] = nodeValue("Color to", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 2] = nodeValue_Palette("Color to", self, array_clone(DEF_PALETTE)); - inputs[| 3] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 3] = nodeValue_Float("Threshold", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Gradient", self, JUNCTION_CONNECT.output, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); + outputs[| 0] = nodeValue_Output("Gradient", self, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); static processData = function(_outSurf, _data, _output_index, _array_index) { #region var gra = _data[0]; diff --git a/scripts/node_gradient_shift/node_gradient_shift.gml b/scripts/node_gradient_shift/node_gradient_shift.gml index e97c7c9a1..b764863e6 100644 --- a/scripts/node_gradient_shift/node_gradient_shift.gml +++ b/scripts/node_gradient_shift/node_gradient_shift.gml @@ -2,18 +2,18 @@ function Node_Gradient_Shift(_x, _y, _group = noone) : Node_Processor(_x, _y, _g name = "Gradient Shift"; setDimension(96); - inputs[| 0] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 0] = nodeValue_Gradient("Gradient", self, new gradientObject(cola(c_white))) .setVisible(true, true); - inputs[| 1] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("Shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 2] = nodeValue("Wrap", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 2] = nodeValue_Bool("Wrap", self, false) - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 2, 0.01] }); - outputs[| 0] = nodeValue("Gradient", self, JUNCTION_CONNECT.output, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); + outputs[| 0] = nodeValue_Output("Gradient", self, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); _pal = -1; diff --git a/scripts/node_grain/node_grain.gml b/scripts/node_grain/node_grain.gml index 68bef1f14..5fb55c1e3 100644 --- a/scripts/node_grain/node_grain.gml +++ b/scripts/node_grain/node_grain.gml @@ -5,41 +5,40 @@ function Node_Grain(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 1] = nodeValue_Surface("Mask", self); - inputs[| 2] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - inputs[| 4] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 4] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(1); // inputs 5, 6 - inputs[| 7] = nodeValue("Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 7] = nodeValue_Float("Brightness", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(8); inputs[| 8] = nodeValueMap("Brightness map", self); - inputs[| 9] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 9] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 9].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 10] = nodeValue("Red", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 10] = nodeValue_Float("Red", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(11); inputs[| 11] = nodeValueMap("Red map", self); - inputs[| 12] = nodeValue("Green", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 12] = nodeValue_Float("Green", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(13); inputs[| 13] = nodeValueMap("Green map", self); - inputs[| 14] = nodeValue("Blue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 14] = nodeValue_Float("Blue", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(15); @@ -47,19 +46,19 @@ function Node_Grain(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 16] = nodeValue("Hue", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 16] = nodeValue_Float("Hue", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(17); inputs[| 17] = nodeValueMap("Hue map", self); - inputs[| 18] = nodeValue("Saturation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 18] = nodeValue_Float("Saturation", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(19); inputs[| 19] = nodeValueMap("Saturation map", self); - inputs[| 20] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 20] = nodeValue_Float("Value", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(21); @@ -80,7 +79,7 @@ function Node_Grain(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con ["HSV", false], 24, /**/ 16, 17, 18, 19, 20, 21, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_graph_preview/node_graph_preview.gml b/scripts/node_graph_preview/node_graph_preview.gml index 465b68cac..1ec54f799 100644 --- a/scripts/node_graph_preview/node_graph_preview.gml +++ b/scripts/node_graph_preview/node_graph_preview.gml @@ -5,17 +5,16 @@ function Node_Graph_Preview(_x, _y, _group = noone) : Node(_x, _y, _group) const inputs[| 0] = nodeValue_Surface("Surface", self) .rejectArray(); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .rejectArray(); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Scale", self, 1) .rejectArray(); - inputs[| 3] = nodeValue("Sticky", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 3] = nodeValue_Bool("Sticky", self, true) .rejectArray(); - inputs[| 4] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 4] = nodeValue_Float("Alpha", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); diff --git a/scripts/node_grey_alpha/node_grey_alpha.gml b/scripts/node_grey_alpha/node_grey_alpha.gml index 70263449f..5b4f87261 100644 --- a/scripts/node_grey_alpha/node_grey_alpha.gml +++ b/scripts/node_grey_alpha/node_grey_alpha.gml @@ -3,14 +3,14 @@ function Node_Grey_Alpha(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Replace color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Replace output with solid color."); + inputs[| 1] = nodeValue_Bool("Replace color", self, true, "Replace output with solid color."); - inputs[| 2] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 2] = nodeValue_Color("Color", self, c_white); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 3, 0, ["Replace Color", false, 1], 2, diff --git a/scripts/node_greyscale/node_greyscale.gml b/scripts/node_greyscale/node_greyscale.gml index b70c16462..6b8efa975 100644 --- a/scripts/node_greyscale/node_greyscale.gml +++ b/scripts/node_greyscale/node_greyscale.gml @@ -3,24 +3,23 @@ function Node_Greyscale(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("Brightness", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01] }) .setMappable(9); - inputs[| 2] = nodeValue("Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Contrast", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 4, 0.01] }) .setMappable(10); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 @@ -35,7 +34,7 @@ function Node_Greyscale(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Greyscale", false], 1, 9, 2, 10, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_grid/node_grid.gml b/scripts/node_grid/node_grid.gml index 3c18bd50a..c2e5d8793 100644 --- a/scripts/node_grid/node_grid.gml +++ b/scripts/node_grid/node_grid.gml @@ -3,29 +3,27 @@ function Node_Grid(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Grid Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 8, 8 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Grid Size", self, [ 8, 8 ]) .setMappable(13); - inputs[| 3] = nodeValue("Gap", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 3] = nodeValue_Float("Gap", self, 0.2) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(14); inputs[| 4] = nodeValue_Rotation("Angle", self, 0) .setMappable(15); - inputs[| 5] = nodeValue("Tile color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 5] = nodeValue_Gradient("Tile color", self, new gradientObject(cola(c_white))) .setMappable(20); - inputs[| 6] = nodeValue("Gap color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 6] = nodeValue_Color("Gap color", self, c_black); inputs[| 7] = nodeValue_Surface("Texture", self); - inputs[| 8] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 8] = nodeValue_Float("Shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-0.5, 0.5, 0.01] }) .setMappable(16); @@ -33,10 +31,10 @@ function Node_Grid(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 10] = nodeValue_Enum_Scroll("Render type", self, 0, ["Colored tile", "Colored tile (Accurate)", "Height map", "Texture grid", "Texture sample"]); - inputs[| 11] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 11] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 11].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 12] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 12] = nodeValue_Bool("Anti aliasing", self, false); inputs[| 13] = nodeValueMap("Scale map", self); @@ -46,33 +44,31 @@ function Node_Grid(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 16] = nodeValueMap("Shift map", self); - inputs[| 17] = nodeValue("Truchet", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 17] = nodeValue_Bool("Truchet", self, false); - inputs[| 18] = nodeValue("Truchet seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random()); + inputs[| 18] = nodeValue_Int("Truchet seed", self, seed_random()); - inputs[| 19] = nodeValue("Flip horizontal", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 19] = nodeValue_Float("Flip horizontal", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); inputs[| 20] = nodeValueMap("Gradient map", self); inputs[| 21] = nodeValueGradientRange("Gradient map range", self, inputs[| 5]); - inputs[| 22] = nodeValue("Flip vertical", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 22] = nodeValue_Float("Flip vertical", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 23] = nodeValue("Texture angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 23] = nodeValue_Rotation_Range("Texture angle", self, [ 0, 0 ]); - inputs[| 24] = nodeValue("Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 24] = nodeValue_Slider_Range("Level", self, [ 0, 1 ]); - inputs[| 25] = nodeValue("Use Texture Dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 25] = nodeValue_Bool("Use Texture Dimension", self, true); - inputs[| 26] = nodeValue("Gap Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 26] = nodeValue_Float("Gap Width", self, 1); - inputs[| 27] = nodeValue("Diagonal", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 27] = nodeValue_Bool("Diagonal", self, false); - inputs[| 28] = nodeValue("Uniform height", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 28] = nodeValue_Bool("Uniform height", self, true); input_display_list = [ ["Output", false], 0, @@ -81,7 +77,7 @@ function Node_Grid(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons ["Truchet", true, 17], 18, 19, 22, 23, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_grid_hex/node_grid_hex.gml b/scripts/node_grid_hex/node_grid_hex.gml index 1f0279ca4..b53221b8e 100644 --- a/scripts/node_grid_hex/node_grid_hex.gml +++ b/scripts/node_grid_hex/node_grid_hex.gml @@ -3,34 +3,32 @@ function Node_Grid_Hex(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 2, 2 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 2, 2 ]) .setMappable(11); inputs[| 3] = nodeValue_Rotation("Angle", self, 0) .setMappable(12); - inputs[| 4] = nodeValue("Gap", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 4] = nodeValue_Float("Gap", self, 0.1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(13); - inputs[| 5] = nodeValue("Tile color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 5] = nodeValue_Gradient("Tile color", self, new gradientObject(cola(c_white))) .setMappable(17); - inputs[| 6] = nodeValue("Gap color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 6] = nodeValue_Color("Gap color", self, c_black); inputs[| 7] = nodeValue_Enum_Scroll("Render type", self, 0, ["Colored tile", "Height map", "Texture grid", "Texture sample"]); - inputs[| 8] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 8] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 8].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 9] = nodeValue_Surface("Texture", self); - inputs[| 10] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 10] = nodeValue_Bool("Anti aliasing", self, false); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -42,11 +40,11 @@ function Node_Grid_Hex(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 14] = nodeValue("Truchet", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 14] = nodeValue_Bool("Truchet", self, false); - inputs[| 15] = nodeValue("Truchet seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random()); + inputs[| 15] = nodeValue_Int("Truchet seed", self, seed_random()); - inputs[| 16] = nodeValue("Truchet threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 16] = nodeValue_Float("Truchet threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -57,13 +55,11 @@ function Node_Grid_Hex(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 19] = nodeValue("Texture angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 19] = nodeValue_Rotation_Range("Texture angle", self, [ 0, 0 ]); - inputs[| 20] = nodeValue("Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 20] = nodeValue_Slider_Range("Level", self, [ 0, 1 ]); - inputs[| 21] = nodeValue("Use Texture Dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 21] = nodeValue_Bool("Use Texture Dimension", self, true); input_display_list = [ ["Output", false], 0, @@ -72,7 +68,7 @@ function Node_Grid_Hex(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Truchet", true, 14], 15, 16, 19, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_grid_noise/node_grid_noise.gml b/scripts/node_grid_noise/node_grid_noise.gml index 15fe63f8b..36c89d122 100644 --- a/scripts/node_grid_noise/node_grid_noise.gml +++ b/scripts/node_grid_noise/node_grid_noise.gml @@ -3,17 +3,15 @@ function Node_Grid_Noise(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 8, 8 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 8, 8 ]); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 4] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 4] = nodeValue_Float("Shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-0.5, 0.5, 0.01] }); inputs[| 5] = nodeValue_Surface("Texture sample", self); @@ -22,14 +20,11 @@ function Node_Grid_Noise(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 7] = nodeValue_Enum_Button("Color mode", self, 0, [ "Greyscale", "RGB", "HSV" ]); - inputs[| 8] = nodeValue("Color R range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 8] = nodeValue_Slider_Range("Color R range", self, [ 0, 1 ]); - inputs[| 9] = nodeValue("Color G range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 9] = nodeValue_Slider_Range("Color G range", self, [ 0, 1 ]); - inputs[| 10] = nodeValue("Color B range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 10] = nodeValue_Slider_Range("Color B range", self, [ 0, 1 ]); input_display_list = [ ["Output", false], 0, @@ -37,7 +32,7 @@ function Node_Grid_Noise(_x, _y, _group = noone) : Node_Processor(_x, _y, _group ["Render", false], 5, 7, 8, 9, 10, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_grid_pentagonal/node_grid_pentagonal.gml b/scripts/node_grid_pentagonal/node_grid_pentagonal.gml index ea7d6f460..b2f439594 100644 --- a/scripts/node_grid_pentagonal/node_grid_pentagonal.gml +++ b/scripts/node_grid_pentagonal/node_grid_pentagonal.gml @@ -3,34 +3,32 @@ function Node_Grid_Pentagonal(_x, _y, _group = noone) : Node_Processor(_x, _y, _ inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 4 ]) .setMappable(11); - inputs[| 3] = nodeValue("Gap", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 3] = nodeValue_Float("Gap", self, 0.1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(12); inputs[| 4] = nodeValue_Rotation("Angle", self, 0) .setMappable(13); - inputs[| 5] = nodeValue("Tile color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 5] = nodeValue_Gradient("Tile color", self, new gradientObject(cola(c_white))) .setMappable(14); - inputs[| 6] = nodeValue("Gap color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 6] = nodeValue_Color("Gap color", self, c_black); inputs[| 7] = nodeValue_Surface("Texture", self); inputs[| 8] = nodeValue_Enum_Scroll("Render type", self, 0, ["Colored tile", "Height map", "Texture grid"]); - inputs[| 9] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 9] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 9].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 10] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 10] = nodeValue_Bool("Anti aliasing", self, false); ///////////////////////////////////////////////////////////////////// @@ -46,10 +44,9 @@ function Node_Grid_Pentagonal(_x, _y, _group = noone) : Node_Processor(_x, _y, _ ///////////////////////////////////////////////////////////////////// - inputs[| 16] = nodeValue("Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 16] = nodeValue_Slider_Range("Level", self, [ 0, 1 ]); - inputs[| 17] = nodeValue("Use Texture Dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 17] = nodeValue_Bool("Use Texture Dimension", self, true); input_display_list = [ ["Output", false], 0, @@ -57,7 +54,7 @@ function Node_Grid_Pentagonal(_x, _y, _group = noone) : Node_Processor(_x, _y, _ ["Render", false], 8, 9, 5, 14, 6, 7, 17, 10, 16, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_grid_tri/node_grid_tri.gml b/scripts/node_grid_tri/node_grid_tri.gml index 550676733..f024d0ee1 100644 --- a/scripts/node_grid_tri/node_grid_tri.gml +++ b/scripts/node_grid_tri/node_grid_tri.gml @@ -3,34 +3,32 @@ function Node_Grid_Tri(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 2, 2 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 2, 2 ]) .setMappable(11); - inputs[| 3] = nodeValue("Gap", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 3] = nodeValue_Float("Gap", self, 0.1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(12); inputs[| 4] = nodeValue_Rotation("Angle", self, 0) .setMappable(13); - inputs[| 5] = nodeValue("Tile color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 5] = nodeValue_Gradient("Tile color", self, new gradientObject(cola(c_white))) .setMappable(17); - inputs[| 6] = nodeValue("Gap color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 6] = nodeValue_Color("Gap color", self, c_black); inputs[| 7] = nodeValue_Surface("Texture", self); inputs[| 8] = nodeValue_Enum_Scroll("Render type", self, 0, ["Colored tile", "Height map", "Texture grid", "Texture sample"]); - inputs[| 9] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 9] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 9].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 10] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 10] = nodeValue_Bool("Anti aliasing", self, false); ////////////////////////////////////////////////////////////////////////////////// @@ -42,11 +40,11 @@ function Node_Grid_Tri(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////// - inputs[| 14] = nodeValue("Truchet", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 14] = nodeValue_Bool("Truchet", self, false); - inputs[| 15] = nodeValue("Truchet seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random()); + inputs[| 15] = nodeValue_Int("Truchet seed", self, seed_random()); - inputs[| 16] = nodeValue("Truchet threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 16] = nodeValue_Float("Truchet threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -57,13 +55,11 @@ function Node_Grid_Tri(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 19] = nodeValue("Texture angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 19] = nodeValue_Rotation_Range("Texture angle", self, [ 0, 0 ]); - inputs[| 20] = nodeValue("Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 20] = nodeValue_Slider_Range("Level", self, [ 0, 1 ]); - inputs[| 21] = nodeValue("Use Texture Dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 21] = nodeValue_Bool("Use Texture Dimension", self, true); input_display_list = [ ["Output", false], 0, @@ -72,7 +68,7 @@ function Node_Grid_Tri(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Truchet", true, 14], 15, 16, 19, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_group_input/node_group_input.gml b/scripts/node_group_input/node_group_input.gml index 1da6de5ab..78bcfce92 100644 --- a/scripts/node_group_input/node_group_input.gml +++ b/scripts/node_group_input/node_group_input.gml @@ -80,26 +80,25 @@ function Node_Group_Input(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 0] = nodeValue_Enum_Scroll("Display type", self, 0, { data: GROUP_IO_DISPLAY[11], update_hover: false }); - inputs[| 1] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.range) + inputs[| 1] = nodeValue_Range("Range", self, [ 0, 1 ]) .setVisible(false); inputs[| 2] = nodeValue_Enum_Scroll("Input type", self, 11, { data: GROUP_IO_TYPE_NAME, update_hover: false }); - inputs[| 3] = nodeValue("Enum label", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 3] = nodeValue_Text("Enum label", self, "") .setVisible(false); inputs[| 4] = nodeValue_Enum_Button("Vector size", self, 0, [ "2", "3", "4" ]) .setVisible(false); - inputs[| 5] = nodeValue("Order", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 5] = nodeValue_Int("Order", self, 0); - inputs[| 6] = nodeValue("Display preview gizmo", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Display preview gizmo", self, true); - inputs[| 7] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.01) + inputs[| 7] = nodeValue_Float("Step", self, 0.01) .setVisible(false); - inputs[| 8] = nodeValue("Button Label", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "Trigger") + inputs[| 8] = nodeValue_Text("Button Label", self, "Trigger") .setVisible(false); inputs[| 9] = nodeValue_Enum_Scroll("Visible Condition", self, 0, [ "Show", "Hide", /* 2 */ new scrollItem("Equal", s_node_condition_type, 0), @@ -109,9 +108,9 @@ function Node_Group_Input(_x, _y, _group = noone) : Node(_x, _y, _group) constru /* 6 */ new scrollItem("Lesser", s_node_condition_type, 2), /* 7 */ new scrollItem("Lesser or equal", s_node_condition_type, 3), ]); - inputs[| 10] = nodeValue("Visible Check", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 10] = nodeValue_Float("Visible Check", self, 0); - inputs[| 11] = nodeValue("Visible Check To", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 11] = nodeValue_Float("Visible Check To", self, 0); inputs[| 10].setFrom_condition = function(_valueFrom) { if(is_instanceof(_valueFrom.node, Node_Group_Input)) return true; @@ -128,7 +127,7 @@ function Node_Group_Input(_x, _y, _group = noone) : Node(_x, _y, _group) constru ["Data", false], 2, 0, 4, 1, 7, 3, 8, ]; - outputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0) + outputs[| 0] = nodeValue_Output("Value", self, VALUE_TYPE.any, 0) .uncache(); attributes.inherit_name = true; diff --git a/scripts/node_herringbone_tile/node_herringbone_tile.gml b/scripts/node_herringbone_tile/node_herringbone_tile.gml index cf67b3103..4b09e2599 100644 --- a/scripts/node_herringbone_tile/node_herringbone_tile.gml +++ b/scripts/node_herringbone_tile/node_herringbone_tile.gml @@ -3,34 +3,32 @@ function Node_Herringbone_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 4 ]) .setMappable(11); inputs[| 3] = nodeValue_Rotation("Angle", self, 0) .setMappable(12); - inputs[| 4] = nodeValue("Gap", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.25) + inputs[| 4] = nodeValue_Float("Gap", self, 0.25) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(13); - inputs[| 5] = nodeValue("Tile color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 5] = nodeValue_Gradient("Tile color", self, new gradientObject(cola(c_white))) .setMappable(18); - inputs[| 6] = nodeValue("Gap color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 6] = nodeValue_Color("Gap color", self, c_black); inputs[| 7] = nodeValue_Enum_Scroll("Render type", self, 0, ["Colored tile", "Height map", "Texture grid"]); - inputs[| 8] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 8] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 8].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 9] = nodeValue_Surface("Texture", self); - inputs[| 10] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 10] = nodeValue_Bool("Anti aliasing", self, false); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -42,14 +40,14 @@ function Node_Herringbone_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 14] = nodeValue("Truchet", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 14] = nodeValue_Bool("Truchet", self, false); - inputs[| 15] = nodeValue("Truchet seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random()); + inputs[| 15] = nodeValue_Int("Truchet seed", self, seed_random()); - inputs[| 16] = nodeValue("Truchet threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 16] = nodeValue_Float("Truchet threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) - inputs[| 17] = nodeValue("Tile length", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2); + inputs[| 17] = nodeValue_Float("Tile length", self, 2); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -59,11 +57,9 @@ function Node_Herringbone_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 20] = nodeValue("Texture angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 20] = nodeValue_Rotation_Range("Texture angle", self, [ 0, 0 ]); - inputs[| 21] = nodeValue("Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 21] = nodeValue_Slider_Range("Level", self, [ 0, 1 ]); input_display_list = [ ["Output", false], 0, @@ -72,7 +68,7 @@ function Node_Herringbone_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, ["Truchet", true, 14], 15, 16, 20, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_hlsl/node_hlsl.gml b/scripts/node_hlsl/node_hlsl.gml index b4d24fb2b..69c6b7b12 100644 --- a/scripts/node_hlsl/node_hlsl.gml +++ b/scripts/node_hlsl/node_hlsl.gml @@ -20,11 +20,11 @@ function Node_HLSL(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons name = "HLSL"; shader = { vs: -1, fs: -1 }; - inputs[| 0] = nodeValue("Vertex", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, @"") + inputs[| 0] = nodeValue_Text("Vertex", self, @"") .setDisplay(VALUE_DISPLAY.codeHLSL) .rejectArray(); - inputs[| 1] = nodeValue("Fragment", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, + inputs[| 1] = nodeValue_Text("Fragment", self, @"float4 surfaceColor = gm_BaseTextureObject.Sample(gm_BaseTexture, input.uv); output.color = surfaceColor;") .setDisplay(VALUE_DISPLAY.codeHLSL) @@ -32,16 +32,16 @@ output.color = surfaceColor;") inputs[| 2] = nodeValue_Surface("Base Texture", self); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ); + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone ); static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index + 0] = nodeValue("Argument name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ); + inputs[| index + 0] = nodeValue_Text("Argument name", self, "" ); inputs[| index + 1] = nodeValue_Enum_Scroll("Argument type", self, 0 , { data: [ "Float", "Int", "Vec2", "Vec3", "Vec4", "Mat3", "Mat4", "Sampler2D", "Color" ], update_hover: false }); inputs[| index + 1].editWidget.interactable = false; - inputs[| index + 2] = nodeValue("Argument value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| index + 2] = nodeValue_Float("Argument value", self, 0 ) .setVisible(true, true); inputs[| index + 2].editWidget.interactable = false; } diff --git a/scripts/node_honey_noise/node_honey_noise.gml b/scripts/node_honey_noise/node_honey_noise.gml index a40124fc9..3b924009f 100644 --- a/scripts/node_honey_noise/node_honey_noise.gml +++ b/scripts/node_honey_noise/node_honey_noise.gml @@ -2,13 +2,11 @@ function Node_Honeycomb_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x name = "Honeycomb Noise"; shader = sh_noise_honey; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 2, 2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 2, 2 ]); addShaderProp(SHADER_UNIFORM.float, "scale"); inputs[| 3] = nodeValue_Rotation("Rotation", self, 0); @@ -17,11 +15,11 @@ function Node_Honeycomb_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x inputs[| 4] = nodeValue_Enum_Button("Mode", self, 0, [ "Hexagon", "Star" ]); addShaderProp(SHADER_UNIFORM.integer, "mode"); - inputs[| 5] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 5] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 5].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }) addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 6] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 6] = nodeValue_Int("Iteration", self, 1); addShaderProp(SHADER_UNIFORM.integer, "iteration"); input_display_list = [ 5, diff --git a/scripts/node_hsv_channel/node_hsv_channel.gml b/scripts/node_hsv_channel/node_hsv_channel.gml index 2600f0dff..261cbcb78 100644 --- a/scripts/node_hsv_channel/node_hsv_channel.gml +++ b/scripts/node_hsv_channel/node_hsv_channel.gml @@ -4,12 +4,12 @@ function Node_HSV_Channel(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Output Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Output Array", self, false); - outputs[| 0] = nodeValue("Hue", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Saturation", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 2] = nodeValue("Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 3] = nodeValue("Alpha", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Hue", self, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Saturation", self, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Value", self, VALUE_TYPE.surface, noone); + outputs[| 3] = nodeValue_Output("Alpha", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_http_request/node_http_request.gml b/scripts/node_http_request/node_http_request.gml index 48f6d15ba..e5e686a4e 100644 --- a/scripts/node_http_request/node_http_request.gml +++ b/scripts/node_http_request/node_http_request.gml @@ -2,13 +2,13 @@ function Node_HTTP_request(_x, _y, _group = noone) : Node(_x, _y, _group) constr name = "HTTP"; setDimension(96, 72); - inputs[| 0] = nodeValue("Address", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 0] = nodeValue_Text("Address", self, ""); inputs[| 1] = nodeValue_Enum_Scroll("Type", self, 0, [ "Get", "Post" ]); - inputs[| 2] = nodeValue("Content", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 2] = nodeValue_Text("Content", self, "") - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.text, ""); address_domain = ""; diff --git a/scripts/node_image/node_image.gml b/scripts/node_image/node_image.gml index 444d9434f..756c96408 100644 --- a/scripts/node_image/node_image.gml +++ b/scripts/node_image/node_image.gml @@ -26,14 +26,13 @@ function Node_Image(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Image"; color = COLORS.node_blend_input; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "image|*.png;*.jpg" }); - inputs[| 1] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0, 0, 0]) - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 1] = nodeValue_Padding("Padding", self, [0, 0, 0, 0]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, "") + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Path", self, VALUE_TYPE.path, "") .setVisible(true, true); attribute_surface_depth(); diff --git a/scripts/node_image_animated/node_image_animated.gml b/scripts/node_image_animated/node_image_animated.gml index 135502b59..5b0fa8f83 100644 --- a/scripts/node_image_animated/node_image_animated.gml +++ b/scripts/node_image_animated/node_image_animated.gml @@ -38,36 +38,35 @@ function Node_Image_Animated(_x, _y, _group = noone) : Node(_x, _y, _group) cons update_on_frame = true; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, []) + inputs[| 0] = nodeValue_Text("Path", self, []) .setDisplay(VALUE_DISPLAY.path_array, { filter: ["image|*.png;*.jpg", ""] }); - inputs[| 1] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0, 0, 0]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 1] = nodeValue_Padding("Padding", self, [0, 0, 0, 0]) .rejectArray(); - inputs[| 2] = nodeValue("Stretch frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Stretch animation speed to match project length.") + inputs[| 2] = nodeValue_Bool("Stretch frame", self, false, "Stretch animation speed to match project length.") .rejectArray(); - inputs[| 3] = nodeValue("Animation speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Animation speed", self, 1) .rejectArray(); inputs[| 4] = nodeValue_Enum_Scroll("Loop modes", self, 0, ["Loop", "Ping pong", "Hold last frame", "Hide"]) .rejectArray(); - inputs[| 5] = nodeValue("Set animation length to match", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 5] = nodeValue_Trigger("Set animation length to match", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Match length", UI : true, onClick: function() { if(array_length(spr) == 0) return; TOTAL_FRAMES = array_length(spr); } }); - inputs[| 6] = nodeValue("Custom frame order", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 6] = nodeValue_Bool("Custom frame order", self, false); - inputs[| 7] = nodeValue("Frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 7] = nodeValue_Int("Frame", self, 0); inputs[| 8] = nodeValue_Enum_Scroll("Canvas size", self, 2, [ "First", "Minimum", "Maximum" ]) .rejectArray(); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Image", false], 0, 1, 8, diff --git a/scripts/node_image_gif/node_image_gif.gml b/scripts/node_image_gif/node_image_gif.gml index a1f892f3c..4fb5ff383 100644 --- a/scripts/node_image_gif/node_image_gif.gml +++ b/scripts/node_image_gif/node_image_gif.gml @@ -29,10 +29,10 @@ function Node_Image_gif(_x, _y, _group = noone) : Node(_x, _y, _group) construct update_on_frame = true; setAlwaysTimeline(new timelineItemNode_Image_gif(self)); - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "Animated gif|*.gif" }); - inputs[| 1] = nodeValue("Set animation length to gif", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 1] = nodeValue_Trigger("Set animation length to gif", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Match length", UI : true, onClick: function() { if(!spr) return; if(!sprite_exists(spr)) return; @@ -40,21 +40,21 @@ function Node_Image_gif(_x, _y, _group = noone) : Node(_x, _y, _group) construct PROJECT.animator.framerate = 12; } }); - inputs[| 2] = nodeValue("Output as array", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Output as array", self, false); inputs[| 3] = nodeValue_Enum_Scroll("Loop modes", self, 0, ["Loop", "Ping pong", "Hold last frame", "Hide"]) .rejectArray(); - inputs[| 4] = nodeValue("Start frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 4] = nodeValue_Int("Start frame", self, 0); - inputs[| 5] = nodeValue("Custom frame order", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 5] = nodeValue_Bool("Custom frame order", self, false); - inputs[| 6] = nodeValue("Frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 6] = nodeValue_Int("Frame", self, 0); - inputs[| 7] = nodeValue("Animation speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 7] = nodeValue_Float("Animation speed", self, 1); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, "") + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Path", self, VALUE_TYPE.path, "") .setVisible(true, true); input_display_list = [ diff --git a/scripts/node_image_grid/node_image_grid.gml b/scripts/node_image_grid/node_image_grid.gml index b5c977973..20644ddeb 100644 --- a/scripts/node_image_grid/node_image_grid.gml +++ b/scripts/node_image_grid/node_image_grid.gml @@ -5,21 +5,19 @@ function Node_Image_Grid(_x, _y, _group = noone) : Node(_x, _y, _group) construc new scrollItem("Vertical", s_node_alignment, 1) ]) .rejectArray(); - inputs[| 1] = nodeValue("Column", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 1] = nodeValue_Int("Column", self, 4) .setValidator(VV_min(1)) .rejectArray(); - inputs[| 2] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Spacing", self, [ 0, 0 ]) .rejectArray(); - inputs[| 3] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 3] = nodeValue_Padding("Padding", self, [ 0, 0, 0, 0 ]) .rejectArray(); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas data", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []); + outputs[| 1] = nodeValue_Output("Atlas data", self, VALUE_TYPE.surface, []); temp_surface = [ noone, noone ]; diff --git a/scripts/node_image_sequence/node_image_sequence.gml b/scripts/node_image_sequence/node_image_sequence.gml index 432401e61..b383f457a 100644 --- a/scripts/node_image_sequence/node_image_sequence.gml +++ b/scripts/node_image_sequence/node_image_sequence.gml @@ -39,11 +39,10 @@ function Node_Image_Sequence(_x, _y, _group = noone) : Node(_x, _y, _group) cons spr = []; color = COLORS.node_blend_input; - inputs[| 0] = nodeValue("Paths", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, []) + inputs[| 0] = nodeValue_Text("Paths", self, []) .setDisplay(VALUE_DISPLAY.path_array, { filter: ["image|*.png;*.jpg", ""] }); - inputs[| 1] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0, 0, 0]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 1] = nodeValue_Padding("Padding", self, [0, 0, 0, 0]) .rejectArray(); inputs[| 2] = nodeValue_Enum_Scroll("Canvas size", self, 0, [ "Individual", "Minimum", "Maximum" ]) @@ -56,8 +55,8 @@ function Node_Image_Sequence(_x, _y, _group = noone) : Node(_x, _y, _group) cons ["Array settings", false], 0, 1, 2, 3 ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []); - outputs[| 1] = nodeValue("Paths", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, [] ). + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, []); + outputs[| 1] = nodeValue_Output("Paths", self, VALUE_TYPE.path, [] ). setVisible(true, true); attribute_surface_depth(); diff --git a/scripts/node_image_sheet/node_image_sheet.gml b/scripts/node_image_sheet/node_image_sheet.gml index d3f5a7f01..ac0e5f5b0 100644 --- a/scripts/node_image_sheet/node_image_sheet.gml +++ b/scripts/node_image_sheet/node_image_sheet.gml @@ -3,30 +3,25 @@ function Node_Image_Sheet(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Sprite size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 32, 32 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Sprite size", self, [ 32, 32 ]); - inputs[| 2] = nodeValue("Row", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); //unused - inputs[| 3] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Int("Row", self, 1); //unused + inputs[| 3] = nodeValue_Vector("Amount", self, [ 1, 1 ]); - inputs[| 4] = nodeValue("Offset", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Offset", self, [ 0, 0 ]); - inputs[| 5] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Spacing", self, [ 0, 0 ]); - inputs[| 6] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0, 0, 0]) - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 6] = nodeValue_Padding("Padding", self, [0, 0, 0, 0]); inputs[| 7] = nodeValue_Enum_Scroll("Output", self, 1, [ "Animation", "Array" ]); - inputs[| 8] = nodeValue("Animation speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 8] = nodeValue_Float("Animation speed", self, 1); inputs[| 9] = nodeValue_Enum_Scroll("Main Axis", self, 0, [ new scrollItem("Horizontal", s_node_alignment, 0), new scrollItem("Vertical", s_node_alignment, 1), ]); - inputs[| 10] = nodeValue("Auto fill", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false, "Automatically set amount based on sprite size.") + inputs[| 10] = nodeValue_Trigger("Auto fill", self, false, "Automatically set amount based on sprite size.") .setDisplay(VALUE_DISPLAY.button, { name: "Auto fill", UI : true, onClick: function() { #region var _sur = getInputData(0); if(!is_surface(_sur) || _sur == DEF_SURFACE) return; @@ -48,18 +43,18 @@ function Node_Image_Sheet(_x, _y, _group = noone) : Node(_x, _y, _group) constru doUpdate(); } }); #endregion - inputs[| 11] = nodeValue("Sync animation", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 11] = nodeValue_Trigger("Sync animation", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Sync frames", UI : true, onClick: function() { var _atl = outputs[| 1].getValue(); var _spd = getInputData(8); TOTAL_FRAMES = max(1, _spd == 0? 1 : ceil(array_length(_atl) / _spd)); } }); - inputs[| 12] = nodeValue("Filter empty output", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 12] = nodeValue_Bool("Filter empty output", self, false); inputs[| 13] = nodeValue_Enum_Scroll("Filtered Pixel", self, 0, [ "Transparent", "Color" ]); - inputs[| 14] = nodeValue("Filtered Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black) + inputs[| 14] = nodeValue_Color("Filtered Color", self, c_black) input_display_list = [ ["Sprite", false], 0, 1, 6, @@ -68,9 +63,9 @@ function Node_Image_Sheet(_x, _y, _group = noone) : Node(_x, _y, _group) constru ["Filter Empty", true, 12], 13, 14, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas Data", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []) + outputs[| 1] = nodeValue_Output("Atlas Data", self, VALUE_TYPE.surface, []) .setArrayDepth(1); attribute_surface_depth(); diff --git a/scripts/node_interlaced/node_interlaced.gml b/scripts/node_interlaced/node_interlaced.gml index a23f00287..7379ee1c4 100644 --- a/scripts/node_interlaced/node_interlaced.gml +++ b/scripts/node_interlaced/node_interlaced.gml @@ -3,26 +3,25 @@ function Node_Interlaced(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; inputs[| 2] = nodeValue_Surface("Mask", self); - inputs[| 3] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 4] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(2); // inputs 5, 6 inputs[| 7] = nodeValue_Enum_Button("Axis", self, 0, [ "X", "Y" ]); - inputs[| 8] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 8] = nodeValue_Float("Size", self, 1); - inputs[| 9] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 9] = nodeValue_Bool("Invert", self, false); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); temp_surface = [ ]; diff --git a/scripts/node_interpret_number/node_interpret_number.gml b/scripts/node_interpret_number/node_interpret_number.gml index 73381dc98..b70fd4e52 100644 --- a/scripts/node_interpret_number/node_interpret_number.gml +++ b/scripts/node_interpret_number/node_interpret_number.gml @@ -2,16 +2,15 @@ function Node_Interpret_Number(_x, _y, _group = noone) : Node_Processor(_x, _y, name = "Interpret Number"; dimension_index = -1; - inputs[| 0] = nodeValue("Number", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [] ) + inputs[| 0] = nodeValue_Float("Number", self, [] ) .setVisible(true, true) .setArrayDepth(1); inputs[| 1] = nodeValue_Enum_Button("Mode", self, 0, [ "Greyscale", "Gradient" ]); - inputs[| 2] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ] ) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 2] = nodeValue_Range("Range", self, [ 0, 1 ] ); - inputs[| 3] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 3] = nodeValue_Gradient("Gradient", self, new gradientObject(cola(c_white))) .setMappable(4); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -22,7 +21,7 @@ function Node_Interpret_Number(_x, _y, _group = noone) : Node_Processor(_x, _y, ////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Interpret", false], 1, 2, 3, 4, diff --git a/scripts/node_invert/node_invert.gml b/scripts/node_invert/node_invert.gml index 2abe12a34..8fe1740e6 100644 --- a/scripts/node_invert/node_invert.gml +++ b/scripts/node_invert/node_invert.gml @@ -5,24 +5,23 @@ function Node_Invert(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 1] = nodeValue_Surface("Mask", self); - inputs[| 2] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - inputs[| 4] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 4] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(1); // inputs 5, 6 - inputs[| 7] = nodeValue("Include Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 7] = nodeValue_Bool("Include Alpha", self, false); input_display_list = [ 3, 4, 7, ["Surfaces", true], 0, 1, 2, 5, 6, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_isosurf/node_isosurf.gml b/scripts/node_isosurf/node_isosurf.gml index 505691866..70d88ba03 100644 --- a/scripts/node_isosurf/node_isosurf.gml +++ b/scripts/node_isosurf/node_isosurf.gml @@ -1,7 +1,7 @@ function Node_IsoSurf(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "IsoSurf"; - inputs[| 0] = nodeValue("Direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 0] = nodeValue_Int("Direction", self, 4) .setValidator(VV_min(1)); inputs[| 1] = nodeValue_Surface("Surfaces", self) @@ -10,15 +10,14 @@ function Node_IsoSurf(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 2] = nodeValue_Rotation("Angle Shift", self, 0); - inputs[| 3] = nodeValue("Angle Split", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0 * 90, 1 * 90, 2 * 90, 3 * 90 ]) + inputs[| 3] = nodeValue_Float("Angle Split", self, [ 0 * 90, 1 * 90, 2 * 90, 3 * 90 ]) .setArrayDynamic() .setArrayDepth(1); - inputs[| 4] = nodeValue("Offsets", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Offsets", self, []) .setArrayDepth(1); - outputs[| 0] = nodeValue("IsoSurf", self, JUNCTION_CONNECT.output, VALUE_TYPE.dynaSurface, noone); + outputs[| 0] = nodeValue_Output("IsoSurf", self, VALUE_TYPE.dynaSurface, noone); knob_select = noone; knob_hover = noone; diff --git a/scripts/node_iterate/node_iterate.gml b/scripts/node_iterate/node_iterate.gml index 32a128a7f..aa300f206 100644 --- a/scripts/node_iterate/node_iterate.gml +++ b/scripts/node_iterate/node_iterate.gml @@ -1,7 +1,7 @@ function Node_Iterate(_x, _y, _group = noone) : Node_Iterator(_x, _y, _group) constructor { name = "Loop"; - inputs[| 0] = nodeValue("Repeat", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ) + inputs[| 0] = nodeValue_Int("Repeat", self, 1 ) .uncache(); custom_input_index = ds_list_size(inputs); diff --git a/scripts/node_iterate_each/node_iterate_each.gml b/scripts/node_iterate_each/node_iterate_each.gml index 08f3653ba..8e446b674 100644 --- a/scripts/node_iterate_each/node_iterate_each.gml +++ b/scripts/node_iterate_each/node_iterate_each.gml @@ -4,7 +4,7 @@ function Node_Iterate_Each(_x, _y, _group = noone) : Node_Iterator(_x, _y, _grou inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, [] ) .setVisible(true, true); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, [] ); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, [] ); custom_input_index = ds_list_size(inputs); custom_output_index = ds_list_size(inputs); diff --git a/scripts/node_iterate_filter/node_iterate_filter.gml b/scripts/node_iterate_filter/node_iterate_filter.gml index 0a696e189..cd25bdc7e 100644 --- a/scripts/node_iterate_filter/node_iterate_filter.gml +++ b/scripts/node_iterate_filter/node_iterate_filter.gml @@ -4,7 +4,7 @@ function Node_Iterate_Filter(_x, _y, _group = noone) : Node_Iterator(_x, _y, _gr inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, [] ) .setVisible(true, true); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, noone ); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, noone ); custom_input_index = ds_list_size(inputs); custom_output_index = ds_list_size(inputs); diff --git a/scripts/node_iterate_inline/node_iterate_inline.gml b/scripts/node_iterate_inline/node_iterate_inline.gml index fcc414ea4..b55664be5 100644 --- a/scripts/node_iterate_inline/node_iterate_inline.gml +++ b/scripts/node_iterate_inline/node_iterate_inline.gml @@ -6,7 +6,7 @@ function Node_Iterate_Inline(_x, _y, _group = noone) : Node_Collection_Inline(_x is_root = false; - inputs[| 0] = nodeValue("Repeat", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ) + inputs[| 0] = nodeValue_Int("Repeat", self, 1 ) .uncache(); managedRenderOrder = true; diff --git a/scripts/node_iterate_sort/node_iterate_sort.gml b/scripts/node_iterate_sort/node_iterate_sort.gml index 2974b3429..0eac839eb 100644 --- a/scripts/node_iterate_sort/node_iterate_sort.gml +++ b/scripts/node_iterate_sort/node_iterate_sort.gml @@ -9,7 +9,7 @@ function Node_Iterate_Sort(_x, _y, _group = noone) : Node_Collection(_x, _y, _gr inputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, [] ) .setVisible(true, true); - outputs[| 0] = nodeValue("Array", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, noone ); + outputs[| 0] = nodeValue_Output("Array", self, VALUE_TYPE.any, noone ); topoList = []; diff --git a/scripts/node_iterator_each_inline_input/node_iterator_each_inline_input.gml b/scripts/node_iterator_each_inline_input/node_iterator_each_inline_input.gml index f0729de1f..e1dc814e5 100644 --- a/scripts/node_iterator_each_inline_input/node_iterator_each_inline_input.gml +++ b/scripts/node_iterator_each_inline_input/node_iterator_each_inline_input.gml @@ -11,7 +11,7 @@ function Node_Iterator_Each_Inline_Input(_x, _y, _group = noone) : Node(_x, _y, inputs[| 0] = nodeValue("Array in", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, [] ) .setVisible(true, true); - outputs[| 0] = nodeValue("Value in", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0 ); + outputs[| 0] = nodeValue_Output("Value in", self, VALUE_TYPE.any, 0 ); static onGetPreviousNodes = function(arr) { array_push(arr, loop); diff --git a/scripts/node_iterator_each_inline_output/node_iterator_each_inline_output.gml b/scripts/node_iterator_each_inline_output/node_iterator_each_inline_output.gml index cbf56f00f..a53d62bf1 100644 --- a/scripts/node_iterator_each_inline_output/node_iterator_each_inline_output.gml +++ b/scripts/node_iterator_each_inline_output/node_iterator_each_inline_output.gml @@ -11,7 +11,7 @@ function Node_Iterator_Each_Inline_Output(_x, _y, _group = noone) : Node(_x, _y, inputs[| 0] = nodeValue("Value out", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0 ) .setVisible(true, true); - outputs[| 0] = nodeValue("Array out", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, [] ); + outputs[| 0] = nodeValue_Output("Array out", self, VALUE_TYPE.any, [] ); static getNextNodes = function() { #region if(loop.bypassNextNode()) diff --git a/scripts/node_iterator_each_input/node_iterator_each_input.gml b/scripts/node_iterator_each_input/node_iterator_each_input.gml index 2c1cacebe..44ea17ea1 100644 --- a/scripts/node_iterator_each_input/node_iterator_each_input.gml +++ b/scripts/node_iterator_each_input/node_iterator_each_input.gml @@ -5,7 +5,7 @@ function Node_Iterator_Each_Input(_x, _y, _group = noone) : Node(_x, _y, _group) manual_deletable = false; - outputs[| 0] = nodeValue("Value in", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0 ); + outputs[| 0] = nodeValue_Output("Value in", self, VALUE_TYPE.any, 0 ); outputs[| 0].getValueDefault = method(outputs[| 0], outputs[| 0].getValueRecursive); //Get value from outside loop diff --git a/scripts/node_iterator_each_output/node_iterator_each_output.gml b/scripts/node_iterator_each_output/node_iterator_each_output.gml index 1165a4814..ffa1da1b7 100644 --- a/scripts/node_iterator_each_output/node_iterator_each_output.gml +++ b/scripts/node_iterator_each_output/node_iterator_each_output.gml @@ -8,7 +8,7 @@ function Node_Iterator_Each_Output(_x, _y, _group = noone) : Node(_x, _y, _group inputs[| 0] = nodeValue("Value out", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0 ) .setVisible(true, true); - outputs[| 0] = nodeValue("Preview", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0 ) + outputs[| 0] = nodeValue_Output("Preview", self, VALUE_TYPE.any, 0 ) .setVisible(false, false); static getNextNodes = function() { #region diff --git a/scripts/node_iterator_each_size/node_iterator_each_size.gml b/scripts/node_iterator_each_size/node_iterator_each_size.gml index f7a28c466..32f856660 100644 --- a/scripts/node_iterator_each_size/node_iterator_each_size.gml +++ b/scripts/node_iterator_each_size/node_iterator_each_size.gml @@ -5,7 +5,7 @@ function Node_Iterator_Each_Length(_x, _y, _group = noone) : Node(_x, _y, _group setDimension(96, 48); - outputs[| 0] = nodeValue("Length", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); + outputs[| 0] = nodeValue_Output("Length", self, VALUE_TYPE.integer, 0); static update = function(frame = CURRENT_FRAME) { if(!variable_struct_exists(group, "iterated")) return; diff --git a/scripts/node_iterator_filter_inline_input/node_iterator_filter_inline_input.gml b/scripts/node_iterator_filter_inline_input/node_iterator_filter_inline_input.gml index 5f0b7e283..3148bdaa0 100644 --- a/scripts/node_iterator_filter_inline_input/node_iterator_filter_inline_input.gml +++ b/scripts/node_iterator_filter_inline_input/node_iterator_filter_inline_input.gml @@ -11,7 +11,7 @@ function Node_Iterator_Filter_Inline_Input(_x, _y, _group = noone) : Node(_x, _y inputs[| 0] = nodeValue("Array in", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, [] ) .setVisible(true, true); - outputs[| 0] = nodeValue("Value in", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0 ); + outputs[| 0] = nodeValue_Output("Value in", self, VALUE_TYPE.any, 0 ); static onGetPreviousNodes = function(arr) { array_push(arr, loop); diff --git a/scripts/node_iterator_filter_inline_output/node_iterator_filter_inline_output.gml b/scripts/node_iterator_filter_inline_output/node_iterator_filter_inline_output.gml index 4ecffcfd6..0a4ca80da 100644 --- a/scripts/node_iterator_filter_inline_output/node_iterator_filter_inline_output.gml +++ b/scripts/node_iterator_filter_inline_output/node_iterator_filter_inline_output.gml @@ -11,10 +11,10 @@ function Node_Iterator_Filter_Inline_Output(_x, _y, _group = noone) : Node(_x, _ inputs[| 0] = nodeValue("Value out", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0 ) .setVisible(true, true); - inputs[| 1] = nodeValue("Filter result", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 1] = nodeValue_Bool("Filter result", self, false ) .setVisible(true, true); - outputs[| 0] = nodeValue("Array out", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, [] ); + outputs[| 0] = nodeValue_Output("Array out", self, VALUE_TYPE.any, [] ); static getNextNodes = function() { #region if(loop.bypassNextNode()) diff --git a/scripts/node_iterator_filter_input/node_iterator_filter_input.gml b/scripts/node_iterator_filter_input/node_iterator_filter_input.gml index 32dee4847..6be6fcdc4 100644 --- a/scripts/node_iterator_filter_input/node_iterator_filter_input.gml +++ b/scripts/node_iterator_filter_input/node_iterator_filter_input.gml @@ -5,7 +5,7 @@ function Node_Iterator_Filter_Input(_x, _y, _group = noone) : Node(_x, _y, _grou manual_deletable = false; - outputs[| 0] = nodeValue("Value in", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0 ); + outputs[| 0] = nodeValue_Output("Value in", self, VALUE_TYPE.any, 0 ); outputs[| 0].getValueDefault = method(outputs[| 0], outputs[| 0].getValueRecursive); //Get value from outside loop outputs[| 0].getValueRecursive = function(arr) { #region if(!variable_struct_exists(group, "iterated")) diff --git a/scripts/node_iterator_filter_output/node_iterator_filter_output.gml b/scripts/node_iterator_filter_output/node_iterator_filter_output.gml index caad6c2ae..19c7721c0 100644 --- a/scripts/node_iterator_filter_output/node_iterator_filter_output.gml +++ b/scripts/node_iterator_filter_output/node_iterator_filter_output.gml @@ -8,7 +8,7 @@ function Node_Iterator_Filter_Output(_x, _y, _group = noone) : Node(_x, _y, _gro inputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, false ) .setVisible(true, true); - inputs[| 1] = nodeValue("Result", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 1] = nodeValue_Bool("Result", self, false ) .setVisible(true, true); static getNextNodes = function() { diff --git a/scripts/node_iterator_index/node_iterator_index.gml b/scripts/node_iterator_index/node_iterator_index.gml index f83b9d4d2..751abbaee 100644 --- a/scripts/node_iterator_index/node_iterator_index.gml +++ b/scripts/node_iterator_index/node_iterator_index.gml @@ -6,7 +6,7 @@ function Node_Iterator_Index(_x, _y, _group = noone) : Node(_x, _y, _group) cons setDimension(96, 48); - outputs[| 0] = nodeValue("Loop index", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); + outputs[| 0] = nodeValue_Output("Loop index", self, VALUE_TYPE.integer, 0); static update = function(frame = CURRENT_FRAME) { #region var gr = is_instanceof(group, Node_Iterator)? group : noone; diff --git a/scripts/node_iterator_input/node_iterator_input.gml b/scripts/node_iterator_input/node_iterator_input.gml index b5f82319a..d3eebd334 100644 --- a/scripts/node_iterator_input/node_iterator_input.gml +++ b/scripts/node_iterator_input/node_iterator_input.gml @@ -36,6 +36,6 @@ function Node_Iterator_Input(_x, _y, _group = noone) : Node_Group_Input(_x, _y, arr[@ 1] = inParent; } - outputs[| 1] = nodeValue("Loop entrance", self, JUNCTION_CONNECT.output, VALUE_TYPE.node, 0) + outputs[| 1] = nodeValue_Output("Loop entrance", self, VALUE_TYPE.node, 0) .nonForward(); } \ No newline at end of file diff --git a/scripts/node_iterator_length/node_iterator_length.gml b/scripts/node_iterator_length/node_iterator_length.gml index 5888f2e37..3d035d1e6 100644 --- a/scripts/node_iterator_length/node_iterator_length.gml +++ b/scripts/node_iterator_length/node_iterator_length.gml @@ -5,7 +5,7 @@ function Node_Iterator_Length(_x, _y, _group = noone) : Node(_x, _y, _group) con manual_ungroupable = false; setDimension(96, 48); - outputs[| 0] = nodeValue("Length", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); + outputs[| 0] = nodeValue_Output("Length", self, VALUE_TYPE.integer, 0); static update = function(frame = CURRENT_FRAME) { #region var gr = is_instanceof(group, Node_Iterator)? group : noone; diff --git a/scripts/node_iterator_sort_inline_input/node_iterator_sort_inline_input.gml b/scripts/node_iterator_sort_inline_input/node_iterator_sort_inline_input.gml index e1cf09b36..33e2ce363 100644 --- a/scripts/node_iterator_sort_inline_input/node_iterator_sort_inline_input.gml +++ b/scripts/node_iterator_sort_inline_input/node_iterator_sort_inline_input.gml @@ -11,9 +11,9 @@ function Node_Iterator_Sort_Inline_Input(_x, _y, _group = noone) : Node(_x, _y, inputs[| 0] = nodeValue("Array in", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, [] ) .setVisible(true, true); - outputs[| 0] = nodeValue("Value 1", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0 ); + outputs[| 0] = nodeValue_Output("Value 1", self, VALUE_TYPE.any, 0 ); - outputs[| 1] = nodeValue("Value 2", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0 ); + outputs[| 1] = nodeValue_Output("Value 2", self, VALUE_TYPE.any, 0 ); startSort = false; diff --git a/scripts/node_iterator_sort_inline_output/node_iterator_sort_inline_output.gml b/scripts/node_iterator_sort_inline_output/node_iterator_sort_inline_output.gml index 3ed58107a..3405fc4d7 100644 --- a/scripts/node_iterator_sort_inline_output/node_iterator_sort_inline_output.gml +++ b/scripts/node_iterator_sort_inline_output/node_iterator_sort_inline_output.gml @@ -8,8 +8,8 @@ function Node_Iterator_Sort_Inline_Output(_x, _y, _group = noone) : Node(_x, _y, inline_parent_object = "Node_Iterate_Sort_Inline"; manual_ungroupable = false; - inputs[| 0] = nodeValue("Swap", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 0] = nodeValue_Bool("Swap", self, false ) .setVisible(true, true); - outputs[| 0] = nodeValue("Array out", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, [] ); + outputs[| 0] = nodeValue_Output("Array out", self, VALUE_TYPE.any, [] ); } \ No newline at end of file diff --git a/scripts/node_iterator_sort_input/node_iterator_sort_input.gml b/scripts/node_iterator_sort_input/node_iterator_sort_input.gml index 5ea582f61..66e5d8692 100644 --- a/scripts/node_iterator_sort_input/node_iterator_sort_input.gml +++ b/scripts/node_iterator_sort_input/node_iterator_sort_input.gml @@ -7,7 +7,7 @@ function Node_Iterator_Sort_Input(_x, _y, _group = noone) : Node(_x, _y, _group) inputs[| 0] = nodeValue("Value in", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0 ) .setVisible(false, false); - outputs[| 0] = nodeValue("Value in", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0 ); + outputs[| 0] = nodeValue_Output("Value in", self, VALUE_TYPE.any, 0 ); attributes.sort_inputs = 0; diff --git a/scripts/node_iterator_sort_output/node_iterator_sort_output.gml b/scripts/node_iterator_sort_output/node_iterator_sort_output.gml index 42789ec2b..74193b6c3 100644 --- a/scripts/node_iterator_sort_output/node_iterator_sort_output.gml +++ b/scripts/node_iterator_sort_output/node_iterator_sort_output.gml @@ -4,7 +4,7 @@ function Node_Iterator_Sort_Output(_x, _y, _group = noone) : Node(_x, _y, _group manual_deletable = false; - inputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 0] = nodeValue_Bool("Result", self, false ) .setVisible(true, true); attributes.sort_inputs = 0; diff --git a/scripts/node_jpeg/node_jpeg.gml b/scripts/node_jpeg/node_jpeg.gml index 81ee68c77..0220de707 100644 --- a/scripts/node_jpeg/node_jpeg.gml +++ b/scripts/node_jpeg/node_jpeg.gml @@ -3,24 +3,23 @@ function Node_JPEG(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; - inputs[| 2] = nodeValue("Patch Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8) + inputs[| 2] = nodeValue_Int("Patch Size", self, 8) .setValidator(VV_min(1)); - inputs[| 3] = nodeValue("Compression", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 10); + inputs[| 3] = nodeValue_Float("Compression", self, 10); - inputs[| 4] = nodeValue("Reconstruction", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8) + inputs[| 4] = nodeValue_Int("Reconstruction", self, 8) .setValidator(VV_min(0)); inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 7] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(5); // inputs 8, 9 @@ -28,11 +27,11 @@ function Node_JPEG(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 11] = nodeValue_Rotation("Phase", self, 0); - inputs[| 12] = nodeValue("Deconstruct Only", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 12] = nodeValue_Bool("Deconstruct Only", self, false) - inputs[| 13] = nodeValue("Reconstruct All", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 13] = nodeValue_Bool("Reconstruct All", self, false) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surface", false], 0, 5, 6, 7, diff --git a/scripts/node_json_file_read/node_json_file_read.gml b/scripts/node_json_file_read/node_json_file_read.gml index f5828df94..540da9ff8 100644 --- a/scripts/node_json_file_read/node_json_file_read.gml +++ b/scripts/node_json_file_read/node_json_file_read.gml @@ -29,14 +29,14 @@ function Node_Json_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) cons w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "JSON file|*.json" }) .rejectArray(); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, "") + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.path, "") .setVisible(true, true); - outputs[| 1] = nodeValue("Struct", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); + outputs[| 1] = nodeValue_Output("Struct", self, VALUE_TYPE.struct, {}); content = {}; path_current = ""; diff --git a/scripts/node_json_file_write/node_json_file_write.gml b/scripts/node_json_file_write/node_json_file_write.gml index 76721b05b..7047a49d4 100644 --- a/scripts/node_json_file_write/node_json_file_write.gml +++ b/scripts/node_json_file_write/node_json_file_write.gml @@ -4,11 +4,11 @@ function Node_Json_File_Write(_x, _y, _group = noone) : Node(_x, _y, _group) con w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_save, { filter: "json file|*.json" }) .rejectArray(); - inputs[| 1] = nodeValue("Struct", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, {}) + inputs[| 1] = nodeValue_Struct("Struct", self, {}) .setVisible(true, true); input_display_list = [ 0, 1 ] diff --git a/scripts/node_kuwahara/node_kuwahara.gml b/scripts/node_kuwahara/node_kuwahara.gml index 241e511c0..e8cadba82 100644 --- a/scripts/node_kuwahara/node_kuwahara.gml +++ b/scripts/node_kuwahara/node_kuwahara.gml @@ -3,26 +3,25 @@ function Node_Kuwahara(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; - inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2) + inputs[| 2] = nodeValue_Int("Radius", self, 2) .setValidator(VV_min(1)); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", true], 0, 3, 4, 7, 8, diff --git a/scripts/node_lerp/node_lerp.gml b/scripts/node_lerp/node_lerp.gml index 151c92aa6..f1af47906 100644 --- a/scripts/node_lerp/node_lerp.gml +++ b/scripts/node_lerp/node_lerp.gml @@ -4,12 +4,11 @@ function Node_Lerp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons setDimension(96, 48); - inputs[| 0] = nodeValue("a", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); - inputs[| 1] = nodeValue("b", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); - inputs[| 2] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 0] = nodeValue_Float("a", self, 0); + inputs[| 1] = nodeValue_Float("b", self, 0); + inputs[| 2] = nodeValue_Slider_Range("Progress", self, 0); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.float, 0); static processData = function(_output, _data, _output_index, _array_index = 0) { return lerp(_data[0], _data[1], _data[2]); diff --git a/scripts/node_level/node_level.gml b/scripts/node_level/node_level.gml index 6d7326296..7b50b9678 100644 --- a/scripts/node_level/node_level.gml +++ b/scripts/node_level/node_level.gml @@ -3,50 +3,39 @@ function Node_Level(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("White in", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 1] = nodeValue_Slider_Range("White in", self, [0, 1]); - inputs[| 2] = nodeValue("Red in", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 2] = nodeValue_Slider_Range("Red in", self, [0, 1]); - inputs[| 3] = nodeValue("Green in", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 3] = nodeValue_Slider_Range("Green in", self, [0, 1]); - inputs[| 4] = nodeValue("Blue in", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 4] = nodeValue_Slider_Range("Blue in", self, [0, 1]); - inputs[| 5] = nodeValue("Alpha in", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 5] = nodeValue_Slider_Range("Alpha in", self, [0, 1]); inputs[| 6] = nodeValue_Surface("Mask", self); - inputs[| 7] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 7] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Active", self, true); active_index = 8; - inputs[| 9] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 9] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(6); // inputs 10, 11 - inputs[| 12] = nodeValue("White out", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 12] = nodeValue_Slider_Range("White out", self, [0, 1]); - inputs[| 13] = nodeValue("Red out", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 13] = nodeValue_Slider_Range("Red out", self, [0, 1]); - inputs[| 14] = nodeValue("Green out", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 14] = nodeValue_Slider_Range("Green out", self, [0, 1]); - inputs[| 15] = nodeValue("Blue out", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 15] = nodeValue_Slider_Range("Blue out", self, [0, 1]); - inputs[| 16] = nodeValue("Alpha out", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 16] = nodeValue_Slider_Range("Alpha out", self, [0, 1]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_level_selector/node_level.gml b/scripts/node_level_selector/node_level.gml index 023ca786a..9fff29599 100644 --- a/scripts/node_level_selector/node_level.gml +++ b/scripts/node_level_selector/node_level.gml @@ -12,13 +12,13 @@ function Node_Level(_x, _y) : Node_Processor(_x, _y) constructor { inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Black", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Black", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "White", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "White", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ 0, 1, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_outSurf, _data, _output_index) { var _black = _data[1]; diff --git a/scripts/node_level_selector/node_level_selector.gml b/scripts/node_level_selector/node_level_selector.gml index 98f0bf049..8e0c130a5 100644 --- a/scripts/node_level_selector/node_level_selector.gml +++ b/scripts/node_level_selector/node_level_selector.gml @@ -3,24 +3,23 @@ function Node_Level_Selector(_x, _y, _group = noone) : Node_Processor(_x, _y, _g inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Midpoint", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("Midpoint", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(9); - inputs[| 2] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 2] = nodeValue_Float("Range", self, 0.1) .setDisplay(VALUE_DISPLAY.slider) .setMappable(10); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8, @@ -32,9 +31,9 @@ function Node_Level_Selector(_x, _y, _group = noone) : Node_Processor(_x, _y, _g ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 11] = nodeValue("Keep Original", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Keep Original", self, false); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_line/node_line.gml b/scripts/node_line/node_line.gml index 6fb39298c..5a7e47279 100644 --- a/scripts/node_line/node_line.gml +++ b/scripts/node_line/node_line.gml @@ -3,78 +3,73 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Background", self, false); - inputs[| 2] = nodeValue("Segment", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 2] = nodeValue_Int("Segment", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 32, 0.1] }); - inputs[| 3] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 2, 2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Width", self, [ 2, 2 ]); - inputs[| 4] = nodeValue("Wiggle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 4] = nodeValue_Float("Wiggle", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 16, 0.01] }); - inputs[| 5] = nodeValue("Random seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 5] = nodeValue_Float("Random seed", self, 0); inputs[| 6] = nodeValue_Rotation("Rotation", self, 0); - inputs[| 7] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone, "Draw line along path.") + inputs[| 7] = nodeValue_PathNode("Path", self, noone, "Draw line along path.") .setVisible(true, true); - inputs[| 8] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1], "Range of the path to draw.") - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 8] = nodeValue_Slider_Range("Range", self, [0, 1]) + .setTooltip("Range of the path to draw."); - inputs[| 9] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 9] = nodeValue_Float("Shift", self, 0); - inputs[| 10] = nodeValue("Color over length", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); + inputs[| 10] = nodeValue_Gradient("Color over length", self, new gradientObject(cola(c_white))); inputs[| 11] = nodeValue("Width over length", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 12] = nodeValue("Span width over path", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Apply the full 'width over length' to the trimmed path."); + inputs[| 12] = nodeValue_Bool("Span width over path", self, false, "Apply the full 'width over length' to the trimmed path."); - inputs[| 13] = nodeValue("Round cap", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 13] = nodeValue_Bool("Round cap", self, false); - inputs[| 14] = nodeValue("Round segment", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 14] = nodeValue_Int("Round segment", self, 4) .setDisplay(VALUE_DISPLAY.slider, { range: [2, 16, 0.1] }); - inputs[| 15] = nodeValue("Span color over path", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Apply the full 'color over length' to the trimmed path."); + inputs[| 15] = nodeValue_Bool("Span color over path", self, false, "Apply the full 'color over length' to the trimmed path."); - inputs[| 16] = nodeValue("Width pass", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 16] = nodeValue_Bool("Width pass", self, false); - inputs[| 17] = nodeValue("1px mode", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Render pixel perfect 1px line."); + inputs[| 17] = nodeValue_Bool("1px mode", self, false, "Render pixel perfect 1px line."); inputs[| 18] = nodeValue_Surface("Texture", self); - inputs[| 19] = nodeValue("Fix length", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Fix length of each segment instead of segment count."); + inputs[| 19] = nodeValue_Bool("Fix length", self, false, "Fix length of each segment instead of segment count."); - inputs[| 20] = nodeValue("Segment length", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4); + inputs[| 20] = nodeValue_Float("Segment length", self, 4); - inputs[| 21] = nodeValue("Texture position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 21] = nodeValue_Vector("Texture position", self, [ 0, 0 ]); inputs[| 22] = nodeValue_Rotation("Texture Rotation", self, 0); - inputs[| 23] = nodeValue("Texture scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 23] = nodeValue_Vector("Texture scale", self, [ 1, 1 ]); - inputs[| 24] = nodeValue("Random Blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ); + inputs[| 24] = nodeValue_Gradient("Random Blend", self, new gradientObject(cola(c_white))); - inputs[| 25] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 25] = nodeValue_Bool("Invert", self, false ); - inputs[| 26] = nodeValue("Clamp range", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 26] = nodeValue_Bool("Clamp range", self, false ); inputs[| 27] = nodeValue_Enum_Scroll("Data Type", self, 1, [ "None", "Path", "Segments" ]); - inputs[| 28] = nodeValue("Segments", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [[]]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 28] = nodeValue_Vector("Segments", self, [[]]) .setArrayDepth(2); - inputs[| 29] = nodeValue("Scale texture to length", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 29] = nodeValue_Bool("Scale texture to length", self, true ); - inputs[| 30] = nodeValue("Use Path Bounding box", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 30] = nodeValue_Bool("Use Path Bounding box", self, false ); - inputs[| 31] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 31] = nodeValue_Padding("Padding", self, [ 0, 0, 0, 0 ]) input_display_list = [ ["Output", true], 0, 1, 30, 31, @@ -85,9 +80,9 @@ function Node_Line(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons ["Texture", false], 18, 21, 22, 23, 29, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Width Pass", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Width Pass", self, VALUE_TYPE.surface, noone); lines = []; line_data = []; diff --git a/scripts/node_local_analyze/node_local_analyze.gml b/scripts/node_local_analyze/node_local_analyze.gml index 5c9976a47..d1ff63bcd 100644 --- a/scripts/node_local_analyze/node_local_analyze.gml +++ b/scripts/node_local_analyze/node_local_analyze.gml @@ -5,7 +5,7 @@ function Node_Local_Analyze(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 1] = nodeValue_Enum_Scroll("Algorithm", self, 0, [ "Average (Blur)", "Maximum", "Minimum" ]); - inputs[| 2] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Size", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 1, 16, 0.1] }); inputs[| 3] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -17,18 +17,17 @@ function Node_Local_Analyze(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; - inputs[| 8] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 8] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(5); // inputs 9, 10 - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 7, 8, ["Surfaces", true], 0, 5, 6, 9, 10, diff --git a/scripts/node_logic/node_logic.gml b/scripts/node_logic/node_logic.gml index a52e5536b..d072f0649 100644 --- a/scripts/node_logic/node_logic.gml +++ b/scripts/node_logic/node_logic.gml @@ -40,13 +40,13 @@ function Node_Logic(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { new scrollItem("Xor" , s_node_logic, 5), ]) .rejectArray(); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.boolean, false); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.boolean, false); static createNewInput = function() { var index = ds_list_size(inputs); var jname = chr(ord("a") + index - 1); - inputs[| index] = nodeValue(jname, self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| index] = nodeValue_Bool(jname, self, false ) .setVisible(true, true); return inputs[| index]; diff --git a/scripts/node_lovify/node_lovify.gml b/scripts/node_lovify/node_lovify.gml index e407756b6..b76e77fb4 100644 --- a/scripts/node_lovify/node_lovify.gml +++ b/scripts/node_lovify/node_lovify.gml @@ -4,16 +4,16 @@ function Node_Lovify(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 1] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 2] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 2] = nodeValue_Float("Density", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Distribution", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1 ) + inputs[| 3] = nodeValue_Float("Distribution", self, 0.1 ) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", false], 0, diff --git a/scripts/node_lua_compute/node_lua_compute.gml b/scripts/node_lua_compute/node_lua_compute.gml index 25d1d7382..7937e659a 100644 --- a/scripts/node_lua_compute/node_lua_compute.gml +++ b/scripts/node_lua_compute/node_lua_compute.gml @@ -2,21 +2,21 @@ function Node_Lua_Compute(_x, _y, _group = noone) : Node(_x, _y, _group) constru name = "Lua Compute"; update_on_frame = true; - inputs[| 0] = nodeValue("Function name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "render" + string(irandom_range(100000, 999999))); + inputs[| 0] = nodeValue_Text("Function name", self, "render" + string(irandom_range(100000, 999999))); inputs[| 1] = nodeValue_Enum_Scroll("Return type", self, 0, { data: [ "Number", "String", "Struct" ], update_hover: false }); - inputs[| 2] = nodeValue("Lua code", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "", o_dialog_lua_reference) + inputs[| 2] = nodeValue_Text("Lua code", self, "", o_dialog_lua_reference) .setDisplay(VALUE_DISPLAY.codeLUA); inputs[| 3] = nodeValue("Execution thread", self, JUNCTION_CONNECT.input, VALUE_TYPE.node, noone) .setVisible(false, true); - inputs[| 4] = nodeValue("Execute on frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 4] = nodeValue_Bool("Execute on frame", self, true) - outputs[| 0] = nodeValue("Execution thread", self, JUNCTION_CONNECT.output, VALUE_TYPE.node, noone ); + outputs[| 0] = nodeValue_Output("Execution thread", self, VALUE_TYPE.node, noone ); - outputs[| 1] = nodeValue("Return value", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Return value", self, VALUE_TYPE.surface, noone); argumentRenderer(global.lua_arguments); @@ -34,12 +34,12 @@ function Node_Lua_Compute(_x, _y, _group = noone) : Node(_x, _y, _group) constru static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index + 0] = nodeValue("Argument name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ); + inputs[| index + 0] = nodeValue_Text("Argument name", self, "" ); inputs[| index + 1] = nodeValue_Enum_Scroll("Argument type", self, 0 , { data: [ "Number", "String", "Surface", "Struct" ], update_hover: false }); inputs[| index + 1].editWidget.interactable = false; - inputs[| index + 2] = nodeValue("Argument value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| index + 2] = nodeValue_Float("Argument value", self, 0 ) .setVisible(true, true); inputs[| index + 2].editWidget.interactable = false; diff --git a/scripts/node_lua_global/node_lua_global.gml b/scripts/node_lua_global/node_lua_global.gml index bfc6b28ce..b4c8ae3db 100644 --- a/scripts/node_lua_global/node_lua_global.gml +++ b/scripts/node_lua_global/node_lua_global.gml @@ -2,7 +2,7 @@ function Node_Lua_Global(_x, _y, _group = noone) : Node(_x, _y, _group) construc name = "Lua Global"; preview_channel = 1; - inputs[| 0] = nodeValue("Lua code", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "", o_dialog_lua_reference) + inputs[| 0] = nodeValue_Text("Lua code", self, "", o_dialog_lua_reference) .setDisplay(VALUE_DISPLAY.codeLUA); inputs[| 1] = nodeValue_Enum_Scroll("Run order", self, 0, [ "On start", "Every frame" ]); @@ -10,7 +10,7 @@ function Node_Lua_Global(_x, _y, _group = noone) : Node(_x, _y, _group) construc inputs[| 2] = nodeValue("Execution thread", self, JUNCTION_CONNECT.input, VALUE_TYPE.node, noone) .setVisible(false, true); - outputs[| 0] = nodeValue("Execution thread", self, JUNCTION_CONNECT.output, VALUE_TYPE.node, noone ); + outputs[| 0] = nodeValue_Output("Execution thread", self, VALUE_TYPE.node, noone ); input_display_list = [ ["Main", false], 2, 1, 0, diff --git a/scripts/node_lua_surface/node_lua_surface.gml b/scripts/node_lua_surface/node_lua_surface.gml index 91914e5d5..29d4affea 100644 --- a/scripts/node_lua_surface/node_lua_surface.gml +++ b/scripts/node_lua_surface/node_lua_surface.gml @@ -3,22 +3,21 @@ function Node_Lua_Surface(_x, _y, _group = noone) : Node(_x, _y, _group) constru preview_channel = 1; update_on_frame = true; - inputs[| 0] = nodeValue("Function name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "render" + string(irandom_range(100000, 999999))); + inputs[| 0] = nodeValue_Text("Function name", self, "render" + string(irandom_range(100000, 999999))); - inputs[| 1] = nodeValue("Output dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Output dimension", self, DEF_SURF); - inputs[| 2] = nodeValue("Lua code", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "", o_dialog_lua_reference) + inputs[| 2] = nodeValue_Text("Lua code", self, "", o_dialog_lua_reference) .setDisplay(VALUE_DISPLAY.codeLUA); inputs[| 3] = nodeValue("Execution thread", self, JUNCTION_CONNECT.input, VALUE_TYPE.node, noone) .setVisible(false, true); - inputs[| 4] = nodeValue("Execute on frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 4] = nodeValue_Bool("Execute on frame", self, true) - outputs[| 0] = nodeValue("Execution thread", self, JUNCTION_CONNECT.output, VALUE_TYPE.node, noone ); + outputs[| 0] = nodeValue_Output("Execution thread", self, VALUE_TYPE.node, noone ); - outputs[| 1] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); argumentRenderer(global.lua_arguments); @@ -37,12 +36,12 @@ function Node_Lua_Surface(_x, _y, _group = noone) : Node(_x, _y, _group) constru static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index + 0] = nodeValue("Argument name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ); + inputs[| index + 0] = nodeValue_Text("Argument name", self, "" ); inputs[| index + 1] = nodeValue_Enum_Scroll("Argument type", self, 0 , { data: [ "Number", "String", "Surface", "Struct" ], update_hover: false }); inputs[| index + 1].editWidget.interactable = false; - inputs[| index + 2] = nodeValue("Argument value", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| index + 2] = nodeValue_Float("Argument value", self, 0 ) .setVisible(true, true); inputs[| index + 2].editWidget.interactable = false; diff --git a/scripts/node_math/node_math.gml b/scripts/node_math/node_math.gml index db051b9dc..d26b38371 100644 --- a/scripts/node_math/node_math.gml +++ b/scripts/node_math/node_math.gml @@ -84,23 +84,23 @@ function Node_Math(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { /*10 - 20*/ "Floor", "Ceil", "Round", "Lerp", "Abs", "Clamp", "Snap" ]) .rejectArray(); - inputs[| 1] = nodeValue("a", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("a", self, 0) .setVisible(true, true); - inputs[| 2] = nodeValue("b", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("b", self, 0) .setVisible(true, true); - inputs[| 3] = nodeValue("Degree angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Degree angle", self, true); - inputs[| 4] = nodeValue("To integer", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 4] = nodeValue_Bool("To integer", self, false); - inputs[| 5] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 5] = nodeValue_Float("Amount", self, 0); input_display_list = [ 0, 1, 2, 5, 3, 4, ] - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.float, 0); use_mod = 0; use_deg = false; diff --git a/scripts/node_mesh_create_path/node_mesh_create_path.gml b/scripts/node_mesh_create_path/node_mesh_create_path.gml index d2d6c9480..9ed1c2845 100644 --- a/scripts/node_mesh_create_path/node_mesh_create_path.gml +++ b/scripts/node_mesh_create_path/node_mesh_create_path.gml @@ -3,14 +3,14 @@ function Node_Mesh_Create_Path(_x, _y, _group = noone) : Node(_x, _y, _group) co setDimension(96, 48); - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Sample", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8); + inputs[| 1] = nodeValue_Int("Sample", self, 8); inputs[| 2] = nodeValue_Enum_Scroll("Algorithm", self, 0, [ "Ear Clipping", "Convex Fan", "Delaunay" ]); - outputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.output, VALUE_TYPE.mesh, noone); + outputs[| 0] = nodeValue_Output("Mesh", self, VALUE_TYPE.mesh, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var mesh = outputs[| 0].getValue(); diff --git a/scripts/node_mesh_to_path/node_mesh_to_path.gml b/scripts/node_mesh_to_path/node_mesh_to_path.gml index 8773c77da..85160bb41 100644 --- a/scripts/node_mesh_to_path/node_mesh_to_path.gml +++ b/scripts/node_mesh_to_path/node_mesh_to_path.gml @@ -6,7 +6,7 @@ function Node_Mesh_To_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.mesh, noone) .setVisible(true, true); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, noone); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, noone); segments = []; length = 0; diff --git a/scripts/node_mesh_transform/node_mesh_transform.gml b/scripts/node_mesh_transform/node_mesh_transform.gml index 04c7cffed..16f1f5ed2 100644 --- a/scripts/node_mesh_transform/node_mesh_transform.gml +++ b/scripts/node_mesh_transform/node_mesh_transform.gml @@ -5,18 +5,15 @@ function Node_Mesh_Transform(_x, _y, _group = noone) : Node(_x, _y, _group) cons inputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.mesh, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]); inputs[| 2] = nodeValue_Rotation("Rotation", self, 0); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Scale", self, [ 1, 1 ]); - inputs[| 4] = nodeValue("Anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Anchor", self, [ 0, 0 ]); - outputs[| 0] = nodeValue("Mesh", self, JUNCTION_CONNECT.output, VALUE_TYPE.mesh, noone); + outputs[| 0] = nodeValue_Output("Mesh", self, VALUE_TYPE.mesh, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var imesh = getInputData(0); diff --git a/scripts/node_mesh_warp/node_mesh_warp.gml b/scripts/node_mesh_warp/node_mesh_warp.gml index 04d2a9d8d..e54bb1ee9 100644 --- a/scripts/node_mesh_warp/node_mesh_warp.gml +++ b/scripts/node_mesh_warp/node_mesh_warp.gml @@ -156,36 +156,36 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Sample", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8, "Amount of grid subdivision. Higher number means more grid, detail.") + inputs[| 1] = nodeValue_Int("Sample", self, 8, "Amount of grid subdivision. Higher number means more grid, detail.") .setDisplay(VALUE_DISPLAY.slider, { range: [ 2, 32, 0.1 ] }); - inputs[| 2] = nodeValue("Spring Force", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Spring Force", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 3] = nodeValue_Trigger("Mesh", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Generate", UI : true, onClick: function() { Mesh_setTriangle(); } }); - inputs[| 4] = nodeValue("Diagonal Link", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Include diagonal link to prevent drastic grid deformation."); + inputs[| 4] = nodeValue_Bool("Diagonal Link", self, false, "Include diagonal link to prevent drastic grid deformation."); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Link Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0, "Link length preservation, setting it to 1 will prevent any stretching, contraction.") + inputs[| 6] = nodeValue_Float("Link Strength", self, 0, "Link length preservation, setting it to 1 will prevent any stretching, contraction.") .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Full Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 7] = nodeValue_Bool("Full Mesh", self, false); inputs[| 8] = nodeValue_Enum_Scroll("Mesh Type", self, 0, [ new scrollItem("Grid", s_node_mesh_type, 0), new scrollItem("Custom", s_node_mesh_type, 1), ] ); - inputs[| 9] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 9] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 9].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Mesh data", self, JUNCTION_CONNECT.output, VALUE_TYPE.object, mesh_data); + outputs[| 1] = nodeValue_Output("Mesh data", self, VALUE_TYPE.object, mesh_data); input_display_list = [ 5, ["Mesh", false], 0, 8, 9, 1, 7, 3, @@ -197,7 +197,7 @@ function Node_Mesh_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) function createControl() { #region var index = ds_list_size(inputs); - inputs[| index] = nodeValue("Control point", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ PUPPET_FORCE_MODE.move, 16, 16, 8, 0, 8, 8 ]) + inputs[| index] = nodeValue_Float("Control point", self, [ PUPPET_FORCE_MODE.move, 16, 16, 8, 0, 8, 8 ]) .setDisplay(VALUE_DISPLAY.puppet_control) array_push(input_display_list, index); diff --git a/scripts/node_midi_in/node_midi_in.gml b/scripts/node_midi_in/node_midi_in.gml index 9996e11a3..88be33ad9 100644 --- a/scripts/node_midi_in/node_midi_in.gml +++ b/scripts/node_midi_in/node_midi_in.gml @@ -16,11 +16,11 @@ function Node_MIDI_In(_x, _y, _group = noone) : Node(_x, _y, _group) constructor inputs[| 0] = nodeValue_Enum_Scroll("Input", self, 0, { data: _miniNames, update_hover: false }) .rejectArray(); - outputs[| 0] = nodeValue("Raw Message", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []); + outputs[| 0] = nodeValue_Output("Raw Message", self, VALUE_TYPE.float, []); - outputs[| 1] = nodeValue("Pressing notes", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []); + outputs[| 1] = nodeValue_Output("Pressing notes", self, VALUE_TYPE.float, []); - outputs[| 2] = nodeValue("Direct values", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); + outputs[| 2] = nodeValue_Output("Direct values", self, VALUE_TYPE.struct, {}); watcher_controllers = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { #region var _h = ui(48); @@ -97,12 +97,12 @@ function Node_MIDI_In(_x, _y, _group = noone) : Node(_x, _y, _group) constructor var _index = ds_list_size(inputs); index_watching = _index; - var _inp = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, -1 ); + var _inp = nodeValue_Int("Index", self, -1 ); _inp.editWidget.slidable = false; ds_list_add(inputs, _inp); ds_list_add(inputs, nodeValue("Normalize", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false )); - ds_list_add(outputs, nodeValue("Value", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, -1 )); + ds_list_add(outputs, nodeValue_Output("Value", self, VALUE_TYPE.float, -1 )); return _inp; } setDynamicInput(2, false); diff --git a/scripts/node_mirror/node_mirror.gml b/scripts/node_mirror/node_mirror.gml index 719b689b0..b0aed8609 100644 --- a/scripts/node_mirror/node_mirror.gml +++ b/scripts/node_mirror/node_mirror.gml @@ -4,18 +4,17 @@ function Node_Mirror(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); inputs[| 2] = nodeValue_Rotation("Angle", self, 0); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Mirror mask", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Mirror mask", self, VALUE_TYPE.surface, noone); input_display_list = [ 3, ["Surfaces", false], 0, diff --git a/scripts/node_mk_blinker/node_mk_blinker.gml b/scripts/node_mk_blinker/node_mk_blinker.gml index a36b62a88..1fba8c4a8 100644 --- a/scripts/node_mk_blinker/node_mk_blinker.gml +++ b/scripts/node_mk_blinker/node_mk_blinker.gml @@ -6,35 +6,33 @@ function Node_MK_Blinker(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 1] = nodeValue_Surface("Mask", self); - inputs[| 2] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 2] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 2].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 3] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 3] = nodeValue_Float("Amount", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Target Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, [ c_black ] ) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 4] = nodeValue_Palette("Target Colors", self, [ c_black ] ); - inputs[| 5] = nodeValue("Light Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, [ c_white ] ) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 5] = nodeValue_Palette("Light Colors", self, [ c_white ] ); - inputs[| 6] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Active", self, true); active_index = 6; - inputs[| 7] = nodeValue("Tolerance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1 ) + inputs[| 7] = nodeValue_Float("Tolerance", self, 0.1 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Glow", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 8] = nodeValue_Bool("Glow", self, false); - inputs[| 9] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ) + inputs[| 9] = nodeValue_Float("Size", self, 4 ) .setDisplay(VALUE_DISPLAY.slider, { range : [ 1, 8, 0.1 ] }); - inputs[| 10] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 10] = nodeValue_Float("Strength", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Light only", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Light only", self, VALUE_TYPE.surface, noone); input_display_list = [ new Inspector_Sprite(s_MKFX), 6, ["Surfaces", false], 0, 1, diff --git a/scripts/node_mk_brownian/node_mk_brownian.gml b/scripts/node_mk_brownian/node_mk_brownian.gml index 7b11cc628..bc9475de3 100644 --- a/scripts/node_mk_brownian/node_mk_brownian.gml +++ b/scripts/node_mk_brownian/node_mk_brownian.gml @@ -6,38 +6,32 @@ function Node_MK_Brownian(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 1] = nodeValue_Surface("Sprite", self); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 10); + inputs[| 2] = nodeValue_Int("Amount", self, 10); - inputs[| 3] = nodeValue("Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA) - .setDisplay(VALUE_DISPLAY.area); + inputs[| 3] = nodeValue_Area("Area", self, DEF_AREA); - inputs[| 4] = nodeValue("Direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 45, 135, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.rotation_random); + inputs[| 4] = nodeValue_Rotation_Random("Direction", self, [ 0, 45, 135, 0, 0 ] ); - inputs[| 5] = nodeValue("Speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 5] = nodeValue_Range("Speed", self, [ 1, 1 ]); - inputs[| 6] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))); + inputs[| 6] = nodeValue_Gradient("Color", self, new gradientObject(cola(c_white))); inputs[| 7] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 8] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 8] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 8].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 9] = nodeValue("Angular speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ -45, 45 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 9] = nodeValue_Range("Angular speed", self, [ -45, 45 ]); - inputs[| 10] = nodeValue("Angular acceleration", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ -2, 2 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 10] = nodeValue_Range("Angular acceleration", self, [ -2, 2 ]); - inputs[| 11] = nodeValue("Turn", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Turn", self, false); inputs[| 12] = nodeValue_Dimension(self); - inputs[| 13] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 13] = nodeValue_Range("Size", self, [ 1, 1 ], { linked : true }); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.surface, noone); input_display_list = [ new Inspector_Sprite(s_MKFX), 8, ["Dimension", false], 0, 12, diff --git a/scripts/node_mk_cable/node_mk_cable.gml b/scripts/node_mk_cable/node_mk_cable.gml index a3669a8bc..7f5d27a45 100644 --- a/scripts/node_mk_cable/node_mk_cable.gml +++ b/scripts/node_mk_cable/node_mk_cable.gml @@ -3,17 +3,15 @@ function Node_MK_Cable(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Point 1", self, [ 0, 0 ]); - inputs[| 2] = nodeValue("Point 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Point 2", self, [ 16, 16 ]); input_display_list = [ new Inspector_Sprite(s_MKFX), 0, ["Saber", false], 1, 2, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var _hov = false; diff --git a/scripts/node_mk_fall/node_mk_fall.gml b/scripts/node_mk_fall/node_mk_fall.gml index 8aea9becf..c7021c04e 100644 --- a/scripts/node_mk_fall/node_mk_fall.gml +++ b/scripts/node_mk_fall/node_mk_fall.gml @@ -6,66 +6,54 @@ function Node_MK_Fall(_x, _y, _group = noone) : Node(_x, _y, _group) constructor inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 2] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 2].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 3] = nodeValue("Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA) - .setDisplay(VALUE_DISPLAY.area); + inputs[| 3] = nodeValue_Area("Area", self, DEF_AREA); - inputs[| 4] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 10); + inputs[| 4] = nodeValue_Int("Amount", self, 10); - inputs[| 5] = nodeValue("Gravity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 5] = nodeValue_Float("Gravity", self, 0); - inputs[| 6] = nodeValue("X Swing", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 6] = nodeValue_Range("X Swing", self, [ 1, 1 ], { linked : true }); - inputs[| 7] = nodeValue("Y Swing", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.25, 0.25 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 7] = nodeValue_Range("Y Swing", self, [ 0.25, 0.25 ], { linked : true }); - inputs[| 8] = nodeValue("Swing frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 8] = nodeValue_Range("Swing frequency", self, [ 1, 1 ], { linked : true }); - inputs[| 9] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 9] = nodeValue_Vector("Size", self, [ 4, 2 ]); - inputs[| 10] = nodeValue("Speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 10] = nodeValue_Range("Speed", self, [ 1, 1 ], { linked : true }); - inputs[| 11] = nodeValue("X Momentum", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 11] = nodeValue_Range("X Momentum", self, [ 0, 0 ], { linked : true }); - inputs[| 12] = nodeValue("Wind", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 12] = nodeValue_Vector("Wind", self, [ 0, 0 ]); - inputs[| 13] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 13] = nodeValue_Gradient("Color", self, new gradientObject(cola(c_white))) inputs[| 14] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 15] = nodeValue("Ground", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 15] = nodeValue_Bool("Ground", self, false); - inputs[| 16] = nodeValue("Ground levels", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ DEF_SURF_H / 2, DEF_SURF_H ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 16] = nodeValue_Range("Ground levels", self, [ DEF_SURF_H / 2, DEF_SURF_H ]); - inputs[| 17] = nodeValue("Y Momentum", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 17] = nodeValue_Range("Y Momentum", self, [ 0, 0 ], { linked : true }); - inputs[| 18] = nodeValue("Twist", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 18] = nodeValue_Bool("Twist", self, false); - inputs[| 19] = nodeValue("Twist Rate", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 19] = nodeValue_Float("Twist Rate", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 20] = nodeValue("Twist Speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 5, 10 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 20] = nodeValue_Range("Twist Speed", self, [ 5, 10 ]); - inputs[| 21] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 21] = nodeValue_Range("Scale", self, [ 1, 1 ], { linked : true }); inputs[| 22] = nodeValue_Enum_Scroll("Render Type", self, 0, [ new scrollItem("Leaf", s_node_shape_leaf, 0), new scrollItem("Circle", s_node_shape_circle, 0) ]); - inputs[| 23] = nodeValue("Twist Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.7) + inputs[| 23] = nodeValue_Float("Twist Radius", self, 0.7) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.surface, noone); input_display_list = [ new Inspector_Sprite(s_MKFX), 2, ["Dimension", false], 0, 1, diff --git a/scripts/node_mk_flag/node_mk_flag.gml b/scripts/node_mk_flag/node_mk_flag.gml index 99645cf74..50230244e 100644 --- a/scripts/node_mk_flag/node_mk_flag.gml +++ b/scripts/node_mk_flag/node_mk_flag.gml @@ -6,34 +6,33 @@ function Node_MK_Flag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 1] = nodeValue_Surface("Texture", self); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0 ]); inputs[| 3] = nodeValue_Enum_Button("Pin side", self, 0, [ "Left", "Right", "Up", "Down" ]); - inputs[| 4] = nodeValue("Subdivision", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8); + inputs[| 4] = nodeValue_Int("Subdivision", self, 8); - inputs[| 5] = nodeValue("Wind speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2); + inputs[| 5] = nodeValue_Float("Wind speed", self, 2); - inputs[| 6] = nodeValue("Wave width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Wave width", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 4, 0.1] }); - inputs[| 7] = nodeValue("Wave size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 7] = nodeValue_Float("Wave size", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Phase", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 8] = nodeValue_Float("Phase", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Clip", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 9] = nodeValue_Float("Clip", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Shadow", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 10] = nodeValue_Float("Shadow", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 11] = nodeValue("Shadow threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 11] = nodeValue_Float("Shadow threshold", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-0.1, 0.1, 0.001] }); - inputs[| 12] = nodeValue("Invert shadow", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 0); + inputs[| 12] = nodeValue_Bool("Invert shadow", self, 0); input_display_list = [ new Inspector_Sprite(s_MKFX), 0, ["Flag", false], 4, 1, 2, 3, @@ -41,7 +40,7 @@ function Node_MK_Flag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c ["Rendering", false], 10, 11, 12, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attributes.iteration = 4; array_push(attributeEditors, "Verlet solver"); diff --git a/scripts/node_mk_flame/node_mk_flame.gml b/scripts/node_mk_flame/node_mk_flame.gml index e7bfacc9f..6a2b4ebe6 100644 --- a/scripts/node_mk_flame/node_mk_flame.gml +++ b/scripts/node_mk_flame/node_mk_flame.gml @@ -10,7 +10,7 @@ function Node_MK_Flame(_x, _y, _group = noone) : Node(_x, _y, _group) constructo ["Shape", false], 1, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); static step = function() { #region diff --git a/scripts/node_mk_flare/node_mk_flare.gml b/scripts/node_mk_flare/node_mk_flare.gml index 9c7a6d1bc..5c7987c88 100644 --- a/scripts/node_mk_flare/node_mk_flare.gml +++ b/scripts/node_mk_flare/node_mk_flare.gml @@ -27,18 +27,17 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Background", self); - inputs[| 1] = nodeValue("Origin", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Origin", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); inputs[| 2] = nodeValue_Dimension(self); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Scale", self, 1) - inputs[| 4] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Alpha", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Flares", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, [ + inputs[| 5] = nodeValue_Struct("Flares", self, [ new __FlarePart( FLARE_TYPE.circle, 0, 8, 0.75, 16, false, , [ 0, 1 ] ), new __FlarePart( FLARE_TYPE.circle, 0, 16, 0.5, 16, false, , [ 0, 1 ] ), new __FlarePart( FLARE_TYPE.star, 0, 14, 0.3, 8, true, , [ 0.2, 0.8 ], 2, 0.85 ), @@ -56,13 +55,12 @@ function Node_MK_Flare(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) .setArrayDepth(1) .setArrayDynamic(); - inputs[| 6] = nodeValue("Focus", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 6] = nodeValue_Vector("Focus", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Light only", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Light only", self, VALUE_TYPE.surface, noone); static __frame = function(_x, _y, _w, _h, _m, _hover) { var _hv = point_in_rectangle(_m[0], _m[1], _x, _y, _x + _w, _y + _h) && _hover; diff --git a/scripts/node_mk_fracture/node_mk_fracture.gml b/scripts/node_mk_fracture/node_mk_fracture.gml index 37914fd81..12d93490c 100644 --- a/scripts/node_mk_fracture/node_mk_fracture.gml +++ b/scripts/node_mk_fracture/node_mk_fracture.gml @@ -3,38 +3,36 @@ function Node_MK_Fracture(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Subdivision", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Subdivision", self, [ 4, 4 ]); - inputs[| 2] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Progress", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) .setMappable(3); inputs[| 3] = nodeValueMap("Progress map", self); - inputs[| 4] = nodeValue("Movement", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Movement", self, [ 0, 0 ]) .setMappable(9, true); inputs[| 5] = nodeValue_Rotation("Rotation", self, 180) .setMappable(10); - inputs[| 6] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 6] = nodeValue_Float("Scale", self, 0.) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.) + inputs[| 7] = nodeValue_Float("Alpha", self, 1.) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Gravity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.); + inputs[| 8] = nodeValue_Float("Gravity", self, 0.); inputs[| 9] = nodeValueMap("Movement map", self); inputs[| 10] = nodeValueMap("Rotation map", self); - inputs[| 11] = nodeValue("Brick Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 11] = nodeValue_Float("Brick Shift", self, 0.) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 12] = nodeValue("Skew", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 12] = nodeValue_Float("Skew", self, 0.) .setDisplay(VALUE_DISPLAY.slider, { range : [ -1, 1, 0.01 ] }); inputs[| 13] = nodeValue_Enum_Button("Brick Axis", self, 0, [ "X", "Y" ]); @@ -45,7 +43,7 @@ function Node_MK_Fracture(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ["Render", false], 7, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region diff --git a/scripts/node_mk_gridballs/node_mk_gridballs.gml b/scripts/node_mk_gridballs/node_mk_gridballs.gml index 1df064fc7..733bb9a9c 100644 --- a/scripts/node_mk_gridballs/node_mk_gridballs.gml +++ b/scripts/node_mk_gridballs/node_mk_gridballs.gml @@ -5,39 +5,37 @@ function Node_MK_GridBalls(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Amount", self, [ 4, 4 ]); inputs[| 3] = nodeValue_Rotation("Light", self, 0); - inputs[| 4] = nodeValue("Scatter", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 4] = nodeValue_Float("Scatter", self, 0); - inputs[| 5] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 5] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 5].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 6] = nodeValue("Shading", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 6] = nodeValue_Float("Shading", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); inputs[| 7] = nodeValue_Rotation("Scatter direction", self, 0); - inputs[| 8] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 8] = nodeValue_Vector("Shift", self, [ 0, 0 ]); - inputs[| 9] = nodeValue("Stretch", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 9] = nodeValue_Float("Stretch", self, 0); inputs[| 10] = nodeValue_Rotation("Stretch direction", self, 0); - inputs[| 11] = nodeValue("Stretch shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 11] = nodeValue_Float("Stretch shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }); - inputs[| 12] = nodeValue("Roundness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Roundness", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 13] = nodeValue("Twist", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 13] = nodeValue_Float("Twist", self, 0); inputs[| 14] = nodeValue_Rotation("Twist axis", self, 0); - inputs[| 15] = nodeValue("Twist shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 15] = nodeValue_Float("Twist shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }); input_display_list = [ new Inspector_Sprite(s_MKFX), 5, 1, @@ -47,7 +45,7 @@ function Node_MK_GridBalls(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro ["Render", false], 12, 3, 6, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_mk_gridflip/node_mk_gridflip.gml b/scripts/node_mk_gridflip/node_mk_gridflip.gml index 6955c3ce6..0c8c12d7b 100644 --- a/scripts/node_mk_gridflip/node_mk_gridflip.gml +++ b/scripts/node_mk_gridflip/node_mk_gridflip.gml @@ -5,10 +5,9 @@ function Node_MK_GridFlip(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Amount", self, [ 4, 4 ]); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 3] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 4] = nodeValue_Surface("Surface back", self); @@ -17,11 +16,11 @@ function Node_MK_GridFlip(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 6] = nodeValue_Enum_Button("Axis", self, 0, [ "X", "Y" ]); - inputs[| 7] = nodeValue("Sweep", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 7] = nodeValue_Float("Sweep", self, 0); inputs[| 8] = nodeValue_Rotation("Sweep direction", self, 0); - inputs[| 9] = nodeValue("Sweep shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 9] = nodeValue_Float("Sweep shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }); inputs[| 10] = nodeValue_Enum_Scroll("Flip limit", self, 0, [ new scrollItem("None", s_node_mk_grid_flip, 0), @@ -34,7 +33,7 @@ function Node_MK_GridFlip(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ["Flip", false], 6, 10, 5, 7, 8, 9, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_mk_rain/node_mk_rain.gml b/scripts/node_mk_rain/node_mk_rain.gml index 52cc2710c..b368a001b 100644 --- a/scripts/node_mk_rain/node_mk_rain.gml +++ b/scripts/node_mk_rain/node_mk_rain.gml @@ -6,47 +6,41 @@ function Node_MK_Rain(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 1] = nodeValue_Rotation("Direction", self, 45); - inputs[| 2] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 5); + inputs[| 2] = nodeValue_Float("Density", self, 5); - inputs[| 3] = nodeValue("Raindrop width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 3] = nodeValue_Range("Raindrop width", self, [ 1, 1 ]); - inputs[| 4] = nodeValue("Raindrop length", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 5, 10 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 4] = nodeValue_Range("Raindrop length", self, [ 5, 10 ]); - inputs[| 5] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))); + inputs[| 5] = nodeValue_Gradient("Color", self, new gradientObject(cola(c_white))); - inputs[| 6] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 6] = nodeValue_Slider_Range("Alpha", self, [ 0.5, 1 ]); - inputs[| 7] = nodeValue("Velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 2 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 7] = nodeValue_Range("Velocity", self, [ 1, 2 ]); - inputs[| 8] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 8] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 8].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 9] = nodeValue_Enum_Scroll("Shape", self, 0, [ new scrollItem("Rain", s_node_mk_rain_type, 0), - new scrollItem("Snow", s_node_mk_rain_type, 1), - new scrollItem("Texture", s_node_mk_rain_type, 2) ]); + new scrollItem("Snow", s_node_mk_rain_type, 1), + new scrollItem("Texture", s_node_mk_rain_type, 2) ]); - inputs[| 10] = nodeValue("Snow size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 3, 4 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 10] = nodeValue_Range("Snow size", self, [ 3, 4 ]); inputs[| 11] = nodeValue_Surface("Texture", self); - inputs[| 12] = nodeValue("Track extension", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.slider_range, { range: [ 0, 10, 0.01 ] }); + inputs[| 12] = nodeValue_Slider_Range("Track extension", self, [ 0, 0 ], { range: [ 0, 10, 0.01 ] }); inputs[| 13] = nodeValue("Size over lifetime", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 14] = nodeValue("Limited lifespan", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 14] = nodeValue_Bool("Limited lifespan", self, false); - inputs[| 15] = nodeValue("Lifespan", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ], "Lifespan of a droplet as a ratio of the entire animation.") - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 15] = nodeValue_Slider_Range("Lifespan", self, [ 0, 1 ]) + .setTooltip("Lifespan of a droplet as a ratio of the entire animation."); inputs[| 16] = nodeValue("Alpha over lifetime", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 17] = nodeValue("Fade alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 17] = nodeValue_Bool("Fade alpha", self, false); input_display_list = [ new Inspector_Sprite(s_MKFX), 0, 8, ["Shape", false], 9, 3, 4, 10, 11, @@ -55,7 +49,7 @@ function Node_MK_Rain(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c ["Render", false], 5, 6, 17, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); static step = function() { #region var _shap = getSingleValue(9); diff --git a/scripts/node_mk_saber/node_mk_saber.gml b/scripts/node_mk_saber/node_mk_saber.gml index 65dd7349f..d3e075f43 100644 --- a/scripts/node_mk_saber/node_mk_saber.gml +++ b/scripts/node_mk_saber/node_mk_saber.gml @@ -3,26 +3,24 @@ function Node_MK_Saber(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Point 1", self, [ 0, 0 ]); - inputs[| 2] = nodeValue("Point 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Point 2", self, [ 16, 16 ]); - inputs[| 3] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2) + inputs[| 3] = nodeValue_Int("Thickness", self, 2) - inputs[| 4] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))) + inputs[| 4] = nodeValue_Gradient("Color", self, new gradientObject(cola(c_white))) - inputs[| 5] = nodeValue("Trace", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 5] = nodeValue_Int("Trace", self, 0); - inputs[| 6] = nodeValue("Fix length", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 6] = nodeValue_Bool("Fix length", self, false); - inputs[| 7] = nodeValue("Gradient step", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 7] = nodeValue_Int("Gradient step", self, 1); - inputs[| 8] = nodeValue("Glow intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 8] = nodeValue_Float("Glow intensity", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Glow radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 9] = nodeValue_Int("Glow radius", self, 0); inputs[| 10] = nodeValue_Surface("Trace texture", self) .setVisible(true, true); @@ -32,7 +30,7 @@ function Node_MK_Saber(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Render", false], 4, 7, 5, 8, 9, 10, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); prev_points = noone; fixed_length = 0; diff --git a/scripts/node_mk_sparkle/node_mk_sparkle.gml b/scripts/node_mk_sparkle/node_mk_sparkle.gml index 883a1684a..6516d6c33 100644 --- a/scripts/node_mk_sparkle/node_mk_sparkle.gml +++ b/scripts/node_mk_sparkle/node_mk_sparkle.gml @@ -6,30 +6,29 @@ function Node_MK_Sparkle(_x, _y, _group = noone) : Node_Processor(_x, _y, _group dimension_index = -1; update_on_frame = true; - inputs[| 0] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 5); + inputs[| 0] = nodeValue_Int("Size", self, 5); inputs[| 1] = nodeValueSeed(self, VALUE_TYPE.float); - inputs[| 2] = nodeValue("Speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Speed", self, 1) .setDisplay(VALUE_DISPLAY.slider) - inputs[| 3] = nodeValue("Shade", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Shade", self, false); - inputs[| 4] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 4] = nodeValue_Float("Amount", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) - inputs[| 5] = nodeValue("Scatter", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 5] = nodeValue_Float("Scatter", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) - inputs[| 6] = nodeValue("Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, [ cola(c_black), cola(c_white) ]) - .setDisplay(VALUE_DISPLAY.palette) + inputs[| 6] = nodeValue_Palette("Colors", self, [ cola(c_black), cola(c_white) ]) - inputs[| 7] = nodeValue("Additive", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 7] = nodeValue_Bool("Additive", self, false) - inputs[| 8] = nodeValue("Diagonal", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 8] = nodeValue_Float("Diagonal", self, 0.2) .setDisplay(VALUE_DISPLAY.slider) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ new Inspector_Sprite(s_MKFX), 1, ["Surfaces", false], 0, @@ -150,20 +149,20 @@ function __Node_MK_Sparkle(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro dimension_index = -1; update_on_frame = true; - inputs[| 0] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 5); + inputs[| 0] = nodeValue_Int("Size", self, 5); - inputs[| 1] = nodeValue("Sparkle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ + inputs[| 1] = nodeValue_Float("Sparkle", self, [ [ MKSPARK_DIRR.main, 0, 0, 2, 1, 0, 0 ], [ MKSPARK_DIRR.main, 0, -1, 1, 1, 0, 0 ], ]) .setArrayDepth(2) .setArrayDynamic(); - inputs[| 2] = nodeValue("Start frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 2] = nodeValue_Int("Start frame", self, 0); - inputs[| 3] = nodeValue("Speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 3] = nodeValue_Float("Speed", self, 1); - inputs[| 4] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, []) + inputs[| 4] = nodeValue_Int("Loop", self, []) .setArrayDepth(1) .setArrayDynamic(); @@ -359,7 +358,7 @@ function __Node_MK_Sparkle(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro sparkleEditor ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); temp_surface = [ noone, noone ]; diff --git a/scripts/node_mk_tile/node_mk_tile.gml b/scripts/node_mk_tile/node_mk_tile.gml index fcf2695e9..f2e642107 100644 --- a/scripts/node_mk_tile/node_mk_tile.gml +++ b/scripts/node_mk_tile/node_mk_tile.gml @@ -10,8 +10,7 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 3] = nodeValue_Enum_Button("Output type", self, 0, [ "Sheet", "Array" ] ); - inputs[| 4] = nodeValue("Crop", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 8, 8, 8, 8 ]) - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 4] = nodeValue_Padding("Crop", self, [ 8, 8, 8, 8 ]); inputs[| 5] = nodeValue_Enum_Button("Edge type", self, 0, [ "Uniform", "Individual" ] ); @@ -20,17 +19,15 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 8] = nodeValue_Surface("Edge left", self); inputs[| 9] = nodeValue_Surface("Edge right", self); - inputs[| 10] = nodeValue("Edge shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 10] = nodeValue_Padding("Edge shift", self, [ 0, 0, 0, 0 ]); - inputs[| 11] = nodeValue("Full edge", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) - .setDisplay(VALUE_DISPLAY.toggle, { data: [ "T", "B", "L", "R" ] }); + inputs[| 11] = nodeValue_Toggle("Full edge", self, 0, { data: [ "T", "B", "L", "R" ] }); inputs[| 12] = nodeValue_Enum_Scroll("Edge sprite", self, 0, [ "Single", "Side + Center", "Side + Center + Side" ] ); inputs[| 13] = nodeValue_Enum_Button("Edge transform", self, 0, [ "Flip", "Rotate" ] ); - inputs[| 14] = nodeValue("Sort array by bit", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 14] = nodeValue_Bool("Sort array by bit", self, true) input_display_list = [ new Inspector_Sprite(s_MKFX), ["Surfaces", true], 0, 1, @@ -40,7 +37,7 @@ function Node_MK_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c ["Output", false], 3, 14, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); temp_surface = array_create(55); for( var i = 0, n = array_length(temp_surface); i < n; i++ ) diff --git a/scripts/node_module_test/node_module_test.gml b/scripts/node_module_test/node_module_test.gml index c2ab3fc7f..02d038a41 100644 --- a/scripts/node_module_test/node_module_test.gml +++ b/scripts/node_module_test/node_module_test.gml @@ -7,9 +7,9 @@ function Node_Module_SubModule(parent) : NodeModule(parent) constructor { function Node_Module_Test(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Module test"; - inputs[| 0] = nodeValue("Static input", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 0] = nodeValue_Float("Static input", self, 0); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.float, 0); //input_display_list = [ 0 ]; diff --git a/scripts/node_monitor_capture/node_monitor_capture.gml b/scripts/node_monitor_capture/node_monitor_capture.gml index e7f40ac92..359740333 100644 --- a/scripts/node_monitor_capture/node_monitor_capture.gml +++ b/scripts/node_monitor_capture/node_monitor_capture.gml @@ -8,10 +8,9 @@ function Node_Monitor_Capture(_x, _y, _group = noone) : Node(_x, _y, _group) con inputs[| 1] = nodeValue_Enum_Scroll("Monitor", self, 0, array_create_ext(array_length(monitors), function(ind) { return monitors[ind][9]; })); - inputs[| 2] = nodeValue("Region", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, display_get_width(), display_get_height() ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Region", self, [ 0, 0, display_get_width(), display_get_height() ]); - outputs[| 0] = nodeValue("GUI", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("GUI", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, 1, 2, diff --git a/scripts/node_morph_surface/node_morph_surface.gml b/scripts/node_morph_surface/node_morph_surface.gml index 406128688..df6ec1c59 100644 --- a/scripts/node_morph_surface/node_morph_surface.gml +++ b/scripts/node_morph_surface/node_morph_surface.gml @@ -5,13 +5,13 @@ function Node_Morph_Surface(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 1] = nodeValue_Surface("Surface to", self); - inputs[| 2] = nodeValue("Morph amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Morph amount", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 3] = nodeValue_Float("Threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surfaces", true], 0, 1, diff --git a/scripts/node_move_point/node_move_point.gml b/scripts/node_move_point/node_move_point.gml index bdfd28398..9b50651b7 100644 --- a/scripts/node_move_point/node_move_point.gml +++ b/scripts/node_move_point/node_move_point.gml @@ -4,20 +4,18 @@ function Node_Move_Point(_x, _y, _group = noone) : Node_Processor(_x, _y, _group setDimension(96, 48); - inputs[| 0] = nodeValue("Point", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Point", self, [ 0, 0, ]) .setVisible(true, true); inputs[| 1] = nodeValue_Enum_Scroll("Mode", self, 0, [ "XY Shift", "Direction + Distance" ]); - inputs[| 2] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Shift", self, [ 0, 0 ]); inputs[| 3] = nodeValue_Rotation("Direction", self, 0); - inputs[| 4] = nodeValue("Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4 ); + inputs[| 4] = nodeValue_Float("Distance", self, 4 ); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ]) + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.float, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); static step = function() { diff --git a/scripts/node_noise/node_noise.gml b/scripts/node_noise/node_noise.gml index 3aac4d618..42379c2c4 100644 --- a/scripts/node_noise/node_noise.gml +++ b/scripts/node_noise/node_noise.gml @@ -3,19 +3,16 @@ function Node_Noise(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 1] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 2] = nodeValue_Enum_Button("Color mode", self, 0, [ "Greyscale", "RGB", "HSV" ]); - inputs[| 3] = nodeValue("Color R range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 3] = nodeValue_Slider_Range("Color R range", self, [ 0, 1 ]); - inputs[| 4] = nodeValue("Color G range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 4] = nodeValue_Slider_Range("Color G range", self, [ 0, 1 ]); - inputs[| 5] = nodeValue("Color B range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 5] = nodeValue_Slider_Range("Color B range", self, [ 0, 1 ]); input_display_list = [ ["Output", false], 0, @@ -23,7 +20,7 @@ function Node_Noise(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con ["Color", false], 2, 3, 4, 5, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_noise_aniso/node_noise_aniso.gml b/scripts/node_noise_aniso/node_noise_aniso.gml index 205c1e3ee..14c279a44 100644 --- a/scripts/node_noise_aniso/node_noise_aniso.gml +++ b/scripts/node_noise_aniso/node_noise_aniso.gml @@ -3,20 +3,19 @@ function Node_Noise_Aniso(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("X Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2) + inputs[| 1] = nodeValue_Float("X Amount", self, 2) .setMappable(6); - inputs[| 2] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 2] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 2].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 3] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); inputs[| 4] = nodeValue_Rotation("Rotation", self, 0) .setMappable(8); - inputs[| 5] = nodeValue("Y Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 16) + inputs[| 5] = nodeValue_Float("Y Amount", self, 16) .setMappable(7); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -37,7 +36,7 @@ function Node_Noise_Aniso(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ["Render", false], 9, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_noise_bubble/node_noise_bubble.gml b/scripts/node_noise_bubble/node_noise_bubble.gml index 029296e52..ef1a4f45d 100644 --- a/scripts/node_noise_bubble/node_noise_bubble.gml +++ b/scripts/node_noise_bubble/node_noise_bubble.gml @@ -2,27 +2,25 @@ function Node_Noise_Bubble(_x, _y, _group = noone) : Node_Shader_Generator(_x, _ name = "Bubble Noise"; shader = sh_noise_bubble; - inputs[| 1] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 1] = nodeValue_Float("Density", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); addShaderProp(SHADER_UNIFORM.float, "density"); - inputs[| 2] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 2] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 2].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.8 ] ) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 3] = nodeValue_Slider_Range("Scale", self, [ 0.5, 0.8 ] ); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 4] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 4] = nodeValue_Float("Thickness", self, 0 ) .setDisplay(VALUE_DISPLAY.slider); addShaderProp(SHADER_UNIFORM.float, "thickness"); inputs[| 5] = nodeValue_Enum_Button("Mode", self, 0 , [ "Line", "Fill" ] ); addShaderProp(SHADER_UNIFORM.integer, "mode"); - inputs[| 6] = nodeValue("Opacity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0., 1. ] ) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 6] = nodeValue_Slider_Range("Opacity", self, [ 0., 1. ] ); addShaderProp(SHADER_UNIFORM.float, "alpha"); inputs[| 7] = nodeValue_Enum_Scroll("Blending", self, 0 , [ "Max", "Add" ] ); diff --git a/scripts/node_noise_cristal/node_noise_cristal.gml b/scripts/node_noise_cristal/node_noise_cristal.gml index ea3df0734..6530c4db0 100644 --- a/scripts/node_noise_cristal/node_noise_cristal.gml +++ b/scripts/node_noise_cristal/node_noise_cristal.gml @@ -2,25 +2,23 @@ function Node_Noise_Cristal(_x, _y, _group = noone) : Node_Shader_Generator(_x, name = "Cristal Noise"; shader = sh_noise_cristal; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ] ); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 1, 1 ] ); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 4] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 15 ); + inputs[| 4] = nodeValue_Int("Iteration", self, 15 ); addShaderProp(SHADER_UNIFORM.integer, "iteration"); - inputs[| 5] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 5] = nodeValue_Color("Color", self, c_white ); addShaderProp(SHADER_UNIFORM.color, "color"); - inputs[| 6] = nodeValue("Gamma", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 6] = nodeValue_Float("Gamma", self, 1 ) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }); addShaderProp(SHADER_UNIFORM.float, "gamma"); diff --git a/scripts/node_noise_fbm/node_noise_fbm.gml b/scripts/node_noise_fbm/node_noise_fbm.gml index 80d8a3dde..126ea5e00 100644 --- a/scripts/node_noise_fbm/node_noise_fbm.gml +++ b/scripts/node_noise_fbm/node_noise_fbm.gml @@ -3,27 +3,22 @@ function Node_Noise_FBM(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 1] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0 ]); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Scale", self, [ 4, 4 ]); - inputs[| 4] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 4] = nodeValue_Int("Iteration", self, 4); inputs[| 5] = nodeValue_Enum_Button("Color mode", self, 0, [ "Greyscale", "RGB", "HSV" ]); - inputs[| 6] = nodeValue("Color R range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 6] = nodeValue_Slider_Range("Color R range", self, [ 0, 1 ]); - inputs[| 7] = nodeValue("Color G range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 7] = nodeValue_Slider_Range("Color G range", self, [ 0, 1 ]); - inputs[| 8] = nodeValue("Color B range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 8] = nodeValue_Slider_Range("Color B range", self, [ 0, 1 ]); input_display_list = [ ["Output", false], 0, @@ -31,7 +26,7 @@ function Node_Noise_FBM(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Color", false], 5, 6, 7, 8, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_noise_hex/node_noise_hex.gml b/scripts/node_noise_hex/node_noise_hex.gml index 6fb8fed36..6044c9e2f 100644 --- a/scripts/node_noise_hex/node_noise_hex.gml +++ b/scripts/node_noise_hex/node_noise_hex.gml @@ -13,14 +13,12 @@ function Node_Noise_Hex(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 1] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0] ); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 8, 8 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Scale", self, [ 8, 8 ] ); inputs[| 4] = nodeValue_Surface("Texture sample", self); @@ -32,7 +30,7 @@ function Node_Noise_Hex(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Texture", false], 4 ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_noise_simplex/node_noise_simplex.gml b/scripts/node_noise_simplex/node_noise_simplex.gml index 5c1f59397..d934433e4 100644 --- a/scripts/node_noise_simplex/node_noise_simplex.gml +++ b/scripts/node_noise_simplex/node_noise_simplex.gml @@ -3,27 +3,22 @@ function Node_Noise_Simplex(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0, 0 ] ); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 1, 1 ] ) .setMappable(8); - inputs[| 3] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ) + inputs[| 3] = nodeValue_Int("Iteration", self, 1 ) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }) .setMappable(9); inputs[| 4] = nodeValue_Enum_Button("Color mode", self, 0, [ "Greyscale", "RGB", "HSV" ]); - inputs[| 5] = nodeValue("Color R range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 5] = nodeValue_Slider_Range("Color R range", self, [ 0, 1 ]); - inputs[| 6] = nodeValue("Color G range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 6] = nodeValue_Slider_Range("Color G range", self, [ 0, 1 ]); - inputs[| 7] = nodeValue("Color B range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 7] = nodeValue_Slider_Range("Color B range", self, [ 0, 1 ]); ////////////////////////////////////////////////////////////////////////////////// @@ -41,7 +36,7 @@ function Node_Noise_Simplex(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr ["Render", false], 4, 5, 6, 7, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_noise_strand/node_noise_strand.gml b/scripts/node_noise_strand/node_noise_strand.gml index 3b49cce9d..e5436404c 100644 --- a/scripts/node_noise_strand/node_noise_strand.gml +++ b/scripts/node_noise_strand/node_noise_strand.gml @@ -2,35 +2,33 @@ function Node_Noise_Strand(_x, _y, _group = noone) : Node_Shader_Generator(_x, _ name = "Strand Noise"; shader = sh_noise_strand; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 2] = nodeValue_Float("Density", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); addShaderProp(SHADER_UNIFORM.float, "density"); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 4] = nodeValue("Slope", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 4] = nodeValue_Float("Slope", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); addShaderProp(SHADER_UNIFORM.float, "slope"); - inputs[| 5] = nodeValue("Curve", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.slider_range, { range: [ 0, 4, 0.01 ] }); + inputs[| 5] = nodeValue_Slider_Range("Curve", self, [ 0, 0 ] , { range: [ 0, 4, 0.01 ] }); addShaderProp(SHADER_UNIFORM.float, "curve"); - inputs[| 6] = nodeValue("Curve scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ); + inputs[| 6] = nodeValue_Float("Curve scale", self, 1 ); addShaderProp(SHADER_UNIFORM.float, "curveDetail"); - inputs[| 7] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 7] = nodeValue_Float("Thickness", self, 0 ) .setDisplay(VALUE_DISPLAY.slider); addShaderProp(SHADER_UNIFORM.float, "thickness"); - inputs[| 8] = nodeValue("Curve shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ); + inputs[| 8] = nodeValue_Float("Curve shift", self, 0 ); addShaderProp(SHADER_UNIFORM.float, "curveShift"); inputs[| 9] = nodeValue_Enum_Button("Axis", self, 0 , [ "x", "y" ] ); @@ -39,8 +37,7 @@ function Node_Noise_Strand(_x, _y, _group = noone) : Node_Shader_Generator(_x, _ inputs[| 10] = nodeValue_Enum_Button("Mode", self, 0 , [ "Line", "Area" ] ); addShaderProp(SHADER_UNIFORM.integer, "mode"); - inputs[| 11] = nodeValue("Opacity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0., 1. ] ) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 11] = nodeValue_Slider_Range("Opacity", self, [ 0., 1. ] ); addShaderProp(SHADER_UNIFORM.float, "alpha"); input_display_list = [ 3, diff --git a/scripts/node_noise_tri/node_noise_tri.gml b/scripts/node_noise_tri/node_noise_tri.gml index 37138150c..9c6849dd5 100644 --- a/scripts/node_noise_tri/node_noise_tri.gml +++ b/scripts/node_noise_tri/node_noise_tri.gml @@ -13,14 +13,12 @@ function Node_Noise_Tri(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 1] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0] ); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Scale", self, [ 4, 4 ] ); inputs[| 4] = nodeValue_Surface("Texture sample", self); @@ -32,7 +30,7 @@ function Node_Noise_Tri(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Texture", false], 4, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_normal/node_normal.gml b/scripts/node_normal/node_normal.gml index 346e601fe..f8a701583 100644 --- a/scripts/node_normal/node_normal.gml +++ b/scripts/node_normal/node_normal.gml @@ -3,12 +3,12 @@ function Node_Normal(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 1] = nodeValue_Float("Height", self, 1); - inputs[| 2] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0, "Include diagonal pixel in normal calculation, which leads to smoother output.") + inputs[| 2] = nodeValue_Float("Smooth", self, 0, "Include diagonal pixel in normal calculation, which leads to smoother output.") .setDisplay(VALUE_DISPLAY.slider, { range : [ 0, 4, 0.1] }); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; input_display_list = [ 3, @@ -16,7 +16,7 @@ function Node_Normal(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co ["Normal", false], 1, 2, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_normal_light/node_normal_light.gml b/scripts/node_normal_light/node_normal_light.gml index c74e535c4..3af43da17 100644 --- a/scripts/node_normal_light/node_normal_light.gml +++ b/scripts/node_normal_light/node_normal_light.gml @@ -5,33 +5,32 @@ function Node_Normal_Light(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 1] = nodeValue_Surface("Normal map", self); - inputs[| 2] = nodeValue("Normal intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = nodeValue_Float("Normal intensity", self, 1); - inputs[| 3] = nodeValue("Ambient", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 3] = nodeValue_Color("Ambient", self, c_black); - inputs[| 4] = nodeValue("Light position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Light position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 5] = nodeValue("Light range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 16); + inputs[| 5] = nodeValue_Float("Light range", self, 16); - inputs[| 6] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 32); + inputs[| 6] = nodeValue_Float("Light intensity", self, 32); - inputs[| 7] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 7] = nodeValue_Color("Light color", self, c_white); inputs[| 8] = nodeValue_Enum_Button("Light type", self, 0, ["Point", "Sun"]); - inputs[| 9] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 9] = nodeValue_Bool("Active", self, true); active_index = 9; - inputs[| 10] = nodeValue("Light height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 10] = nodeValue_Float("Light height", self, 1); input_display_list = [ 9, 0, ["Normal", false], 1, 2, ["Light", false], 3, 8, 4, 10, 5, 6, 7 ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_normalize/node_normalize.gml b/scripts/node_normalize/node_normalize.gml index 3caa07204..b2a34a183 100644 --- a/scripts/node_normalize/node_normalize.gml +++ b/scripts/node_normalize/node_normalize.gml @@ -7,7 +7,7 @@ function Node_Normalize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) input_display_list = [ 0, 1 ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_offset/node_offset.gml b/scripts/node_offset/node_offset.gml index a991a2ac9..457a32c63 100644 --- a/scripts/node_offset/node_offset.gml +++ b/scripts/node_offset/node_offset.gml @@ -3,13 +3,13 @@ function Node_Offset(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("X Offset", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 1] = nodeValue_Float("X Offset", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 2] = nodeValue("Y Offset", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Y Offset", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; input_display_list = [ 3, @@ -17,7 +17,7 @@ function Node_Offset(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co ["Offset", false], 1, 2, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_onion_skin/node_onion_skin.gml b/scripts/node_onion_skin/node_onion_skin.gml index 6a80c2344..27f414f4e 100644 --- a/scripts/node_onion_skin/node_onion_skin.gml +++ b/scripts/node_onion_skin/node_onion_skin.gml @@ -5,21 +5,20 @@ function Node_Onion_Skin(_x, _y, _group = noone) : Node(_x, _y, _group) construc inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [-1, 1]) - .setDisplay(VALUE_DISPLAY.slider_range, { range: [ -16, 16, 0.1 ] }); + inputs[| 1] = nodeValue_Slider_Range("Range", self, [-1, 1], { range: [ -16, 16, 0.1 ] }); - inputs[| 2] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Alpha", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Color pre", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_red) + inputs[| 3] = nodeValue_Color("Color pre", self, c_red) - inputs[| 4] = nodeValue("Color post", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_blue) + inputs[| 4] = nodeValue_Color("Color post", self, c_blue) - inputs[| 5] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 5] = nodeValue_Int("Step", self, 1) - inputs[| 6] = nodeValue("On top", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Render current frame on top of all frames.") + inputs[| 6] = nodeValue_Bool("On top", self, true, "Render current frame on top of all frames.") - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surface", false], 0, 1, 5, diff --git a/scripts/node_outline/node_outline.gml b/scripts/node_outline/node_outline.gml index 23e7a5faa..dadbd999e 100644 --- a/scripts/node_outline/node_outline.gml +++ b/scripts/node_outline/node_outline.gml @@ -14,38 +14,38 @@ function Node_Outline(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 1] = nodeValue_Int("Width", self, 0) .setDisplay(VALUE_DISPLAY._default, { front_button : filter_button }) .setValidator(VV_min(0)) .setMappable(15); - inputs[| 2] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 2] = nodeValue_Color("Color", self, c_white); - inputs[| 3] = nodeValue("Blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 0, "Blend outline color with the original color."); + inputs[| 3] = nodeValue_Bool("Blend", self, 0, "Blend outline color with the original color."); - inputs[| 4] = nodeValue("Blend alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Blend alpha", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setMappable(16); inputs[| 5] = nodeValue_Enum_Button("Position", self, 1, ["Inside", "Outside"]); - inputs[| 6] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 0); + inputs[| 6] = nodeValue_Bool("Anti aliasing", self, 0); inputs[| 7] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) .setTooltip("How to deal with pixel outside the surface.\n - Empty: Use empty pixel\n - Clamp: Repeat edge pixel\n - Repeat: Repeat texture."); - inputs[| 8] = nodeValue("Start", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0, "Shift outline inside, outside the shape.") + inputs[| 8] = nodeValue_Int("Start", self, 0, "Shift outline inside, outside the shape.") .setMappable(17); inputs[| 9] = nodeValue_Surface("Mask", self); - inputs[| 10] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 10] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 11] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 11] = nodeValue_Bool("Active", self, true); active_index = 11; - inputs[| 12] = nodeValue("Crop border", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 12] = nodeValue_Bool("Crop border", self, false); __init_mask_modifier(9); // inputs 13, 14 @@ -59,9 +59,9 @@ function Node_Outline(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c ////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Outline", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Outline", self, VALUE_TYPE.surface, noone); input_display_list = [ 11, ["Surfaces", true], 0, 9, 10, 13, 14, diff --git a/scripts/node_override_channel/node_override_channel.gml b/scripts/node_override_channel/node_override_channel.gml index 5d49f0d26..56056caea 100644 --- a/scripts/node_override_channel/node_override_channel.gml +++ b/scripts/node_override_channel/node_override_channel.gml @@ -10,7 +10,7 @@ function Node_Override_Channel(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 5] = nodeValue_Enum_Scroll("Sampling type", self, 0, ["Brightness", "Channel value"]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Sampling", false], 5, diff --git a/scripts/node_pack_sprites/node_pack_sprites.gml b/scripts/node_pack_sprites/node_pack_sprites.gml index e07c8602e..08d46cbb6 100644 --- a/scripts/node_pack_sprites/node_pack_sprites.gml +++ b/scripts/node_pack_sprites/node_pack_sprites.gml @@ -5,15 +5,15 @@ function Node_Pack_Sprites(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 1] = nodeValue_Enum_Scroll("Algorithm", self, 0, { data: [ "Skyline", "Shelf", "Top left", "Best fit" ], update_hover: false }); - inputs[| 2] = nodeValue("Max width", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 128); + inputs[| 2] = nodeValue_Int("Max width", self, 128); - inputs[| 3] = nodeValue("Max height", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 128); + inputs[| 3] = nodeValue_Int("Max height", self, 128); - inputs[| 4] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 4] = nodeValue_Int("Spacing", self, 0); - outputs[| 0] = nodeValue("Packed image", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Packed image", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas data", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []); + outputs[| 1] = nodeValue_Output("Atlas data", self, VALUE_TYPE.surface, []); input_display_list = [ 0, 4, 1, 2, 3 ]; diff --git a/scripts/node_padding/node_padding.gml b/scripts/node_padding/node_padding.gml index ecc73374c..ee4e9d930 100644 --- a/scripts/node_padding/node_padding.gml +++ b/scripts/node_padding/node_padding.gml @@ -4,27 +4,25 @@ function Node_Padding(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0, 0, 0]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 1] = nodeValue_Padding("Padding", self, [0, 0, 0, 0]) .setUnitRef(function(index) { return getDimension(index); }); inputs[| 2] = nodeValue_Enum_Scroll("Fill method", self, 0, [ "Empty", "Solid" ]); - inputs[| 3] = nodeValue("Fill color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 3] = nodeValue_Color("Fill color", self, c_black); - inputs[| 4] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Active", self, true); active_index = 4; inputs[| 5] = nodeValue_Enum_Button("Pad mode", self, 0, [ "Pad out", "Pad to size" ]); - inputs[| 6] = nodeValue("Target dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 6] = nodeValue_Vector("Target dimension", self, DEF_SURF) inputs[| 7] = nodeValue_Enum_Button("Horizontal alignment", self, 0 , [ THEME.inspector_surface_halign, THEME.inspector_surface_halign, THEME.inspector_surface_halign]); inputs[| 8] = nodeValue_Enum_Button("Vertical alignment", self, 0 , [ THEME.inspector_surface_valign, THEME.inspector_surface_valign, THEME.inspector_surface_valign ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 4, ["Surfaces", true], 0, diff --git a/scripts/node_palette/node_palette.gml b/scripts/node_palette/node_palette.gml index 44d117088..933c5c86f 100644 --- a/scripts/node_palette/node_palette.gml +++ b/scripts/node_palette/node_palette.gml @@ -2,13 +2,11 @@ function Node_Palette(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c name = "Palette"; setDimension(96); - inputs[| 0] = nodeValue("Palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 0] = nodeValue_Palette("Palette", self, array_clone(DEF_PALETTE)); - inputs[| 1] = nodeValue("Trim range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 1] = nodeValue_Slider_Range("Trim range", self, [ 0, 1 ]); - outputs[| 0] = nodeValue("Palette", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, []) + outputs[| 0] = nodeValue_Output("Palette", self, VALUE_TYPE.color, []) .setDisplay(VALUE_DISPLAY.palette); input_display_list = [0, diff --git a/scripts/node_palette_extract/node_palette_extract.gml b/scripts/node_palette_extract/node_palette_extract.gml index c4d79440c..abe24271b 100644 --- a/scripts/node_palette_extract/node_palette_extract.gml +++ b/scripts/node_palette_extract/node_palette_extract.gml @@ -4,10 +4,10 @@ function Node_Palette_Extract(_x, _y, _group = noone) : Node_Processor(_x, _y, _ inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Max colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 5, "Amount of color in a palette.") + inputs[| 1] = nodeValue_Int("Max colors", self, 5, "Amount of color in a palette.") .rejectArray(); - inputs[| 2] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6), "Random seed to be used to initialize K-mean algorithm.") + inputs[| 2] = nodeValue_Int("Seed", self, seed_random(6), "Random seed to be used to initialize K-mean algorithm.") .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 2].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }) .rejectArray(); @@ -17,7 +17,7 @@ function Node_Palette_Extract(_x, _y, _group = noone) : Node_Processor(_x, _y, _ inputs[| 4] = nodeValue_Enum_Scroll("Color Space", self, 1, { data: [ "RGB", "HSV" ], update_hover: false }) .rejectArray(); - outputs[| 0] = nodeValue("Palette", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, [ ]) + outputs[| 0] = nodeValue_Output("Palette", self, VALUE_TYPE.color, [ ]) .setDisplay(VALUE_DISPLAY.palette); static getPreviewValues = function() { return getInputData(0); } diff --git a/scripts/node_palette_replace/node_palette_replace.gml b/scripts/node_palette_replace/node_palette_replace.gml index beaa09054..c97028e53 100644 --- a/scripts/node_palette_replace/node_palette_replace.gml +++ b/scripts/node_palette_replace/node_palette_replace.gml @@ -2,24 +2,21 @@ function Node_Palette_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _ name = "Palette Replace"; setDimension(96); - inputs[| 0] = nodeValue("Palette in", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette) + inputs[| 0] = nodeValue_Palette("Palette in", self, array_clone(DEF_PALETTE)) .setVisible(true, true); - inputs[| 1] = nodeValue("Palette from", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 1] = nodeValue_Palette("Palette from", self, array_clone(DEF_PALETTE)); - inputs[| 2] = nodeValue("Palette to", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 2] = nodeValue_Palette("Palette to", self, array_clone(DEF_PALETTE)); - inputs[| 3] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 3] = nodeValue_Float("Threshold", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); input_display_list = [ 0, ["Palette", false], 1, 2, 3, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, [ ] ) + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.color, [ ] ) .setDisplay(VALUE_DISPLAY.palette); static processData = function(_outSurf, _data, _output_index, _array_index) { #region diff --git a/scripts/node_palette_shift/node_palette_shift.gml b/scripts/node_palette_shift/node_palette_shift.gml index 275145dc9..2b57c6a35 100644 --- a/scripts/node_palette_shift/node_palette_shift.gml +++ b/scripts/node_palette_shift/node_palette_shift.gml @@ -3,22 +3,20 @@ function Node_Palette_Shift(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 1] = nodeValue_Palette("Palette", self, array_clone(DEF_PALETTE)); - inputs[| 2] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 2] = nodeValue_Int("Shift", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.1] }); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 @@ -27,7 +25,7 @@ function Node_Palette_Shift(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr ["Palette", false], 1, 2 ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_palette_sort/node_palette_sort.gml b/scripts/node_palette_sort/node_palette_sort.gml index ca0fd697a..d1759c822 100644 --- a/scripts/node_palette_sort/node_palette_sort.gml +++ b/scripts/node_palette_sort/node_palette_sort.gml @@ -2,22 +2,21 @@ function Node_Palette_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro name = "Sort Palette"; setDimension(96); - inputs[| 0] = nodeValue("Palette in", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette) + inputs[| 0] = nodeValue_Palette("Palette in", self, array_clone(DEF_PALETTE)) .setVisible(true, true); inputs[| 1] = nodeValue_Enum_Button("Order", self, 0, [ "Brightness", -1, "Hue (HSV)", "Saturation (SHV)", "Value (VHS)", -1, "Red (RGB)", "Green (GBR)", "Blue (BRG)", -1, "Custom" ]) .rejectArray(); - inputs[| 2] = nodeValue("Reverse", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Reverse", self, false); - inputs[| 3] = nodeValue("Sort Order", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "RGB", @"Compose sorting algorithm using string. + inputs[| 3] = nodeValue_Text("Sort Order", self, "RGB", @"Compose sorting algorithm using string. - RGB: Red/Green/Blur channel - HSV: Hue/Saturation/Value - L: Brightness - Use small letter for ascending, capital letter for descending order."); - outputs[| 0] = nodeValue("Sorted palette", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, []) + outputs[| 0] = nodeValue_Output("Sorted palette", self, VALUE_TYPE.color, []) .setDisplay(VALUE_DISPLAY.palette); input_display_list = [ diff --git a/scripts/node_particle/node_particle.gml b/scripts/node_particle/node_particle.gml index e95786efc..46d24009d 100644 --- a/scripts/node_particle/node_particle.gml +++ b/scripts/node_particle/node_particle.gml @@ -4,15 +4,13 @@ function Node_Particle(_x, _y, _group = noone) : Node_VFX_Spawner_Base(_x, _y, _ onSurfaceSize = function() { return getInputData(input_len, DEF_SURF); }; - inputs[| 3] = nodeValue("Spawn area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA_REF ) + inputs[| 3] = nodeValue_Area("Spawn area", self, DEF_AREA_REF, { onSurfaceSize } ) .rejectArray() - .setUnitRef(onSurfaceSize, VALUE_UNIT.reference) - .setDisplay(VALUE_DISPLAY.area, { onSurfaceSize }); + .setUnitRef(onSurfaceSize, VALUE_UNIT.reference); - inputs[| input_len + 0] = nodeValue("Output dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| input_len + 0] = nodeValue_Vector("Output dimension", self, DEF_SURF); - inputs[| input_len + 1] = nodeValue("Round position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Round position to the closest integer value to avoid jittering."); + inputs[| input_len + 1] = nodeValue_Bool("Round position", self, true, "Round position to the closest integer value to avoid jittering."); inputs[| input_len + 2] = nodeValue_Enum_Scroll("Blend mode", self, 0 , [ "Normal", "Alpha", "Additive" ]); @@ -20,9 +18,9 @@ function Node_Particle(_x, _y, _group = noone) : Node_VFX_Spawner_Base(_x, _y, _ inputs[| input_len + 4] = nodeValue_Enum_Button("Render Type", self, PARTICLE_RENDER_TYPE.surface , [ "Surface", "Line" ]); - inputs[| input_len + 5] = nodeValue("Line life", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4 ); + inputs[| input_len + 5] = nodeValue_Int("Line life", self, 4 ); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); for(var i = input_len, n = ds_list_size(inputs); i < n; i++) inputs[| i].rejectArray(); diff --git a/scripts/node_path/node_path.gml b/scripts/node_path/node_path.gml index 7e04c4ae7..5781aeafc 100644 --- a/scripts/node_path/node_path.gml +++ b/scripts/node_path/node_path.gml @@ -15,24 +15,24 @@ function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { setDimension(96, 48); - inputs[| 0] = nodeValue("Path progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0, "Sample position from path.") + inputs[| 0] = nodeValue_Float("Path progress", self, 0, "Sample position from path.") .setDisplay(VALUE_DISPLAY.slider); - inputs[| 1] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 1] = nodeValue_Bool("Loop", self, false) .rejectArray(); inputs[| 2] = nodeValue_Enum_Scroll("Progress mode", self, 0, ["Entire line", "Segment"]) .rejectArray(); - inputs[| 3] = nodeValue("Round anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 3] = nodeValue_Bool("Round anchor", self, false) .rejectArray(); - outputs[| 0] = nodeValue("Position out", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ]) + outputs[| 0] = nodeValue_Output("Position out", self, VALUE_TYPE.float, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); - outputs[| 1] = nodeValue("Path data", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 1] = nodeValue_Output("Path data", self, VALUE_TYPE.pathnode, self); - outputs[| 2] = nodeValue("Anchors", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []) + outputs[| 2] = nodeValue_Output("Anchors", self, VALUE_TYPE.float, []) .setVisible(false) .setArrayDepth(1); @@ -105,8 +105,7 @@ function Node_Path(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { static createNewInput = function(_x = 0, _y = 0, _dxx = 0, _dxy = 0, _dyx = 0, _dyy = 0, rec = true) { #region var index = ds_list_size(inputs); - inputs[| index] = nodeValue("Anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ _x, _y, _dxx, _dxy, _dyx, _dyy, false ]) - .setDisplay(VALUE_DISPLAY.path_anchor); + inputs[| index] = nodeValue_Path_Anchor("Anchor", self, [ _x, _y, _dxx, _dxy, _dyx, _dyy, false ]); if(rec) { recordAction(ACTION_TYPE.list_insert, inputs, [ inputs[| index], index, $"add path anchor point {index}" ]); diff --git a/scripts/node_path_3d/node_path_3d.gml b/scripts/node_path_3d/node_path_3d.gml index 77d72fb1a..08e26d7a6 100644 --- a/scripts/node_path_3d/node_path_3d.gml +++ b/scripts/node_path_3d/node_path_3d.gml @@ -10,6 +10,7 @@ enum _ANCHOR3 { c2z, ind, + amount } function Node_Path_3D(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { @@ -18,24 +19,24 @@ function Node_Path_3D(_x, _y, _group = noone) : Node(_x, _y, _group) constructor setDimension(96, 48); - inputs[| 0] = nodeValue("Path progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0, "Sample position from path.") + inputs[| 0] = nodeValue_Float("Path progress", self, 0, "Sample position from path.") .setDisplay(VALUE_DISPLAY.slider); - inputs[| 1] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 1] = nodeValue_Bool("Loop", self, false) .rejectArray(); inputs[| 2] = nodeValue_Enum_Scroll("Progress mode", self, 0, ["Entire line", "Segment"]) .rejectArray(); - inputs[| 3] = nodeValue("Round anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 3] = nodeValue_Bool("Round anchor", self, false) .rejectArray(); - outputs[| 0] = nodeValue("Position out", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ]) + outputs[| 0] = nodeValue_Output("Position out", self, VALUE_TYPE.float, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); - outputs[| 1] = nodeValue("Path data", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 1] = nodeValue_Output("Path data", self, VALUE_TYPE.pathnode, self); - outputs[| 2] = nodeValue("Anchors", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, []) + outputs[| 2] = nodeValue_Output("Anchors", self, VALUE_TYPE.float, []) .setVisible(false) .setArrayDepth(1); @@ -113,8 +114,7 @@ function Node_Path_3D(_x, _y, _group = noone) : Node(_x, _y, _group) constructor var index = ds_list_size(inputs); - inputs[| index] = nodeValue("Anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ _x, _y, _z, _dxx, _dxy, _dxz, _dyx, _dyy, _dyz, false ]) - .setDisplay(VALUE_DISPLAY.path_anchor); + inputs[| index] = nodeValue_Path_Anchor_3D("Anchor", self, [ _x, _y, _z, _dxx, _dxy, _dxz, _dyx, _dyy, _dyz, false ]); if(!rec) return inputs[| index]; diff --git a/scripts/node_path_anchor/node_path_anchor.gml b/scripts/node_path_anchor/node_path_anchor.gml index 9b1dc5d16..3608800fb 100644 --- a/scripts/node_path_anchor/node_path_anchor.gml +++ b/scripts/node_path_anchor/node_path_anchor.gml @@ -3,19 +3,16 @@ function Node_Path_Anchor(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou color = COLORS.node_blend_number; setDimension(96, 48); - inputs[| 0] = nodeValue("Postion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Postion", self, [ 0, 0 ] ) .setVisible(true, true); - inputs[| 1] = nodeValue("Control point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ -16, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Control point 1", self, [ -16, 0 ] ); - inputs[| 2] = nodeValue("Control point 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Control point 2", self, [ 16, 0 ] ); - inputs[| 3] = nodeValue("Mirror control point", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 3] = nodeValue_Bool("Mirror control point", self, true ); - outputs[| 0] = nodeValue("Anchor", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0, 0, 0, 0, 0 ]) + outputs[| 0] = nodeValue_Output("Anchor", self, VALUE_TYPE.float, [ 0, 0, 0, 0, 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); tools = [ diff --git a/scripts/node_path_array/node_path_array.gml b/scripts/node_path_array/node_path_array.gml index 1c1b26ae3..a1e724fb1 100644 --- a/scripts/node_path_array/node_path_array.gml +++ b/scripts/node_path_array/node_path_array.gml @@ -4,12 +4,12 @@ function Node_Path_Array(_x, _y, _group = noone) : Node(_x, _y, _group) construc cached_pos = ds_map_create(); - outputs[| 0] = nodeValue("Combined Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Combined Path", self, VALUE_TYPE.pathnode, self); static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone ) + inputs[| index] = nodeValue_PathNode("Path", self, noone ) .setVisible(true, true); return inputs[| index]; diff --git a/scripts/node_path_bake/node_path_bake.gml b/scripts/node_path_bake/node_path_bake.gml index cefa89eb3..d2c5d8625 100644 --- a/scripts/node_path_bake/node_path_bake.gml +++ b/scripts/node_path_bake/node_path_bake.gml @@ -2,14 +2,14 @@ function Node_Path_Bake(_x, _y, _group = noone) : Node(_x, _y, _group) construct name = "Bake Path"; setDimension(96, 48); - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Segment length", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 1] = nodeValue_Float("Segment length", self, 1); - inputs[| 2] = nodeValue("Spread single path", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Spread single path", self, true); - outputs[| 0] = nodeValue("Segments", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [[]]) + outputs[| 0] = nodeValue_Output("Segments", self, VALUE_TYPE.float, [[]]) .setDisplay(VALUE_DISPLAY.vector) .setArrayDepth(2); diff --git a/scripts/node_path_blend/node_path_blend.gml b/scripts/node_path_blend/node_path_blend.gml index 90628160e..019f988e0 100644 --- a/scripts/node_path_blend/node_path_blend.gml +++ b/scripts/node_path_blend/node_path_blend.gml @@ -3,19 +3,19 @@ function Node_Path_Blend(_x, _y, _group = noone) : Node(_x, _y, _group) construc setDimension(96, 48);; length = 0; - inputs[| 0] = nodeValue("Path 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path 1", self, noone) .setVisible(true, true) .rejectArray(); - inputs[| 1] = nodeValue("Path 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 1] = nodeValue_PathNode("Path 2", self, noone) .setVisible(true, true) .rejectArray(); - inputs[| 2] = nodeValue("Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Ratio", self, 0) .setDisplay(VALUE_DISPLAY.slider) .rejectArray(); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); cached_pos = ds_map_create(); diff --git a/scripts/node_path_bridge/node_path_bridge.gml b/scripts/node_path_bridge/node_path_bridge.gml index 896ee5de2..806a4af8f 100644 --- a/scripts/node_path_bridge/node_path_bridge.gml +++ b/scripts/node_path_bridge/node_path_bridge.gml @@ -2,17 +2,17 @@ function Node_Path_Bridge(_x, _y, _group = noone) : Node(_x, _y, _group) constru name = "Bridge Path"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true) .rejectArray(); - inputs[| 1] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 1] = nodeValue_Int("Amount", self, 4) .rejectArray(); - inputs[| 2] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 2] = nodeValue_Bool("Smooth", self, false) .rejectArray(); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); input_display_list = [ 0, ["Bridge", false], 1, 2, diff --git a/scripts/node_path_builder/node_path_builder.gml b/scripts/node_path_builder/node_path_builder.gml index e6a65d5bf..18270c475 100644 --- a/scripts/node_path_builder/node_path_builder.gml +++ b/scripts/node_path_builder/node_path_builder.gml @@ -17,13 +17,13 @@ function Node_Path_Builder(_x, _y, _group = noone) : Node(_x, _y, _group) constr lines = []; #endregion - inputs[| 0] = nodeValue("Point array", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 0] = nodeValue_Float("Point array", self, []) .setVisible(true, true) .setArrayDepth(2); - inputs[| 1] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Loop", self, false); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); cached_pos = ds_map_create(); diff --git a/scripts/node_path_from_mask/node_path_from_mask.gml b/scripts/node_path_from_mask/node_path_from_mask.gml index 9b497deff..cbcf8e156 100644 --- a/scripts/node_path_from_mask/node_path_from_mask.gml +++ b/scripts/node_path_from_mask/node_path_from_mask.gml @@ -3,9 +3,9 @@ function Node_Path_From_Mask(_x, _y, _group = noone) : Node(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Mask", self); - inputs[| 1] = nodeValue("Smooth angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 15); + inputs[| 1] = nodeValue_Float("Smooth angle", self, 15); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); temp_surface = [ surface_create(1, 1) ]; diff --git a/scripts/node_path_l_system/node_path_l_system.gml b/scripts/node_path_l_system/node_path_l_system.gml index 3daa8ea1a..727814530 100644 --- a/scripts/node_path_l_system/node_path_l_system.gml +++ b/scripts/node_path_l_system/node_path_l_system.gml @@ -14,28 +14,27 @@ function Node_Path_L_System(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr name = "L System"; setDimension(96, 48); - inputs[| 0] = nodeValue("Length", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 8); + inputs[| 0] = nodeValue_Float("Length", self, 8); inputs[| 1] = nodeValue_Rotation("Angle", self, 45); - inputs[| 2] = nodeValue("Starting position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Starting position", self, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ]); - inputs[| 3] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 3] = nodeValue_Int("Iteration", self, 4); - inputs[| 4] = nodeValue("Starting rule", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "", o_dialog_l_system); + inputs[| 4] = nodeValue_Text("Starting rule", self, "", o_dialog_l_system); - inputs[| 5] = nodeValue("End replacement", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "", "Replace symbol of the last generated rule, for example a=F to replace all a with F. Use comma to separate different replacements."); + inputs[| 5] = nodeValue_Text("End replacement", self, "", "Replace symbol of the last generated rule, for example a=F to replace all a with F. Use comma to separate different replacements."); inputs[| 6] = nodeValue_Rotation("Starting Angle", self, 90); - inputs[| 7] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 7] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 7].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index + 0] = nodeValue("Name " + string(index - input_fix_len), self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ); - inputs[| index + 1] = nodeValue("Rule " + string(index - input_fix_len), self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ); + inputs[| index + 0] = nodeValue_Text("Name " + string(index - input_fix_len), self, "" ); + inputs[| index + 1] = nodeValue_Text("Rule " + string(index - input_fix_len), self, "" ); return inputs[| index + 0]; } @@ -43,7 +42,7 @@ function Node_Path_L_System(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr setDynamicInput(2, false); if(!LOADING && !APPENDING) createNewInput(); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); rule_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { rule_renderer.x = _x; diff --git a/scripts/node_path_map/node_path_map.gml b/scripts/node_path_map/node_path_map.gml index 347cd641c..b7ddeec82 100644 --- a/scripts/node_path_map/node_path_map.gml +++ b/scripts/node_path_map/node_path_map.gml @@ -1,7 +1,7 @@ function Node_Path_Map(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Map Path"; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true) .rejectArray(); @@ -9,11 +9,11 @@ function Node_Path_Map(_x, _y, _group = noone) : Node(_x, _y, _group) constructo inputs[| 2] = nodeValue_Surface("Texture", self); - inputs[| 3] = nodeValue("Subdivision", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 16) + inputs[| 3] = nodeValue_Int("Subdivision", self, 16) .setValidator(VV_min(2)) .rejectArray(); - outputs[| 0] = nodeValue("Rendered", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Rendered", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Mapping", false], 1, 2, 3, diff --git a/scripts/node_path_map_area/node_path_map_area.gml b/scripts/node_path_map_area/node_path_map_area.gml index 4b43b4dff..619eb807c 100644 --- a/scripts/node_path_map_area/node_path_map_area.gml +++ b/scripts/node_path_map_area/node_path_map_area.gml @@ -2,14 +2,13 @@ function Node_Path_Map_Area(_x, _y, _group = noone) : Node(_x, _y, _group) const name = "Remap Path"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_AREA) - .setDisplay(VALUE_DISPLAY.area, { useShape : false }); + inputs[| 1] = nodeValue_Area("Area", self, DEF_AREA, { useShape : false }); inputs[| 1].editWidget.adjust_shape = false; - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); cached_pos = ds_map_create(); diff --git a/scripts/node_path_plot/node_path_plot.gml b/scripts/node_path_plot/node_path_plot.gml index 6838f11a1..c7cbfa69a 100644 --- a/scripts/node_path_plot/node_path_plot.gml +++ b/scripts/node_path_plot/node_path_plot.gml @@ -3,8 +3,7 @@ function Node_Path_Plot(_x, _y, _group = noone) : Node(_x, _y, _group) construct length = 0; setDimension(96, 48);; - inputs[| 0] = nodeValue("Output scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 8, 8 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 0] = nodeValue_Vector("Output scale", self, [ 8, 8 ]); inputs[| 1] = nodeValue_Enum_Scroll("Coordinate", self, 0, [ new scrollItem("Cartesian", s_node_axis_type, 0), new scrollItem("Polar", s_node_axis_type, 1), ]); @@ -13,22 +12,18 @@ function Node_Path_Plot(_x, _y, _group = noone) : Node(_x, _y, _group) construct eq_type_pol = [ "r function", "O function", "parametric" ]; inputs[| 2] = nodeValue_Enum_Scroll("Equation type", self, 0, eq_type_car); - inputs[| 3] = nodeValue("0 function", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); - inputs[| 4] = nodeValue("1 function", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 3] = nodeValue_Text("0 function", self, ""); + inputs[| 4] = nodeValue_Text("1 function", self, ""); - inputs[| 5] = nodeValue("Origin", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Origin", self, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ] ); - inputs[| 6] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range, { range: [ -1, 1, 0.01 ] }); + inputs[| 6] = nodeValue_Slider_Range("Range", self, [ 0, 1 ], { range: [ -1, 1, 0.01 ] }); - inputs[| 7] = nodeValue("Input scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Input scale", self, [ 1, 1 ]); - inputs[| 8] = nodeValue("Input shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 8] = nodeValue_Vector("Input shift", self, [ 0, 0 ]); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); input_display_list = [ [ "Variable", false ], 5, 7, 8, 0, diff --git a/scripts/node_path_profile/node_path_profile.gml b/scripts/node_path_profile/node_path_profile.gml index 6cc5026a6..6ef0c03db 100644 --- a/scripts/node_path_profile/node_path_profile.gml +++ b/scripts/node_path_profile/node_path_profile.gml @@ -3,24 +3,24 @@ function Node_Path_Profile(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone ) + inputs[| 1] = nodeValue_PathNode("Path", self, noone ) .setVisible(true, true); - inputs[| 2] = nodeValue("Resolution", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 64 ); + inputs[| 2] = nodeValue_Int("Resolution", self, 64 ); inputs[| 3] = nodeValue_Enum_Button("Side", self, 0 , [ "L", "R", "T", "D" ]); - inputs[| 4] = nodeValue("Mirror", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 4] = nodeValue_Bool("Mirror", self, false ); - inputs[| 5] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 5] = nodeValue_Color("Color", self, c_white ); - inputs[| 6] = nodeValue("Anti Aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 6] = nodeValue_Bool("Anti Aliasing", self, false ); - inputs[| 7] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 7] = nodeValue_Bool("Background", self, false ); - inputs[| 8] = nodeValue("BG Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black ); + inputs[| 8] = nodeValue_Color("BG Color", self, c_black ); - outputs[| 0] = nodeValue("Output", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone ); + outputs[| 0] = nodeValue_Output("Output", self, VALUE_TYPE.surface, noone ); input_display_list = [ 0, [ "Profile", false ], 1, 2, diff --git a/scripts/node_path_reverse/node_path_reverse.gml b/scripts/node_path_reverse/node_path_reverse.gml index d2531e7c9..a53d72f72 100644 --- a/scripts/node_path_reverse/node_path_reverse.gml +++ b/scripts/node_path_reverse/node_path_reverse.gml @@ -2,10 +2,10 @@ function Node_Path_Reverse(_x, _y, _group = noone) : Node(_x, _y, _group) constr name = "Reverse Path"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); cached_pos = ds_map_create(); diff --git a/scripts/node_path_sample/node_path_sample.gml b/scripts/node_path_sample/node_path_sample.gml index cf66d0741..91f6f0cb4 100644 --- a/scripts/node_path_sample/node_path_sample.gml +++ b/scripts/node_path_sample/node_path_sample.gml @@ -3,17 +3,17 @@ function Node_Path_Sample(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou batch_output = false; setDimension(96, 48); - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = nodeValue_Float("Ratio", self, 0); inputs[| 2] = nodeValue_Enum_Scroll("Type", self, 0, [ "Loop", "Ping pong" ]); - outputs[| 0] = nodeValue("Position", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ]) + outputs[| 0] = nodeValue_Output("Position", self, VALUE_TYPE.float, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); - outputs[| 1] = nodeValue("Direction", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 1] = nodeValue_Output("Direction", self, VALUE_TYPE.float, 0); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { #region var _path = getInputData(0); diff --git a/scripts/node_path_scatter/node_path_scatter.gml b/scripts/node_path_scatter/node_path_scatter.gml index 59448e4c0..fc3b86b69 100644 --- a/scripts/node_path_scatter/node_path_scatter.gml +++ b/scripts/node_path_scatter/node_path_scatter.gml @@ -2,40 +2,37 @@ function Node_Path_Scatter(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro name = "Scatter Path"; setDimension(96, 48); - inputs[| 0] = nodeValue("Base Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Base Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Scatter Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 1] = nodeValue_PathNode("Scatter Path", self, noone) .setVisible(true, true); - inputs[| 2] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 2] = nodeValue_Slider_Range("Range", self, [ 0, 1 ]); - inputs[| 3] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 3] = nodeValue_Int("Amount", self, 4); - inputs[| 4] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 4] = nodeValue_Slider_Range("Scale", self, [ 0.5, 1 ]); - inputs[| 5] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 5] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 5].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 6] = nodeValue("Scale over Length", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 7] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 45, 135, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.rotation_random); + inputs[| 7] = nodeValue_Rotation_Random("Rotation", self, [ 0, 45, 135, 0, 0 ] ); inputs[| 8] = nodeValue_Enum_Scroll("Distribution", self, 0 , [ "Uniform", "Random" ]); inputs[| 9] = nodeValue("Trim over Length", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 10] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 10] = nodeValue_Float("Range", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 11] = nodeValue("Flip if Negative", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 11] = nodeValue_Bool("Flip if Negative", self, false ); inputs[| 12] = nodeValue_Enum_Scroll("Origin", self, 0 , [ "Individual", "First", "Zero" ]); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); input_display_list = [ 5, ["Paths", false], 0, 1, 10, 9, diff --git a/scripts/node_path_separate_folder/node_path_separate_folder.gml b/scripts/node_path_separate_folder/node_path_separate_folder.gml index c5eb362f2..60229ee7b 100644 --- a/scripts/node_path_separate_folder/node_path_separate_folder.gml +++ b/scripts/node_path_separate_folder/node_path_separate_folder.gml @@ -3,14 +3,14 @@ function Node_Path_Separate_Folder(_x, _y, _group = noone) : Node_Processor(_x, setDimension(96, 48); - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Keep extension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Keep extension", self, true); - outputs[| 0] = nodeValue("Directory", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, ""); + outputs[| 0] = nodeValue_Output("Directory", self, VALUE_TYPE.path, ""); - outputs[| 1] = nodeValue("File Name", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, ""); + outputs[| 1] = nodeValue_Output("File Name", self, VALUE_TYPE.path, ""); static processData = function(_output, _data, _index = 0) { if(_index == 0) diff --git a/scripts/node_path_shift/node_path_shift.gml b/scripts/node_path_shift/node_path_shift.gml index 1ac0ed5ef..01c12030d 100644 --- a/scripts/node_path_shift/node_path_shift.gml +++ b/scripts/node_path_shift/node_path_shift.gml @@ -2,12 +2,12 @@ function Node_Path_Shift(_x, _y, _group = noone) : Node(_x, _y, _group) construc name = "Shift Path"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = nodeValue_Float("Distance", self, 0); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); cached_pos = ds_map_create(); diff --git a/scripts/node_path_smooth/node_path_smooth.gml b/scripts/node_path_smooth/node_path_smooth.gml index 8d701159b..3b656c59f 100644 --- a/scripts/node_path_smooth/node_path_smooth.gml +++ b/scripts/node_path_smooth/node_path_smooth.gml @@ -2,16 +2,16 @@ function Node_Path_Smooth(_x, _y, _group = noone) : Node(_x, _y, _group) constru name = "Smooth Path"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 0] = nodeValue_Bool("Loop", self, false) .rejectArray(); - inputs[| 1] = nodeValue("Round anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 1] = nodeValue_Bool("Round anchor", self, false) .rejectArray(); - inputs[| 2] = nodeValue("Smoothness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3) + inputs[| 2] = nodeValue_Float("Smoothness", self, 3) .setDisplay(VALUE_DISPLAY.slider, { range : [ 1, 5, 0.01 ] } ); - outputs[| 0] = nodeValue("Path data", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path data", self, VALUE_TYPE.pathnode, self); input_display_list = [ ["Path", false], 0, 1, 2, @@ -57,8 +57,7 @@ function Node_Path_Smooth(_x, _y, _group = noone) : Node(_x, _y, _group) constru static createNewInput = function(_x = 0, _y = 0) { #region var index = ds_list_size(inputs); - inputs[| index] = nodeValue("Anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ _x, _y ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| index] = nodeValue_Vector("Anchor", self, [ _x, _y ]); recordAction(ACTION_TYPE.list_insert, inputs, [ inputs[| index], index, "add path anchor point" ]); resetDisplayList(); diff --git a/scripts/node_path_transform/node_path_transform.gml b/scripts/node_path_transform/node_path_transform.gml index 520ed4224..d24b88c49 100644 --- a/scripts/node_path_transform/node_path_transform.gml +++ b/scripts/node_path_transform/node_path_transform.gml @@ -2,21 +2,18 @@ function Node_Path_Transform(_x, _y, _group = noone) : Node(_x, _y, _group) cons name = "Transform Path"; setDimension(96, 48); - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]); inputs[| 2] = nodeValue_Rotation("Rotation", self, 0); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Scale", self, [ 1, 1 ]); - inputs[| 4] = nodeValue("Anchor", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Anchor", self, [ 0, 0 ]); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); cached_pos = ds_map_create(); diff --git a/scripts/node_path_trim/node_path_trim.gml b/scripts/node_path_trim/node_path_trim.gml index 4d9c786c0..2b30a593e 100644 --- a/scripts/node_path_trim/node_path_trim.gml +++ b/scripts/node_path_trim/node_path_trim.gml @@ -2,13 +2,12 @@ function Node_Path_Trim(_x, _y, _group = noone) : Node(_x, _y, _group) construct name = "Trim Path"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 1] = nodeValue_Slider_Range("Range", self, [ 0, 1 ]); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); cached_pos = ds_map_create(); diff --git a/scripts/node_path_wave/node_path_wave.gml b/scripts/node_path_wave/node_path_wave.gml index dea1bde74..be6952f7e 100644 --- a/scripts/node_path_wave/node_path_wave.gml +++ b/scripts/node_path_wave/node_path_wave.gml @@ -2,33 +2,29 @@ function Node_Path_Wave(_x, _y, _group = noone) : Node(_x, _y, _group) construct name = "Wave Path"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 0] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 1] = nodeValue_Range("Frequency", self, [ 4, 4 ], { linked : true }); - inputs[| 2] = nodeValue("Amplitude", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 2] = nodeValue_Range("Amplitude", self, [ 4, 4 ], { linked : true }); - inputs[| 3] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 3] = nodeValue_Range("Shift", self, [ 0, 0 ], { linked : true }); - inputs[| 4] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 4] = nodeValue_Bool("Smooth", self, false); - inputs[| 5] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 5] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 5].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 6] = nodeValue("Wiggle", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 6] = nodeValue_Bool("Wiggle", self, false); - inputs[| 7] = nodeValue("Wiggle Amplitude", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ -2, 2 ]) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 7] = nodeValue_Range("Wiggle Amplitude", self, [ -2, 2 ]); - inputs[| 8] = nodeValue("Wiggle Frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 8); + inputs[| 8] = nodeValue_Float("Wiggle Frequency", self, 8); inputs[| 9] = nodeValue("Amplitude over length", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - outputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, self); + outputs[| 0] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, self); input_display_list = [ 5, ["Path", true], 0, diff --git a/scripts/node_pb_box/node_pb_box.gml b/scripts/node_pb_box/node_pb_box.gml index bdff3fa0a..80476c4fc 100644 --- a/scripts/node_pb_box/node_pb_box.gml +++ b/scripts/node_pb_box/node_pb_box.gml @@ -1,5 +1,5 @@ function Node_PB_Box(_x, _y, _group = noone) : Node_PB(_x, _y, _group) constructor { name = "PB Box"; - inputs[| 0] = nodeValue("Layer Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0 ) + inputs[| 0] = nodeValue_Int("Layer Shift", self, 0 ) } \ No newline at end of file diff --git a/scripts/node_pb_box_contract/node_pb_box_contract.gml b/scripts/node_pb_box_contract/node_pb_box_contract.gml index a06826a6f..53c34c9a0 100644 --- a/scripts/node_pb_box_contract/node_pb_box_contract.gml +++ b/scripts/node_pb_box_contract/node_pb_box_contract.gml @@ -7,16 +7,16 @@ function Node_PB_Box_Contract(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _gro inputs[| 2] = nodeValue_Enum_Scroll("Type", self, 0 , [ "Ratio", "Fix" ]); - inputs[| 3] = nodeValue("Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 3] = nodeValue_Float("Ratio", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Fix Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8 ) + inputs[| 4] = nodeValue_Int("Fix Width", self, 8 ) inputs[| 5] = nodeValue_Enum_Button("Axis", self, 0 , [ "X", "Y" ]); - outputs[| 0] = nodeValue("pBox Center", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 0] = nodeValue_Output("pBox Center", self, VALUE_TYPE.pbBox, noone ); - outputs[| 1] = nodeValue("pBox Side", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 1] = nodeValue_Output("pBox Side", self, VALUE_TYPE.pbBox, noone ); input_display_list = [ 0, 1, ["Split", false], 5, 2, 3, 4, diff --git a/scripts/node_pb_box_divide/node_pb_box_divide.gml b/scripts/node_pb_box_divide/node_pb_box_divide.gml index e8ca1d6ec..25553a396 100644 --- a/scripts/node_pb_box_divide/node_pb_box_divide.gml +++ b/scripts/node_pb_box_divide/node_pb_box_divide.gml @@ -5,19 +5,19 @@ function Node_PB_Box_Divide(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group inputs[| 1] = nodeValue("pBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.pbBox, noone ) .setVisible(true, true); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2 ); + inputs[| 2] = nodeValue_Int("Amount", self, 2 ); - inputs[| 3] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ); + inputs[| 3] = nodeValue_Int("Spacing", self, 1 ); inputs[| 4] = nodeValue_Enum_Button("Axis", self, 0 , [ "X", "Y" ]); - inputs[| 5] = nodeValue("Mirror", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 0 ) + inputs[| 5] = nodeValue_Bool("Mirror", self, 0 ) inputs[| 6] = nodeValue_Enum_Button("Spacing", self, 0 , [ "Space Between", "Space Around", "Begin", "End" ]); - outputs[| 0] = nodeValue("pBox Content", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, [ noone ] ); + outputs[| 0] = nodeValue_Output("pBox Content", self, VALUE_TYPE.pbBox, [ noone ] ); - outputs[| 1] = nodeValue("pBox Space", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, [ noone ] ); + outputs[| 1] = nodeValue_Output("pBox Space", self, VALUE_TYPE.pbBox, [ noone ] ); input_display_list = [ 0, 1, ["Divide", false], 4, 2, 3, 6, 5, diff --git a/scripts/node_pb_box_divide_grid/node_pb_box_divide_grid.gml b/scripts/node_pb_box_divide_grid/node_pb_box_divide_grid.gml index b64cc7f25..196a6cd8c 100644 --- a/scripts/node_pb_box_divide_grid/node_pb_box_divide_grid.gml +++ b/scripts/node_pb_box_divide_grid/node_pb_box_divide_grid.gml @@ -4,14 +4,13 @@ function Node_PB_Box_Divide_Grid(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _ inputs[| 1] = nodeValue("pBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.pbBox, noone ) .setVisible(true, true); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 2, 2 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Amount", self, [ 2, 2 ] ); - inputs[| 3] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ); + inputs[| 3] = nodeValue_Int("Spacing", self, 1 ); - inputs[| 4] = nodeValue("Mirror", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 0 ) + inputs[| 4] = nodeValue_Bool("Mirror", self, 0 ) - outputs[| 0] = nodeValue("pBox", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, [ noone ] ); + outputs[| 0] = nodeValue_Output("pBox", self, VALUE_TYPE.pbBox, [ noone ] ); input_display_list = [ 0, 1, ["Divide", false], 2, 3, 4, diff --git a/scripts/node_pb_box_inset/node_pb_box_inset.gml b/scripts/node_pb_box_inset/node_pb_box_inset.gml index d436ee1f6..48af97ff8 100644 --- a/scripts/node_pb_box_inset/node_pb_box_inset.gml +++ b/scripts/node_pb_box_inset/node_pb_box_inset.gml @@ -5,26 +5,25 @@ function Node_PB_Box_Inset(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group) inputs[| 1] = nodeValue("pBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.pbBox, noone ) .setVisible(true, true); - inputs[| 2] = nodeValue("Inset", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 2, 2, 2, 2 ] ) - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 2] = nodeValue_Padding("Inset", self, [ 2, 2, 2, 2 ] ); inputs[| 3] = nodeValue_Enum_Scroll("Type", self, 0 , [ "Padding", "Ratio" ]); - inputs[| 4] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 4] = nodeValue_Float("Width", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 5] = nodeValue_Float("Height", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Horizontal alignment", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 6] = nodeValue_Float("Horizontal alignment", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Vertical alignment", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 7] = nodeValue_Float("Vertical alignment", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("pBox Inset", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 0] = nodeValue_Output("pBox Inset", self, VALUE_TYPE.pbBox, noone ); - outputs[| 1] = nodeValue("pBox Frame", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 1] = nodeValue_Output("pBox Frame", self, VALUE_TYPE.pbBox, noone ); input_display_list = [ 0, 1, ["Inset", false], 3, 2, 4, 5, 6, 7, diff --git a/scripts/node_pb_box_mirror/node_pb_box_mirror.gml b/scripts/node_pb_box_mirror/node_pb_box_mirror.gml index 36117e7e7..de3ca4014 100644 --- a/scripts/node_pb_box_mirror/node_pb_box_mirror.gml +++ b/scripts/node_pb_box_mirror/node_pb_box_mirror.gml @@ -4,11 +4,11 @@ function Node_PB_Box_Mirror(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group inputs[| 1] = nodeValue("pBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.pbBox, noone ) .setVisible(true, true); - inputs[| 2] = nodeValue("Horizontal", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 2] = nodeValue_Bool("Horizontal", self, false ); - inputs[| 3] = nodeValue("Vertical", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 3] = nodeValue_Bool("Vertical", self, false ); - outputs[| 0] = nodeValue("pBox", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 0] = nodeValue_Output("pBox", self, VALUE_TYPE.pbBox, noone ); input_display_list = [ 0, 1, ["Mirror", false], 2, 3, diff --git a/scripts/node_pb_box_split/node_pb_box_split.gml b/scripts/node_pb_box_split/node_pb_box_split.gml index 00f27733d..d418d97d9 100644 --- a/scripts/node_pb_box_split/node_pb_box_split.gml +++ b/scripts/node_pb_box_split/node_pb_box_split.gml @@ -7,18 +7,18 @@ function Node_PB_Box_Split(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _group) inputs[| 2] = nodeValue_Enum_Scroll("Type", self, 0 , [ "Ratio", "Fix Left", "Fix Right" ]); - inputs[| 3] = nodeValue("Ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 3] = nodeValue_Float("Ratio", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Fix width", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8 ) + inputs[| 4] = nodeValue_Int("Fix width", self, 8 ) inputs[| 5] = nodeValue_Enum_Button("Axis", self, 0 , [ "X", "Y" ]); - inputs[| 6] = nodeValue("Mirror", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 0 ) + inputs[| 6] = nodeValue_Bool("Mirror", self, 0 ) - outputs[| 0] = nodeValue("pBox Left", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 0] = nodeValue_Output("pBox Left", self, VALUE_TYPE.pbBox, noone ); - outputs[| 1] = nodeValue("pBox Right", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 1] = nodeValue_Output("pBox Right", self, VALUE_TYPE.pbBox, noone ); input_display_list = [ 0, 1, ["Split", false], 5, 2, 3, 4, 6, diff --git a/scripts/node_pb_box_transform/node_pb_box_transform.gml b/scripts/node_pb_box_transform/node_pb_box_transform.gml index 8b6737fa3..1091e8c11 100644 --- a/scripts/node_pb_box_transform/node_pb_box_transform.gml +++ b/scripts/node_pb_box_transform/node_pb_box_transform.gml @@ -4,10 +4,9 @@ function Node_PB_Box_Transform(_x, _y, _group = noone) : Node_PB_Box(_x, _y, _gr inputs[| 1] = nodeValue("pBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.pbBox, noone ) .setVisible(true, true); - inputs[| 2] = nodeValue("Translate", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Translate", self, [ 0, 0 ] ); - outputs[| 0] = nodeValue("pBox", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 0] = nodeValue_Output("pBox", self, VALUE_TYPE.pbBox, noone ); input_display_list = [ 0, 1, ["Translate", false], 2, diff --git a/scripts/node_pb_draw/node_pb_draw.gml b/scripts/node_pb_draw/node_pb_draw.gml index 73bf39f4e..80c6ec559 100644 --- a/scripts/node_pb_draw/node_pb_draw.gml +++ b/scripts/node_pb_draw/node_pb_draw.gml @@ -4,11 +4,11 @@ function Node_PB_Draw(_x, _y, _group = noone) : Node_PB(_x, _y, _group) construc inputs[| 0] = nodeValue("pBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.pbBox, noone ) .setVisible(true, true); - inputs[| 1] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 1] = nodeValue_Color("Color", self, c_white ); - inputs[| 2] = nodeValue("Apply Mask", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 2] = nodeValue_Bool("Apply Mask", self, true ); - outputs[| 0] = nodeValue("pBox", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone); + outputs[| 0] = nodeValue_Output("pBox", self, VALUE_TYPE.pbBox, noone); static getGraphPreviewSurface = function() { var _nbox = outputs[| 0].getValue(); diff --git a/scripts/node_pb_draw_angle/node_pb_draw_angle.gml b/scripts/node_pb_draw_angle/node_pb_draw_angle.gml index 1ef9a68e5..0f4eadc14 100644 --- a/scripts/node_pb_draw_angle/node_pb_draw_angle.gml +++ b/scripts/node_pb_draw_angle/node_pb_draw_angle.gml @@ -3,7 +3,7 @@ function Node_PB_Draw_Angle(_x, _y, _group = noone) : Node_PB_Draw(_x, _y, _grou inputs[| 3] = nodeValue_Enum_Button("Side", self, 0 , array_create(4, THEME.obj_angle) ); - inputs[| 4] = nodeValue("Round", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ) + inputs[| 4] = nodeValue_Bool("Round", self, false ) input_display_list = [ ["Draw", false], 0, 1, 2, diff --git a/scripts/node_pb_draw_blob/node_pb_draw_blob.gml b/scripts/node_pb_draw_blob/node_pb_draw_blob.gml index 8633ac1c8..5cc3cba56 100644 --- a/scripts/node_pb_draw_blob/node_pb_draw_blob.gml +++ b/scripts/node_pb_draw_blob/node_pb_draw_blob.gml @@ -1,10 +1,10 @@ function Node_PB_Draw_Blob(_x, _y, _group = noone) : Node_PB_Draw(_x, _y, _group) constructor { name = "Blob"; - inputs[| 3] = nodeValue("Top", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 3] = nodeValue_Float("Top", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Bottom", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 4] = nodeValue_Float("Bottom", self, 1 ) .setDisplay(VALUE_DISPLAY.slider); input_display_list = [ diff --git a/scripts/node_pb_draw_line/node_pb_draw_line.gml b/scripts/node_pb_draw_line/node_pb_draw_line.gml index 2715eb0fc..fb42f7ec4 100644 --- a/scripts/node_pb_draw_line/node_pb_draw_line.gml +++ b/scripts/node_pb_draw_line/node_pb_draw_line.gml @@ -3,7 +3,7 @@ function Node_PB_Draw_Line(_x, _y, _group = noone) : Node_PB_Draw(_x, _y, _group inputs[| 3] = nodeValue_Enum_Button("Direction", self, 0 , [ THEME.obj_draw_line, THEME.obj_draw_line, THEME.obj_draw_line, THEME.obj_draw_line ] ); - inputs[| 4] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2 ) + inputs[| 4] = nodeValue_Int("Thickness", self, 2 ) input_display_list = [ ["Draw", false], 0, 1, 2, diff --git a/scripts/node_pb_draw_round_rectangle/node_pb_draw_round_rectangle.gml b/scripts/node_pb_draw_round_rectangle/node_pb_draw_round_rectangle.gml index f2d17eda0..4a5460d24 100644 --- a/scripts/node_pb_draw_round_rectangle/node_pb_draw_round_rectangle.gml +++ b/scripts/node_pb_draw_round_rectangle/node_pb_draw_round_rectangle.gml @@ -3,15 +3,14 @@ function Node_PB_Draw_Round_Rectangle(_x, _y, _group = noone) : Node_PB_Draw(_x, inputs[| 3] = nodeValue_Enum_Scroll("Type", self, 0 , [ "Uniform", "Per Corner" ]); - inputs[| 4] = nodeValue("Corner Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ); + inputs[| 4] = nodeValue_Int("Corner Radius", self, 1 ); - inputs[| 5] = nodeValue("Corner Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 1, 1, 1, 1 ] ) - .setArrayDepth(1) - .setDisplay(VALUE_DISPLAY.corner); + inputs[| 5] = nodeValue_Corner("Corner Radius", self, [ 1, 1, 1, 1 ] ) + .setArrayDepth(1); - inputs[| 6] = nodeValue("Relative", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 6] = nodeValue_Bool("Relative", self, false ); - inputs[| 7] = nodeValue("Cut Corner", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 7] = nodeValue_Bool("Cut Corner", self, false ); input_display_list = [ ["Draw", false], 0, 1, 2, diff --git a/scripts/node_pb_draw_trapezoid/node_pb_draw_trapezoid.gml b/scripts/node_pb_draw_trapezoid/node_pb_draw_trapezoid.gml index 808d61c7c..12e095fe7 100644 --- a/scripts/node_pb_draw_trapezoid/node_pb_draw_trapezoid.gml +++ b/scripts/node_pb_draw_trapezoid/node_pb_draw_trapezoid.gml @@ -6,16 +6,16 @@ function Node_PB_Draw_Trapezoid(_x, _y, _group = noone) : Node_PB_Draw(_x, _y, _ inputs[| 4] = nodeValue_Enum_Scroll("Type", self, 0 , [ "Symmetric", "Independent" ]); - inputs[| 5] = nodeValue("Bevel", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 5] = nodeValue_Float("Bevel", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Bevel 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 6] = nodeValue_Float("Bevel 1", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Bevel 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 7] = nodeValue_Float("Bevel 2", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 8] = nodeValue_Bool("Invert", self, false ); input_display_list = [ ["Draw", false], 0, 1, 2, diff --git a/scripts/node_pb_fx/node_pb_fx.gml b/scripts/node_pb_fx/node_pb_fx.gml index f3625c7b7..acb1c4c8d 100644 --- a/scripts/node_pb_fx/node_pb_fx.gml +++ b/scripts/node_pb_fx/node_pb_fx.gml @@ -5,7 +5,7 @@ function Node_PB_Fx(_x, _y, _group = noone) : Node_PB(_x, _y, _group) constructo inputs[| 0] = nodeValue("pBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.pbBox, noone) .setVisible(true, true); - outputs[| 0] = nodeValue("pBox", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone); + outputs[| 0] = nodeValue_Output("pBox", self, VALUE_TYPE.pbBox, noone); static getGraphPreviewSurface = function() { var _nbox = outputs[| 0].getValue(); diff --git a/scripts/node_pb_fx_brick/node_pb_fx_brick.gml b/scripts/node_pb_fx_brick/node_pb_fx_brick.gml index 1e2f1ab5f..21ab7c1bb 100644 --- a/scripts/node_pb_fx_brick/node_pb_fx_brick.gml +++ b/scripts/node_pb_fx_brick/node_pb_fx_brick.gml @@ -1,22 +1,20 @@ function Node_PB_Fx_Brick(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _group) constructor { name = "Brick"; - inputs[| 1] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 4, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Scale", self, [ 4, 1 ] ); inputs[| 2] = nodeValue_Enum_Button("Axis", self, 0 , [ "X", "Y" ] ); - inputs[| 3] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 3] = nodeValue_Int("Shift", self, 0); - inputs[| 4] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 4] = nodeValue_Color("Color", self, c_white ); - inputs[| 5] = nodeValue("Dissolve", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0. ) + inputs[| 5] = nodeValue_Float("Dissolve", self, 0. ) .setDisplay(VALUE_DISPLAY.slider) - inputs[| 6] = nodeValue("Detail", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ) + inputs[| 6] = nodeValue_Int("Detail", self, 1 ) - inputs[| 7] = nodeValue("Dissolve Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Dissolve Scale", self, [ 4, 4 ] ); input_display_list = [ 0, ["Effect", false], 1, 2, 3, 4, diff --git a/scripts/node_pb_fx_hash/node_pb_fx_hash.gml b/scripts/node_pb_fx_hash/node_pb_fx_hash.gml index da42eee8a..ba9afb95a 100644 --- a/scripts/node_pb_fx_hash/node_pb_fx_hash.gml +++ b/scripts/node_pb_fx_hash/node_pb_fx_hash.gml @@ -1,19 +1,18 @@ function Node_PB_Fx_Hash(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _group) constructor { name = "Hash"; - inputs[| 1] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 1] = nodeValue_Color("Color", self, c_white ); - inputs[| 2] = nodeValue("Hash", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2. ); + inputs[| 2] = nodeValue_Float("Hash", self, 2. ); - inputs[| 3] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 3] = nodeValue_Bool("Invert", self, false ); - inputs[| 4] = nodeValue("Dissolve", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0. ) + inputs[| 4] = nodeValue_Float("Dissolve", self, 0. ) .setDisplay(VALUE_DISPLAY.slider) - inputs[| 5] = nodeValue("Detail", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ) + inputs[| 5] = nodeValue_Int("Detail", self, 1 ) - inputs[| 6] = nodeValue("Dissolve Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Dissolve Scale", self, [ 4, 4 ] ); input_display_list = [ 0, ["Effect", false], 2, 1, 3, diff --git a/scripts/node_pb_fx_highlight/node_pb_fx_highlight.gml b/scripts/node_pb_fx_highlight/node_pb_fx_highlight.gml index aeb045fa3..6870423e1 100644 --- a/scripts/node_pb_fx_highlight/node_pb_fx_highlight.gml +++ b/scripts/node_pb_fx_highlight/node_pb_fx_highlight.gml @@ -1,19 +1,19 @@ function Node_PB_Fx_Highlight(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _group) constructor { name = "Highlight"; - inputs[| 1] = nodeValue("Highlight Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, array_create(9) ) + inputs[| 1] = nodeValue_Int("Highlight Area", self, array_create(9) ) .setDisplay(VALUE_DISPLAY.matrix, { size: 3 }); - inputs[| 2] = nodeValue("Light Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 2] = nodeValue_Color("Light Color", self, c_white ); - inputs[| 3] = nodeValue("Shadow Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black ); + inputs[| 3] = nodeValue_Color("Shadow Color", self, c_black ); - inputs[| 4] = nodeValue("Roughness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ) + inputs[| 4] = nodeValue_Float("Roughness", self, 0 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Roughness Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ); + inputs[| 5] = nodeValue_Float("Roughness Scale", self, 1 ); - inputs[| 6] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 6] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 6].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); holding_side = noone; diff --git a/scripts/node_pb_fx_outline/node_pb_fx_outline.gml b/scripts/node_pb_fx_outline/node_pb_fx_outline.gml index 21e39e4b8..3a241850e 100644 --- a/scripts/node_pb_fx_outline/node_pb_fx_outline.gml +++ b/scripts/node_pb_fx_outline/node_pb_fx_outline.gml @@ -1,9 +1,9 @@ function Node_PB_Fx_Outline(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _group) constructor { name = "Outline"; - inputs[| 1] = nodeValue("Corner", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 1] = nodeValue_Bool("Corner", self, false ); - inputs[| 2] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 2] = nodeValue_Color("Color", self, c_white ); inputs[| 3] = nodeValue_Enum_Button("Side", self, 0, [ "Inside", "Outside" ]); diff --git a/scripts/node_pb_fx_radial/node_pb_fx_radial.gml b/scripts/node_pb_fx_radial/node_pb_fx_radial.gml index 4d839012b..c6722dacf 100644 --- a/scripts/node_pb_fx_radial/node_pb_fx_radial.gml +++ b/scripts/node_pb_fx_radial/node_pb_fx_radial.gml @@ -1,7 +1,7 @@ function Node_PB_Fx_Radial(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _group) constructor { name = "Radial"; - inputs[| 1] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4 ) + inputs[| 1] = nodeValue_Int("Amount", self, 4 ) .setVisible(true, true); input_display_list = [ 0, diff --git a/scripts/node_pb_fx_shading/node_pb_fx_shading.gml b/scripts/node_pb_fx_shading/node_pb_fx_shading.gml index 5501e6f7f..d34f54c90 100644 --- a/scripts/node_pb_fx_shading/node_pb_fx_shading.gml +++ b/scripts/node_pb_fx_shading/node_pb_fx_shading.gml @@ -1,10 +1,9 @@ function Node_PB_Fx_Shading(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _group) constructor { name = "Shading"; - inputs[| 1] = nodeValue("Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 1, 1, 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 1] = nodeValue_Padding("Width", self, [ 1, 1, 1, 1 ] ); - inputs[| 2] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 2] = nodeValue_Color("Color", self, c_white ); input_display_list = [ 0, ["Effect", false], 1, 2, diff --git a/scripts/node_pb_fx_stack/node_pb_fx_stack.gml b/scripts/node_pb_fx_stack/node_pb_fx_stack.gml index f5d0d8909..56683bd51 100644 --- a/scripts/node_pb_fx_stack/node_pb_fx_stack.gml +++ b/scripts/node_pb_fx_stack/node_pb_fx_stack.gml @@ -1,17 +1,17 @@ function Node_PB_Fx_Stack(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _group) constructor { name = "Stack"; - inputs[| 1] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4 ); + inputs[| 1] = nodeValue_Int("Amount", self, 4 ); inputs[| 2] = nodeValue_Enum_Button("Direction", self, 0 , array_create(4, THEME.obj_direction) ); - inputs[| 3] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 3] = nodeValue_Color("Color", self, c_white ); - inputs[| 4] = nodeValue("Highlight", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 4] = nodeValue_Bool("Highlight", self, false ); - inputs[| 5] = nodeValue("Highlight Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 5] = nodeValue_Color("Highlight Color", self, c_white ); - inputs[| 6] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false ); + inputs[| 6] = nodeValue_Bool("Invert", self, false ); input_display_list = [ 0, ["Effect", false], 1, 2, 6, 3, 4, 5, diff --git a/scripts/node_pb_fx_strip/node_pb_fx_strip.gml b/scripts/node_pb_fx_strip/node_pb_fx_strip.gml index 59dd0bda5..a1ddd2d0e 100644 --- a/scripts/node_pb_fx_strip/node_pb_fx_strip.gml +++ b/scripts/node_pb_fx_strip/node_pb_fx_strip.gml @@ -1,11 +1,11 @@ function Node_PB_Fx_Strip(_x, _y, _group = noone) : Node_PB_Fx(_x, _y, _group) constructor { name = "Strip"; - inputs[| 1] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1 ); + inputs[| 1] = nodeValue_Int("Scale", self, 1 ); - inputs[| 2] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 2] = nodeValue_Color("Color", self, c_white ); - inputs[| 3] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0 ); + inputs[| 3] = nodeValue_Int("Shift", self, 0 ); inputs[| 4] = nodeValue_Enum_Button("Axis", self, 0 , [ "X", "Y" ]); diff --git a/scripts/node_pb_layer/node_pb_layer.gml b/scripts/node_pb_layer/node_pb_layer.gml index c99bfe3ad..c81f3000b 100644 --- a/scripts/node_pb_layer/node_pb_layer.gml +++ b/scripts/node_pb_layer/node_pb_layer.gml @@ -2,9 +2,9 @@ function Node_PB_Layer(_x, _y, _group = noone) : Node(_x, _y, _group) constructo name = "PB Layer"; icon = THEME.pixel_builder; - inputs[| 0] = nodeValue("Layer", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0 ); + inputs[| 0] = nodeValue_Int("Layer", self, 0 ); - outputs[| 0] = nodeValue("pBox", self, JUNCTION_CONNECT.output, VALUE_TYPE.pbBox, noone ); + outputs[| 0] = nodeValue_Output("pBox", self, VALUE_TYPE.pbBox, noone ); static update = function() { var _dim = group.getInputData(0); diff --git a/scripts/node_perlin/node_perlin.gml b/scripts/node_perlin/node_perlin.gml index 4bc75ba63..0b9cf1629 100644 --- a/scripts/node_perlin/node_perlin.gml +++ b/scripts/node_perlin/node_perlin.gml @@ -3,31 +3,26 @@ function Node_Perlin(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 5, 5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 5, 5 ]) .setMappable(10); - inputs[| 3] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 3] = nodeValue_Int("Iteration", self, 4); - inputs[| 4] = nodeValue("Tile", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Tile", self, true); - inputs[| 5] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 5] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 5].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 6] = nodeValue_Enum_Button("Color mode", self, 0, [ "Greyscale", "RGB", "HSV" ]); - inputs[| 7] = nodeValue("Color R range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 7] = nodeValue_Slider_Range("Color R range", self, [ 0, 1 ]); - inputs[| 8] = nodeValue("Color G range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 8] = nodeValue_Slider_Range("Color G range", self, [ 0, 1 ]); - inputs[| 9] = nodeValue("Color B range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 9] = nodeValue_Slider_Range("Color B range", self, [ 0, 1 ]); ////////////////////////////////////////////////////////////////////////////////// @@ -43,7 +38,7 @@ function Node_Perlin(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co ["Render", false], 6, 7, 8, 9, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_perlin_extra/node_perlin_extra.gml b/scripts/node_perlin_extra/node_perlin_extra.gml index a6adb33da..7d757db33 100644 --- a/scripts/node_perlin_extra/node_perlin_extra.gml +++ b/scripts/node_perlin_extra/node_perlin_extra.gml @@ -2,50 +2,45 @@ function Node_Perlin_Extra(_x, _y, _group = noone) : Node_Shader_Generator(_x, _ name = "Extra Perlins"; shader = sh_perlin_extra; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 4 ]) .setMappable(13); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2); + inputs[| 3] = nodeValue_Int("Iteration", self, 2); addShaderProp(SHADER_UNIFORM.integer, "iteration"); - inputs[| 4] = nodeValue("Tile", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Tiling only works with integer scale, and some effect type doesn't support tiling."); + inputs[| 4] = nodeValue_Bool("Tile", self, true, "Tiling only works with integer scale, and some effect type doesn't support tiling."); addShaderProp(SHADER_UNIFORM.integer, "tile"); - inputs[| 5] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 5] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 5].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); inputs[| 6] = nodeValue_Enum_Button("Color mode", self, 0, [ "Greyscale", "RGB", "HSV" ]); addShaderProp(SHADER_UNIFORM.integer, "colored"); - inputs[| 7] = nodeValue("Color R range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 7] = nodeValue_Slider_Range("Color R range", self, [ 0, 1 ]); addShaderProp(SHADER_UNIFORM.float, "colorRanR"); - inputs[| 8] = nodeValue("Color G range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 8] = nodeValue_Slider_Range("Color G range", self, [ 0, 1 ]); addShaderProp(SHADER_UNIFORM.float, "colorRanG"); - inputs[| 9] = nodeValue("Color B range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 9] = nodeValue_Slider_Range("Color B range", self, [ 0, 1 ]); addShaderProp(SHADER_UNIFORM.float, "colorRanB"); inputs[| 10] = nodeValue_Enum_Scroll("Noise type", self, 0, [ "Absolute worley", "Fluid", "Noisy", "Camo", "Blocky", "Max", "Vine" ]); addShaderProp(SHADER_UNIFORM.integer, "type"); - inputs[| 11] = nodeValue("Parameter A", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 11] = nodeValue_Float("Parameter A", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(14); addShaderProp(SHADER_UNIFORM.float, "paramA"); - inputs[| 12] = nodeValue("Parameter B", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Parameter B", self, 1) .setMappable(15); addShaderProp(SHADER_UNIFORM.float, "paramB"); diff --git a/scripts/node_perlin_smear/node_perlin_smear.gml b/scripts/node_perlin_smear/node_perlin_smear.gml index b264d31aa..d94b9733e 100644 --- a/scripts/node_perlin_smear/node_perlin_smear.gml +++ b/scripts/node_perlin_smear/node_perlin_smear.gml @@ -3,21 +3,19 @@ function Node_Perlin_Smear(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 6 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 6 ]); - inputs[| 3] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 3); + inputs[| 3] = nodeValue_Int("Iteration", self, 3); - inputs[| 4] = nodeValue("Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 4] = nodeValue_Float("Brightness", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); inputs[| 5] = nodeValue_Rotation("Rotation", self, 0); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", false], 0, diff --git a/scripts/node_pin/node_pin.gml b/scripts/node_pin/node_pin.gml index e496aa53b..c3baa29d6 100644 --- a/scripts/node_pin/node_pin.gml +++ b/scripts/node_pin/node_pin.gml @@ -16,7 +16,7 @@ function Node_Pin(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { inputs[| 0] = nodeValue("In", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0 ) .setVisible(true, true); - outputs[| 0] = nodeValue("Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("Out", self, VALUE_TYPE.any, 0); static update = function() { if(inputs[| 0].value_from != noone) { diff --git a/scripts/node_pixel_builder/node_pixel_builder.gml b/scripts/node_pixel_builder/node_pixel_builder.gml index c04de80b0..b8e8b38b4 100644 --- a/scripts/node_pixel_builder/node_pixel_builder.gml +++ b/scripts/node_pixel_builder/node_pixel_builder.gml @@ -7,7 +7,7 @@ function Node_Pixel_Builder(_x, _y, _group = noone) : Node_Collection(_x, _y, _g inputs[| 0] = nodeValue_Dimension(self); - outputs[| 0] = nodeValue("Surface Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface Out", self, VALUE_TYPE.surface, noone); custom_input_index = ds_list_size(inputs); custom_output_index = ds_list_size(outputs); diff --git a/scripts/node_pixel_cloud/node_pixel_cloud.gml b/scripts/node_pixel_cloud/node_pixel_cloud.gml index 6802a3079..6245b1a6b 100644 --- a/scripts/node_pixel_cloud/node_pixel_cloud.gml +++ b/scripts/node_pixel_cloud/node_pixel_cloud.gml @@ -3,25 +3,25 @@ function Node_Pixel_Cloud(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 1] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 2] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 2] = nodeValue_Float("Strength", self, 0.1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01] }); inputs[| 3] = nodeValue_Surface("Strength map", self); - inputs[| 4] = nodeValue("Color over lifetime", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 4] = nodeValue_Gradient("Color over lifetime", self, new gradientObject(cola(c_white))) .setMappable(9); - inputs[| 5] = nodeValue("Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 5] = nodeValue_Float("Distance", self, 1); inputs[| 6] = nodeValue("Alpha over lifetime", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 7] = nodeValue("Random blending", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 7] = nodeValue_Float("Random blending", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Active", self, true); active_index = 8; ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -38,7 +38,7 @@ function Node_Pixel_Cloud(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ["Color", true], 4, 9, 6, 7 ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_pixel_sampler/node_pixel_sampler.gml b/scripts/node_pixel_sampler/node_pixel_sampler.gml index 7a3bbe90b..6d08b9745 100644 --- a/scripts/node_pixel_sampler/node_pixel_sampler.gml +++ b/scripts/node_pixel_sampler/node_pixel_sampler.gml @@ -10,7 +10,7 @@ function Node_Pixel_Sampler(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 3] = nodeValue_Surface("Surfaces", self, [ noone ]) .setArrayDepth(1); - inputs[| 4] = nodeValue("Gradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject([ cola(c_black), cola(c_white) ]) ) + inputs[| 4] = nodeValue_Gradient("Gradient", self, new gradientObject([ cola(c_black), cola(c_white) ])) .setMappable(5); inputs[| 5] = nodeValueMap("Gradient map", self); @@ -19,10 +19,10 @@ function Node_Pixel_Sampler(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 7] = nodeValue_Enum_Scroll("Color Blending", self, 0 , [ "None", "Multiply" ]); - inputs[| 8] = nodeValue("Blending Intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1 ) + inputs[| 8] = nodeValue_Float("Blending Intensity", self, 1 ) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Base Texture", false], 0, 1, 2, diff --git a/scripts/node_pixel_sort/node_pixel_sort.gml b/scripts/node_pixel_sort/node_pixel_sort.gml index fc256c75b..e82cada65 100644 --- a/scripts/node_pixel_sort/node_pixel_sort.gml +++ b/scripts/node_pixel_sort/node_pixel_sort.gml @@ -9,24 +9,23 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2); + inputs[| 1] = nodeValue_Int("Iteration", self, 2); - inputs[| 2] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 2] = nodeValue_Float("Threshold", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Direction", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 3] = nodeValue_Int("Direction", self, 0) .setDisplay(VALUE_DISPLAY.rotation, { step: 90 }); inputs[| 4] = nodeValue_Surface("Mask", self); - inputs[| 5] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 5] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Active", self, true); active_index = 6; - inputs[| 7] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 7] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(4); // inputs 8, 9 @@ -35,7 +34,7 @@ function Node_Pixel_Sort(_x, _y, _group = noone) : Node_Processor(_x, _y, _group ["Pixel sort", false], 1, 2, 3, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_plot_linear/node_plot_linear.gml b/scripts/node_plot_linear/node_plot_linear.gml index 693cdbcf4..31debcc7e 100644 --- a/scripts/node_plot_linear/node_plot_linear.gml +++ b/scripts/node_plot_linear/node_plot_linear.gml @@ -21,67 +21,64 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Data", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) + inputs[| 1] = nodeValue_Float("Data", self, []) .setArrayDepth(1) .setVisible(true, true); - inputs[| 2] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 2] = nodeValue_Slider_Range("Range", self, [ 0, 1 ]); - inputs[| 3] = nodeValue("Sample frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 3] = nodeValue_Float("Sample frequency", self, 1); - inputs[| 4] = nodeValue("Origin", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, DEF_SURF_H / 2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Origin", self, [ 0, DEF_SURF_H / 2 ]); - inputs[| 5] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_SURF_W / 2); + inputs[| 5] = nodeValue_Float("Scale", self, DEF_SURF_W / 2); - inputs[| 6] = nodeValue("Base Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 6] = nodeValue_Color("Base Color", self, c_white); - inputs[| 7] = nodeValue("Graph Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 7] = nodeValue_Float("Graph Thickness", self, 1); - inputs[| 8] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 8] = nodeValue_Bool("Background", self, false); - inputs[| 9] = nodeValue("Background color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 9] = nodeValue_Color("Background color", self, c_black); inputs[| 10] = nodeValue_Rotation("Direction", self, 0); inputs[| 11] = nodeValue_Enum_Scroll("Type", self, 0, [ new scrollItem("Bar chart", s_node_plot_linear_type, 0), new scrollItem("Graph", s_node_plot_linear_type, 1), ]); - inputs[| 12] = nodeValue("Value Offset", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 12] = nodeValue_Float("Value Offset", self, 0); - inputs[| 13] = nodeValue("Color Over Sample", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))) + inputs[| 13] = nodeValue_Gradient("Color Over Sample", self, new gradientObject(cola(c_white))) .setMappable(27); inputs[| 14] = nodeValue_Enum_Scroll("Trim mode", self, 0, [ "Range", "Window" ]); - inputs[| 15] = nodeValue("Window Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8); + inputs[| 15] = nodeValue_Int("Window Size", self, 8); - inputs[| 16] = nodeValue("Window Offset", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 16] = nodeValue_Float("Window Offset", self, 0); - inputs[| 17] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 17] = nodeValue_Float("Spacing", self, 1); - inputs[| 18] = nodeValue("Bar Width", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4); + inputs[| 18] = nodeValue_Float("Bar Width", self, 4); - inputs[| 19] = nodeValue("Rounded Bar", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 19] = nodeValue_Bool("Rounded Bar", self, false); - inputs[| 20] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 20] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 21] = nodeValue("Flip Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 21] = nodeValue_Bool("Flip Value", self, false); - inputs[| 22] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 22] = nodeValue_Bool("Loop", self, false); - inputs[| 23] = nodeValue("Smooth", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 23] = nodeValue_Float("Smooth", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 24] = nodeValue("Color Over Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))) + inputs[| 24] = nodeValue_Gradient("Color Over Value", self, new gradientObject(cola(c_white))) .setMappable(29); - inputs[| 25] = nodeValue("Value range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ] ) - .setDisplay(VALUE_DISPLAY.range); + inputs[| 25] = nodeValue_Range("Value range", self, [ 0, 1 ] ); - inputs[| 26] = nodeValue("Absolute", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 26] = nodeValue_Bool("Absolute", self, false); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -95,7 +92,7 @@ function Node_Plot_Linear(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Data", true], 1, 12, 21, 14, 2, 3, 15, 16, diff --git a/scripts/node_polar/node_polar.gml b/scripts/node_polar/node_polar.gml index e2113777b..32e21fedd 100644 --- a/scripts/node_polar/node_polar.gml +++ b/scripts/node_polar/node_polar.gml @@ -5,18 +5,17 @@ function Node_Polar(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 1] = nodeValue_Surface("Mask", self); - inputs[| 2] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - inputs[| 4] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 4] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); - inputs[| 5] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 5] = nodeValue_Bool("Invert", self, false) - inputs[| 6] = nodeValue("Blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Blend", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setMappable(11); @@ -26,7 +25,7 @@ function Node_Polar(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con new scrollItem("Inverse Square", s_node_curve, 1), new scrollItem("Logarithm", s_node_curve, 3), ]); - inputs[| 10] = nodeValue("Swap", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 10] = nodeValue_Bool("Swap", self, false) ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -34,10 +33,9 @@ function Node_Polar(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 12] = nodeValue("Tile", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 12] = nodeValue_Vector("Tile", self, [ 1, 1 ] ); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 3, 4, ["Surfaces", false], 0, 1, 2, 7, 8, 12, diff --git a/scripts/node_posterize/node_posterize.gml b/scripts/node_posterize/node_posterize.gml index df2555d6a..8254b713b 100644 --- a/scripts/node_posterize/node_posterize.gml +++ b/scripts/node_posterize/node_posterize.gml @@ -3,22 +3,21 @@ function Node_Posterize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 1] = nodeValue_Palette("Palette", self, array_clone(DEF_PALETTE)); - inputs[| 2] = nodeValue("Use palette", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Use palette", self, true); - inputs[| 3] = nodeValue("Steps", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 3] = nodeValue_Int("Steps", self, 4) .setDisplay(VALUE_DISPLAY.slider, { range: [2, 16, 0.1] }); - inputs[| 4] = nodeValue("Gamma", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Gamma", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 2, 0.01] }) .setMappable(7); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Posterize alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Posterize alpha", self, true); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -33,7 +32,7 @@ function Node_Posterize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ["Alpha", false], 6, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_print/node_print.gml b/scripts/node_print/node_print.gml index 71ff49d14..580c6951c 100644 --- a/scripts/node_print/node_print.gml +++ b/scripts/node_print/node_print.gml @@ -4,9 +4,9 @@ function Node_Print(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { draw_padding = 8; - inputs[| 0] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 0] = nodeValue_Bool("Active", self, true); - inputs[| 1] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Text", self, ""); static update = function() { var act = getInputData(0); diff --git a/scripts/node_project_data/node_project_data.gml b/scripts/node_project_data/node_project_data.gml index bebe1ffc4..f9f14bfbb 100644 --- a/scripts/node_project_data/node_project_data.gml +++ b/scripts/node_project_data/node_project_data.gml @@ -2,19 +2,19 @@ function Node_Project_Data(_x, _y, _group = noone) : Node(_x, _y, _group) constr name = "Project Data"; setDimension(96, 48);; - outputs[| 0] = nodeValue("Name", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, "") + outputs[| 0] = nodeValue_Output("Name", self, VALUE_TYPE.text, "") .setVisible(false); - outputs[| 1] = nodeValue("Description", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, "") + outputs[| 1] = nodeValue_Output("Description", self, VALUE_TYPE.text, "") .setVisible(false); - outputs[| 2] = nodeValue("Author", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, "") + outputs[| 2] = nodeValue_Output("Author", self, VALUE_TYPE.text, "") .setVisible(false); - outputs[| 3] = nodeValue("Contact", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, "") + outputs[| 3] = nodeValue_Output("Contact", self, VALUE_TYPE.text, "") .setVisible(false); - outputs[| 4] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, "") + outputs[| 4] = nodeValue_Output("Path", self, VALUE_TYPE.path, "") .setVisible(false); static update = function() { diff --git a/scripts/node_pytagorean_tile/node_pytagorean_tile.gml b/scripts/node_pytagorean_tile/node_pytagorean_tile.gml index 30c26acbc..6f86f6583 100644 --- a/scripts/node_pytagorean_tile/node_pytagorean_tile.gml +++ b/scripts/node_pytagorean_tile/node_pytagorean_tile.gml @@ -3,34 +3,32 @@ function Node_Pytagorean_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _ inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 1, 1 ]) .setMappable(11); inputs[| 3] = nodeValue_Rotation("Rotation", self, 0) .setMappable(12); - inputs[| 4] = nodeValue("Gap", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.25) + inputs[| 4] = nodeValue_Float("Gap", self, 0.25) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(13); - inputs[| 5] = nodeValue("Tile color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 5] = nodeValue_Gradient("Tile color", self, new gradientObject(cola(c_white))) .setMappable(18); - inputs[| 6] = nodeValue("Gap color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 6] = nodeValue_Color("Gap color", self, c_black); inputs[| 7] = nodeValue_Enum_Scroll("Render type", self, 0, ["Colored tile", "Height map", "Texture grid"]); - inputs[| 8] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 8] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 8].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 9] = nodeValue_Surface("Texture", self); - inputs[| 10] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 10] = nodeValue_Bool("Anti aliasing", self, false); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -42,11 +40,11 @@ function Node_Pytagorean_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _ ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 14] = nodeValue("Truchet", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 14] = nodeValue_Bool("Truchet", self, false); - inputs[| 15] = nodeValue("Truchet seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random()); + inputs[| 15] = nodeValue_Int("Truchet seed", self, seed_random()); - inputs[| 16] = nodeValue("Truchet threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 16] = nodeValue_Float("Truchet threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) inputs[| 17] = nodeValue_Rotation("Phase", self, 90); @@ -59,11 +57,9 @@ function Node_Pytagorean_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _ ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 20] = nodeValue("Texture angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 20] = nodeValue_Rotation_Range("Texture angle", self, [ 0, 0 ]); - inputs[| 21] = nodeValue("Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 21] = nodeValue_Slider_Range("Level", self, [ 0, 1 ]); input_display_list = [ ["Output", false], 0, @@ -72,7 +68,7 @@ function Node_Pytagorean_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _ ["Truchet", true, 14], 15, 16, 20, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_quasicrystal/node_quasicrystal.gml b/scripts/node_quasicrystal/node_quasicrystal.gml index 6970159bb..c1bed9cd8 100644 --- a/scripts/node_quasicrystal/node_quasicrystal.gml +++ b/scripts/node_quasicrystal/node_quasicrystal.gml @@ -3,20 +3,19 @@ function Node_Quasicrystal(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 16) + inputs[| 1] = nodeValue_Float("Scale", self, 16) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 64, 0.1] }) .setMappable(6); inputs[| 2] = nodeValue_Rotation("Angle", self, 0) .setMappable(7); - inputs[| 3] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 4] = nodeValue("Color 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 4] = nodeValue_Color("Color 1", self, c_white); - inputs[| 5] = nodeValue("Color 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 5] = nodeValue_Color("Color 2", self, c_black); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -26,16 +25,15 @@ function Node_Quasicrystal(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 8] = nodeValue("Phase", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 8] = nodeValue_Float("Phase", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(8); inputs[| 9] = nodeValueMap("Phasemap", self); - inputs[| 10] = nodeValue("Angle Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 180 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 10] = nodeValue_Rotation_Range("Angle Range", self, [ 0, 180 ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", true], 0, diff --git a/scripts/node_random/node_random.gml b/scripts/node_random/node_random.gml index 0d0822e73..40a1500ee 100644 --- a/scripts/node_random/node_random.gml +++ b/scripts/node_random/node_random.gml @@ -4,13 +4,13 @@ function Node_Random(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co setDimension(96, 48); - inputs[| 0] = nodeValue("seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, irandom(99999)); + inputs[| 0] = nodeValue_Int("seed", self, irandom(99999)); - inputs[| 1] = nodeValue("from", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = nodeValue_Float("from", self, 0); - inputs[| 2] = nodeValue("to", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = nodeValue_Float("to", self, 1); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.float, 0); static processData = function(_output, _data, _output_index, _array_index = 0) { random_set_seed(_data[0]); diff --git a/scripts/node_random_shape/node_random_shape.gml b/scripts/node_random_shape/node_random_shape.gml index 59c6a4521..8b0b81d6d 100644 --- a/scripts/node_random_shape/node_random_shape.gml +++ b/scripts/node_random_shape/node_random_shape.gml @@ -3,10 +3,10 @@ function Node_Random_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 1] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", false], 0, diff --git a/scripts/node_random_tile/node_random_tile.gml b/scripts/node_random_tile/node_random_tile.gml index b1fa3a07a..b8eb3274d 100644 --- a/scripts/node_random_tile/node_random_tile.gml +++ b/scripts/node_random_tile/node_random_tile.gml @@ -3,34 +3,32 @@ function Node_Random_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 2, 2 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 2, 2 ]) .setMappable(11); inputs[| 3] = nodeValue_Rotation("Angle", self, 0) .setMappable(12); - inputs[| 4] = nodeValue("Gap", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 4] = nodeValue_Float("Gap", self, 0.1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(13); - inputs[| 5] = nodeValue("Tile color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 5] = nodeValue_Gradient("Tile color", self, new gradientObject(cola(c_white))) .setMappable(17); - inputs[| 6] = nodeValue("Gap color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 6] = nodeValue_Color("Gap color", self, c_black); inputs[| 7] = nodeValue_Enum_Scroll("Render type", self, 0, ["Colored tile", "Height map", "Texture grid"]); - inputs[| 8] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 8] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 8].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 9] = nodeValue_Surface("Texture", self); - inputs[| 10] = nodeValue("Anti aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 10] = nodeValue_Bool("Anti aliasing", self, false); ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -42,11 +40,11 @@ function Node_Random_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 14] = nodeValue("Truchet", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 14] = nodeValue_Bool("Truchet", self, false); - inputs[| 15] = nodeValue("Truchet seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random()); + inputs[| 15] = nodeValue_Int("Truchet seed", self, seed_random()); - inputs[| 16] = nodeValue("Truchet threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 16] = nodeValue_Float("Truchet threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -57,11 +55,9 @@ function Node_Random_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 19] = nodeValue("Texture angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 19] = nodeValue_Rotation_Range("Texture angle", self, [ 0, 0 ]); - inputs[| 20] = nodeValue("Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 20] = nodeValue_Slider_Range("Level", self, [ 0, 1 ]); input_display_list = [ ["Output", false], 0, @@ -70,7 +66,7 @@ function Node_Random_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ["Truchet", true, 14], 15, 16, 19, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_rate_remap/node_rate_remap.gml b/scripts/node_rate_remap/node_rate_remap.gml index 5b854bd74..0f8ff1ed5 100644 --- a/scripts/node_rate_remap/node_rate_remap.gml +++ b/scripts/node_rate_remap/node_rate_remap.gml @@ -4,13 +4,13 @@ function Node_Rate_Remap(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 0] = nodeValue_Surface("Surface", self); - inputs[| 1] = nodeValue("Framerate", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 10) + inputs[| 1] = nodeValue_Float("Framerate", self, 10) .setValidator(VV_min(1)); - inputs[| 2] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Active", self, true); active_index = 2; - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone); input_display_list = [ 2, ["Remap", false], 0, 1 diff --git a/scripts/node_rd/node_rd.gml b/scripts/node_rd/node_rd.gml index 4fec751f8..d419ce418 100644 --- a/scripts/node_rd/node_rd.gml +++ b/scripts/node_rd/node_rd.gml @@ -3,24 +3,24 @@ function Node_RD(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { inputs[| 0] = nodeValue_Surface("Seed", self); - inputs[| 1] = nodeValue("Kill rate", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.058) + inputs[| 1] = nodeValue_Float("Kill rate", self, 0.058) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 0.1, 0.001] }) .setMappable(8); - inputs[| 2] = nodeValue("Feed rate", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.043) + inputs[| 2] = nodeValue_Float("Feed rate", self, 0.043) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 0.1, 0.001] }) .setMappable(9); - inputs[| 3] = nodeValue("Timestep", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Timestep", self, 1) .setMappable(10); - inputs[| 4] = nodeValue("Iteration", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 16); + inputs[| 4] = nodeValue_Int("Iteration", self, 16); - inputs[| 5] = nodeValue("Diffusion A", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.) + inputs[| 5] = nodeValue_Float("Diffusion A", self, 1.) .setDisplay(VALUE_DISPLAY.slider) .setMappable(11); - inputs[| 6] = nodeValue("Diffusion B", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .2) + inputs[| 6] = nodeValue_Float("Diffusion B", self, .2) .setDisplay(VALUE_DISPLAY.slider) .setMappable(12); @@ -45,12 +45,12 @@ function Node_RD(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { ////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 13] = nodeValue("Diffusion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.) + inputs[| 13] = nodeValue_Float("Diffusion", self, 1.) .setDisplay(VALUE_DISPLAY.slider) - outputs[| 0] = nodeValue("Reacted", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Reacted", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Rendered", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Rendered", self, VALUE_TYPE.surface, noone); preview_channel = 1; diff --git a/scripts/node_region_fill/node_region_fill.gml b/scripts/node_region_fill/node_region_fill.gml index d060d511e..fdbe09f50 100644 --- a/scripts/node_region_fill/node_region_fill.gml +++ b/scripts/node_region_fill/node_region_fill.gml @@ -5,17 +5,16 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 1] = nodeValue_Surface("Mask", self); - inputs[| 2] = nodeValue("Fill Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 2] = nodeValue_Palette("Fill Colors", self, array_clone(DEF_PALETTE)); - inputs[| 3] = nodeValue("Fill", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Fill", self, true); - inputs[| 4] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 4] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 4].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 5] = nodeValue("Target Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 5] = nodeValue_Color("Target Color", self, c_white); - inputs[| 6] = nodeValue("Inner only", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Only fill regions with surrounding pixels."); + inputs[| 6] = nodeValue_Bool("Inner only", self, false, "Only fill regions with surrounding pixels."); inputs[| 7] = nodeValue_Enum_Scroll("Draw original", self, 0, [ "None", "Above", "Behind" ]); @@ -25,9 +24,9 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 10] = nodeValue_Surface("Texture map", self); - inputs[| 11] = nodeValue("Color Filter", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Color Filter", self, false); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 4, ["Surfaces", false], 0, 1, diff --git a/scripts/node_render_sprite_sheet/node_render_sprite_sheet.gml b/scripts/node_render_sprite_sheet/node_render_sprite_sheet.gml index e11459a75..42bf6ee06 100644 --- a/scripts/node_render_sprite_sheet/node_render_sprite_sheet.gml +++ b/scripts/node_render_sprite_sheet/node_render_sprite_sheet.gml @@ -20,7 +20,7 @@ function Node_Render_Sprite_Sheet(_x, _y, _group = noone) : Node(_x, _y, _group) inputs[| 1] = nodeValue_Enum_Scroll("Sprite set", self, 0, [ "Animation", "Sprite array" ]) .rejectArray(); - inputs[| 2] = nodeValue("Frame step", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1, "Number of frames until next sprite. Can be seen as (Step - 1) frame skip.") + inputs[| 2] = nodeValue_Int("Frame step", self, 1, "Number of frames until next sprite. Can be seen as (Step - 1) frame skip.") .rejectArray(); inputs[| 3] = nodeValue_Enum_Scroll("Packing type", self, 0, [ new scrollItem("Horizontal", s_node_alignment, 0), @@ -28,30 +28,28 @@ function Node_Render_Sprite_Sheet(_x, _y, _group = noone) : Node(_x, _y, _group) new scrollItem("Grid", s_node_alignment, 2), ]) .rejectArray(); - inputs[| 4] = nodeValue("Grid column", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 4] = nodeValue_Int("Grid column", self, 4) .rejectArray(); inputs[| 5] = nodeValue_Enum_Button("Alignment", self, 0, [ "First", "Middle", "Last" ]) .rejectArray(); - inputs[| 6] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 6] = nodeValue_Int("Spacing", self, 0); - inputs[| 7] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 7] = nodeValue_Padding("Padding", self, [ 0, 0, 0, 0 ]) - inputs[| 8] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ], "Starting/ending frames, set end to 0 to default to last frame.") - .setDisplay(VALUE_DISPLAY.slider_range) + inputs[| 8] = nodeValue_Slider_Range("Range", self, [ 0, 0 ]) + .setTooltip("Starting/ending frames, set end to 0 to default to last frame.") - inputs[| 9] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 9] = nodeValue_Vector("Spacing", self, [ 0, 0 ]); - inputs[| 10] = nodeValue("Overlappable", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 10] = nodeValue_Bool("Overlappable", self, false); - inputs[| 11] = nodeValue("Custom Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Custom Range", self, false); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas Data", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []); + outputs[| 1] = nodeValue_Output("Atlas Data", self, VALUE_TYPE.surface, []); input_display_list = [ ["Surfaces", false], 0, 1, 2, diff --git a/scripts/node_repeat/node_repeat.gml b/scripts/node_repeat/node_repeat.gml index 253d8742f..af6e05406 100644 --- a/scripts/node_repeat/node_repeat.gml +++ b/scripts/node_repeat/node_repeat.gml @@ -24,42 +24,38 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2) + inputs[| 2] = nodeValue_Int("Amount", self, 2) .rejectArray(); inputs[| 3] = nodeValue_Enum_Scroll("Pattern", self, 0, [ new scrollItem("Linear", s_node_repeat_axis, 0), new scrollItem("Grid", s_node_repeat_axis, 1), new scrollItem("Circular", s_node_repeat_axis, 2), ]); - inputs[| 4] = nodeValue("Shift position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W / 2, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Shift position", self, [ DEF_SURF_W / 2, 0 ]) .setUnitRef(function() { return getDimension(); }); - inputs[| 5] = nodeValue("Repeat rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 5] = nodeValue_Rotation_Range("Repeat rotation", self, [0, 0]); - inputs[| 6] = nodeValue("Scale multiply", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 6] = nodeValue_Float("Scale multiply", self, 1); - inputs[| 7] = nodeValue("Angle range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 360]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 7] = nodeValue_Rotation_Range("Angle range", self, [0, 360]); - inputs[| 8] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 8] = nodeValue_Float("Radius", self, 1); - inputs[| 9] = nodeValue("Start position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 9] = nodeValue_Vector("Start position", self, [0, 0]) .setUnitRef(function(index) { return getInputData(1); }); inputs[| 10] = nodeValue("Scale over copy", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11 ); - inputs[| 11] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone, "Make each copy follow along path." ) + inputs[| 11] = nodeValue_PathNode("Path", self, noone, "Make each copy follow along path." ) .setVisible(true, true); - inputs[| 12] = nodeValue("Path range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 1], "Range of the path to follow.") - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 12] = nodeValue_Slider_Range("Path range", self, [0, 1]) + .setTooltip("Range of the path to follow."); - inputs[| 13] = nodeValue("Path shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 13] = nodeValue_Float("Path shift", self, 0); - inputs[| 14] = nodeValue("Color over copy", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 14] = nodeValue_Gradient("Color over copy", self, new gradientObject(cola(c_white))) .setMappable(30); inputs[| 15] = nodeValue("Alpha over copy", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11 ); @@ -67,40 +63,37 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 16] = nodeValue_Enum_Button("Array select", self, 0, [ "Order", "Random", "Spread" ]) .setTooltip("Whether to select image from an array in order, at random, or spread or each image to one output."); - inputs[| 17] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 17] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 17].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 18] = nodeValue("Column", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 18] = nodeValue_Int("Column", self, 4); - inputs[| 19] = nodeValue("Column shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, DEF_SURF_H / 2]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 19] = nodeValue_Vector("Column shift", self, [0, DEF_SURF_H / 2]) .setUnitRef(function() { return getDimension(); }); - inputs[| 20] = nodeValue("Animator midpoint", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 20] = nodeValue_Float("Animator midpoint", self, 0.5) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 2, 0.01] }); - inputs[| 21] = nodeValue("Animator range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 21] = nodeValue_Float("Animator range", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 22] = nodeValue("Animator position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 22] = nodeValue_Vector("Animator position", self, [ 0, 0 ]); inputs[| 23] = nodeValue_Rotation("Animator rotation", self, 0); - inputs[| 24] = nodeValue("Animator scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 24] = nodeValue_Vector("Animator scale", self, [ 0, 0 ]); inputs[| 25] = nodeValue("Animator falloff", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_10); inputs[| 26] = nodeValue_Enum_Button("Stack", self, 0, [ "None", "X", "Y" ]) .setTooltip("Place each copy next to each other, taking surface dimension into account."); - inputs[| 27] = nodeValue("Animator blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, cola(c_white)); + inputs[| 27] = nodeValue_Color("Animator blend", self, cola(c_white)); - inputs[| 28] = nodeValue("Animator alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 28] = nodeValue_Float("Animator alpha", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 29] = nodeValue("Animator", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 29] = nodeValue_Bool("Animator", self, false) ////////////////////////////////////////////////////////////////////////////////////////////////// @@ -116,7 +109,7 @@ function Node_Repeat(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 34] = nodeValue_Enum_Scroll("Blend Mode", self, 0, [ "Normal", "Additive", "Maximum" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surfaces", true], 0, 1, 16, 17, diff --git a/scripts/node_repeat_texture/node_repeat_texture.gml b/scripts/node_repeat_texture/node_repeat_texture.gml index 5304b7121..9b1df124d 100644 --- a/scripts/node_repeat_texture/node_repeat_texture.gml +++ b/scripts/node_repeat_texture/node_repeat_texture.gml @@ -4,15 +4,14 @@ function Node_Repeat_Texture(_x, _y, _group = noone) : Node_Processor(_x, _y, _g inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Target dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Target dimension", self, DEF_SURF); inputs[| 2] = nodeValue_Enum_Scroll("Type", self, 1, [ "Tile", "Scatter", "Cell" ]); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 3, ["Surfaces", false], 0, diff --git a/scripts/node_rgb_channel/node_rgb_channel.gml b/scripts/node_rgb_channel/node_rgb_channel.gml index 07c35e8bb..0a869c8e7 100644 --- a/scripts/node_rgb_channel/node_rgb_channel.gml +++ b/scripts/node_rgb_channel/node_rgb_channel.gml @@ -6,14 +6,14 @@ function Node_RGB_Channel(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 1] = nodeValue_Enum_Scroll("Output Type", self, 0, [ "Channel value", "Greyscale" ]); - inputs[| 2] = nodeValue("Keep Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Keep Alpha", self, false); - inputs[| 3] = nodeValue("Output Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Output Array", self, false); - outputs[| 0] = nodeValue("Red", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Green", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 2] = nodeValue("Blue", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); - outputs[| 3] = nodeValue("Alpha", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Red", self, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Green", self, VALUE_TYPE.surface, noone); + outputs[| 2] = nodeValue_Output("Blue", self, VALUE_TYPE.surface, noone); + outputs[| 3] = nodeValue_Output("Alpha", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_rigid_activate/node_rigid_activate.gml b/scripts/node_rigid_activate/node_rigid_activate.gml index f71349a6a..baaca3bb8 100644 --- a/scripts/node_rigid_activate/node_rigid_activate.gml +++ b/scripts/node_rigid_activate/node_rigid_activate.gml @@ -9,10 +9,10 @@ function Node_Rigid_Activate(_x, _y, _group = noone) : Node(_x, _y, _group) cons inputs[| 0] = nodeValue("Object", self, JUNCTION_CONNECT.input, VALUE_TYPE.rigid, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Physics activated", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 1] = nodeValue_Bool("Physics activated", self, true) .rejectArray(); - outputs[| 0] = nodeValue("Object", self, JUNCTION_CONNECT.output, VALUE_TYPE.rigid, noone); + outputs[| 0] = nodeValue_Output("Object", self, VALUE_TYPE.rigid, noone); input_display_list = [ ["Object", true], 0, diff --git a/scripts/node_rigid_force_apply/node_rigid_force_apply.gml b/scripts/node_rigid_force_apply/node_rigid_force_apply.gml index 810215399..dfda0c53f 100644 --- a/scripts/node_rigid_force_apply/node_rigid_force_apply.gml +++ b/scripts/node_rigid_force_apply/node_rigid_force_apply.gml @@ -12,31 +12,29 @@ function Node_Rigid_Force_Apply(_x, _y, _group = noone) : Node(_x, _y, _group) c inputs[| 1] = nodeValue_Enum_Scroll("Force type", self, 0, [ "Constant", "Impulse", "Torque", "Explode" ]) .rejectArray(); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0 ]) .rejectArray(); - inputs[| 3] = nodeValue("Torque", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 3] = nodeValue_Float("Torque", self, 0) .rejectArray(); - inputs[| 4] = nodeValue("Apply frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0, "Frame index to apply force.") + inputs[| 4] = nodeValue_Int("Apply frame", self, 0, "Frame index to apply force.") .rejectArray(); - inputs[| 5] = nodeValue("Force", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.1, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 5] = nodeValue_Vector("Force", self, [ 0.1, 0 ]) .rejectArray(); inputs[| 6] = nodeValue_Enum_Button("Scope", self, 0, [ "Global", "Local" ]) .rejectArray(); - inputs[| 7] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 7] = nodeValue_Float("Strength", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 16, 0.01] }) .rejectArray(); - inputs[| 8] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 8) + inputs[| 8] = nodeValue_Float("Range", self, 8) .rejectArray(); - outputs[| 0] = nodeValue("Object", self, JUNCTION_CONNECT.output, VALUE_TYPE.rigid, noone); + outputs[| 0] = nodeValue_Output("Object", self, VALUE_TYPE.rigid, noone); input_display_list = [ ["Object", true], 0, diff --git a/scripts/node_rigid_global/node_rigid_global.gml b/scripts/node_rigid_global/node_rigid_global.gml index d4f51d816..0f932c1af 100644 --- a/scripts/node_rigid_global/node_rigid_global.gml +++ b/scripts/node_rigid_global/node_rigid_global.gml @@ -8,8 +8,7 @@ function Node_Rigid_Global(_x, _y, _group = noone) : Node(_x, _y, _group) constr object = noone; - inputs[| 0] = nodeValue("Gravity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 10 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 0] = nodeValue_Vector("Gravity", self, [ 0, 10 ]); current_gra = [0, 0]; diff --git a/scripts/node_rigid_group_inline/node_rigid_group_inline.gml b/scripts/node_rigid_group_inline/node_rigid_group_inline.gml index 4bea50278..901b6b7cd 100644 --- a/scripts/node_rigid_group_inline/node_rigid_group_inline.gml +++ b/scripts/node_rigid_group_inline/node_rigid_group_inline.gml @@ -6,8 +6,7 @@ function Node_Rigid_Group_Inline(_x, _y, _group = noone) : Node_Collection_Inlin is_simulation = true; manual_ungroupable = false; - inputs[| 0] = nodeValue("Gravity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 10 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 0] = nodeValue_Vector("Gravity", self, [ 0, 10 ]); if(NODE_NEW_MANUAL) { var _object = nodeBuild("Node_Rigid_Object", x, y); diff --git a/scripts/node_rigid_object/node_rigid_object.gml b/scripts/node_rigid_object/node_rigid_object.gml index 68b08135a..1033c7cac 100644 --- a/scripts/node_rigid_object/node_rigid_object.gml +++ b/scripts/node_rigid_object/node_rigid_object.gml @@ -15,23 +15,23 @@ function Node_Rigid_Object(_x, _y, _group = noone) : Node(_x, _y, _group) constr object = []; attributes.mesh = []; - inputs[| 0] = nodeValue("Affect by force", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 0] = nodeValue_Bool("Affect by force", self, true) .rejectArray() .setAnimable(false); - inputs[| 1] = nodeValue("Weight", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 1] = nodeValue_Float("Weight", self, 0.5) .rejectArray() .setAnimable(false); - inputs[| 2] = nodeValue("Contact friction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 2] = nodeValue_Float("Contact friction", self, 0.2) .rejectArray() .setAnimable(false); - inputs[| 3] = nodeValue("Air resistance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 3] = nodeValue_Float("Air resistance", self, 0.2) .rejectArray() .setAnimable(false); - inputs[| 4] = nodeValue("Rotation resistance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 4] = nodeValue_Float("Rotation resistance", self, 0.2) .rejectArray() .setAnimable(false); @@ -42,30 +42,29 @@ function Node_Rigid_Object(_x, _y, _group = noone) : Node(_x, _y, _group) constr inputs[| 6] = nodeValue_Surface("Texture", self) .setAnimable(false); - inputs[| 7] = nodeValue("Start position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 7] = nodeValue_Vector("Start position", self, [ 16, 16 ]) .setAnimable(false); - inputs[| 8] = nodeValue("Spawn", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Make object spawn when start.") + inputs[| 8] = nodeValue_Bool("Spawn", self, true, "Make object spawn when start.") .rejectArray() .setAnimable(false); - inputs[| 9] = nodeValue("Generate mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 9] = nodeValue_Trigger("Generate mesh", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Generate", UI : true, onClick: function() { generateAllMesh(); } }); - inputs[| 10] = nodeValue("Mesh expansion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 10] = nodeValue_Float("Mesh expansion", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -2, 2, 0.1 ] }) .rejectArray() .setAnimable(false); - inputs[| 11] = nodeValue("Add pixel collider", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 11] = nodeValue_Bool("Add pixel collider", self, true) .rejectArray() .setAnimable(false); - inputs[| 12] = nodeValue("Collision group", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 12] = nodeValue_Int("Collision group", self, 1) .rejectArray() - outputs[| 0] = nodeValue("Object", self, JUNCTION_CONNECT.output, VALUE_TYPE.rigid, object); + outputs[| 0] = nodeValue_Output("Object", self, VALUE_TYPE.rigid, object); input_display_list = [ 8, 12, ["Texture", false], 6, diff --git a/scripts/node_rigid_object_spawner/node_rigid_object_spawner.gml b/scripts/node_rigid_object_spawner/node_rigid_object_spawner.gml index 817b5b6b8..826c636da 100644 --- a/scripts/node_rigid_object_spawner/node_rigid_object_spawner.gml +++ b/scripts/node_rigid_object_spawner/node_rigid_object_spawner.gml @@ -11,29 +11,28 @@ function Node_Rigid_Object_Spawner(_x, _y, _group = noone) : Node(_x, _y, _group inputs[| 0] = nodeValue("Object", self, JUNCTION_CONNECT.input, VALUE_TYPE.rigid, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Spawn area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA) - .setDisplay(VALUE_DISPLAY.area) + inputs[| 1] = nodeValue_Area("Spawn area", self, DEF_AREA) .rejectArray(); inputs[| 2] = nodeValue_Enum_Button("Spawn type", self, 0, [ "Stream", "Burst" ]) .rejectArray(); - inputs[| 3] = nodeValue("Spawn delay", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 3] = nodeValue_Int("Spawn delay", self, 4) .rejectArray(); - inputs[| 4] = nodeValue("Spawn amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 4] = nodeValue_Int("Spawn amount", self, 1) .rejectArray(); - inputs[| 5] = nodeValue("Spawn frame", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 5] = nodeValue_Int("Spawn frame", self, 0) .rejectArray(); - inputs[| 6] = nodeValue("Spawn", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 6] = nodeValue_Bool("Spawn", self, true) .rejectArray(); - inputs[| 7] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 7] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 7].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - outputs[| 0] = nodeValue("Object", self, JUNCTION_CONNECT.output, VALUE_TYPE.rigid, object); + outputs[| 0] = nodeValue_Output("Object", self, VALUE_TYPE.rigid, object); input_display_list = [ 0, 7, ["Spawn", false], 6, 1, 2, 3, 5, 4, diff --git a/scripts/node_rigid_override/node_rigid_override.gml b/scripts/node_rigid_override/node_rigid_override.gml index f4553ad43..29117eed4 100644 --- a/scripts/node_rigid_override/node_rigid_override.gml +++ b/scripts/node_rigid_override/node_rigid_override.gml @@ -10,22 +10,19 @@ function Node_Rigid_Override(_x, _y, _group = noone) : Node(_x, _y, _group) cons inputs[| 0] = nodeValue("Object", self, JUNCTION_CONNECT.input, VALUE_TYPE.rigid, noone ) .setVisible(true, true); - inputs[| 1] = nodeValue("Positions", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Positions", self, [0, 0] ); - inputs[| 2] = nodeValue("Scales", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scales", self, [0, 0] ); - inputs[| 3] = nodeValue("Rotations", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ); + inputs[| 3] = nodeValue_Float("Rotations", self, 0 ); - inputs[| 4] = nodeValue("Blends", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, 0 ); + inputs[| 4] = nodeValue_Color("Blends", self, 0 ); - inputs[| 5] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0 ); + inputs[| 5] = nodeValue_Float("Alpha", self, 0 ); - inputs[| 6] = nodeValue("Velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Velocity", self, [0, 0] ); - outputs[| 0] = nodeValue("Object", self, JUNCTION_CONNECT.output, VALUE_TYPE.rigid, noone ); + outputs[| 0] = nodeValue_Output("Object", self, VALUE_TYPE.rigid, noone ); static update = function(frame = CURRENT_FRAME) { var objs = getInputData(0); diff --git a/scripts/node_rigid_render/node_rigid_render.gml b/scripts/node_rigid_render/node_rigid_render.gml index e6de1f34e..507f1c078 100644 --- a/scripts/node_rigid_render/node_rigid_render.gml +++ b/scripts/node_rigid_render/node_rigid_render.gml @@ -8,12 +8,11 @@ function Node_Rigid_Render(_x, _y, _group = noone) : Node(_x, _y, _group) constr //use_cache = CACHE_USE.auto; update_on_frame = true; - inputs[| 0] = nodeValue("Render dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 0] = nodeValue_Vector("Render dimension", self, DEF_SURF); - inputs[| 1] = nodeValue("Round position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 1] = nodeValue_Bool("Round position", self, false) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_rigid_render_output/node_rigid_render_output.gml b/scripts/node_rigid_render_output/node_rigid_render_output.gml index f10e691b0..ad6242265 100644 --- a/scripts/node_rigid_render_output/node_rigid_render_output.gml +++ b/scripts/node_rigid_render_output/node_rigid_render_output.gml @@ -7,11 +7,10 @@ function Node_Rigid_Render_Output(_x, _y, _group = noone) : Node_Group_Output(_x previewable = true; - inputs[| 0] = nodeValue("Render dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Render dimension", self, DEF_SURF) .rejectArray(); - inputs[| 1] = nodeValue("Round position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 1] = nodeValue_Bool("Round position", self, false) attribute_surface_depth(); diff --git a/scripts/node_rigid_variable/node_rigid_variable.gml b/scripts/node_rigid_variable/node_rigid_variable.gml index dea7cecd9..e768c1b6d 100644 --- a/scripts/node_rigid_variable/node_rigid_variable.gml +++ b/scripts/node_rigid_variable/node_rigid_variable.gml @@ -13,32 +13,32 @@ function Node_Rigid_Variable(_x, _y, _group = noone) : Node(_x, _y, _group) cons input_display_list = [ 0 ]; - outputs[| 0] = nodeValue("Positions", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ] ) + outputs[| 0] = nodeValue_Output("Positions", self, VALUE_TYPE.float, [ 0, 0 ] ) .setDisplay(VALUE_DISPLAY.vector) .setVisible(false); - outputs[| 1] = nodeValue("Scales", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ] ) + outputs[| 1] = nodeValue_Output("Scales", self, VALUE_TYPE.float, [ 0, 0 ] ) .setDisplay(VALUE_DISPLAY.vector) .setVisible(false); - outputs[| 2] = nodeValue("Rotations", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ) + outputs[| 2] = nodeValue_Output("Rotations", self, VALUE_TYPE.float, 0 ) .setVisible(false); - outputs[| 3] = nodeValue("Blends", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, 0 ) + outputs[| 3] = nodeValue_Output("Blends", self, VALUE_TYPE.color, 0 ) .setVisible(false); - outputs[| 4] = nodeValue("Alpha", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ) + outputs[| 4] = nodeValue_Output("Alpha", self, VALUE_TYPE.float, 0 ) .setVisible(false); - outputs[| 5] = nodeValue("Velocity", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ] ) + outputs[| 5] = nodeValue_Output("Velocity", self, VALUE_TYPE.float, [ 0, 0 ] ) .setDisplay(VALUE_DISPLAY.vector) .setVisible(false); - outputs[| 6] = nodeValue("Center of mass", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ] ) + outputs[| 6] = nodeValue_Output("Center of mass", self, VALUE_TYPE.float, [ 0, 0 ] ) .setDisplay(VALUE_DISPLAY.vector) .setVisible(false); - outputs[| 7] = nodeValue("Velocity magnitude", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ) + outputs[| 7] = nodeValue_Output("Velocity magnitude", self, VALUE_TYPE.float, 0 ) .setDisplay(VALUE_DISPLAY.vector) .setVisible(false); diff --git a/scripts/node_rigid_wall/node_rigid_wall.gml b/scripts/node_rigid_wall/node_rigid_wall.gml index e0bfe06d7..d8925529b 100644 --- a/scripts/node_rigid_wall/node_rigid_wall.gml +++ b/scripts/node_rigid_wall/node_rigid_wall.gml @@ -8,14 +8,13 @@ function Node_Rigid_Wall(_x, _y, _group = noone) : Node(_x, _y, _group) construc object = []; - inputs[| 0] = nodeValue("Sides", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b0010) - .setDisplay(VALUE_DISPLAY.toggle, { data : [ "T", "B", "L", "R" ] }); + inputs[| 0] = nodeValue_Toggle("Sides", self, 0b0010, { data : [ "T", "B", "L", "R" ] }); - inputs[| 1] = nodeValue("Contact Friction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2); + inputs[| 1] = nodeValue_Float("Contact Friction", self, 0.2); inputs[| 2] = nodeValue_Dimension(self); - inputs[| 3] = nodeValue("Collision Group", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 3] = nodeValue_Int("Collision Group", self, 1); input_display_list = [ 3, 0, 2, ["Physics", false], 1 diff --git a/scripts/node_rm_cloud/node_rm_cloud.gml b/scripts/node_rm_cloud/node_rm_cloud.gml index bdc1f661e..76d8237ea 100644 --- a/scripts/node_rm_cloud/node_rm_cloud.gml +++ b/scripts/node_rm_cloud/node_rm_cloud.gml @@ -3,41 +3,38 @@ function Node_RM_Cloud(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0, 0 ]); - inputs[| 2] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Rotation", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }); - inputs[| 4] = nodeValue("FOV", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 30) + inputs[| 4] = nodeValue_Float("FOV", self, 30) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 90, 1 ] }); - inputs[| 5] = nodeValue("View Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 6 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("View Range", self, [ 0, 6 ]); - inputs[| 6] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 6] = nodeValue_Float("Density", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Detail", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8); + inputs[| 7] = nodeValue_Int("Detail", self, 8); - inputs[| 8] = nodeValue("Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.4) + inputs[| 8] = nodeValue_Float("Threshold", self, 0.4) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Detail Scaling", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 2.); + inputs[| 9] = nodeValue_Float("Detail Scaling", self, 2.); - inputs[| 10] = nodeValue("Detail Attenuation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 10] = nodeValue_Float("Detail Attenuation", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); inputs[| 11] = nodeValue_Enum_Scroll("Shape", self, 0, [ "Volume", "Plane" ]); - inputs[| 12] = nodeValue("Use Fog", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, 0) + inputs[| 12] = nodeValue_Bool("Use Fog", self, 0) - inputs[| 13] = nodeValue("Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject([ cola(c_black), cola(c_white) ]) ) + inputs[| 13] = nodeValue_Gradient("Colors", self, new gradientObject([ cola(c_black), cola(c_white) ])) - outputs[| 0] = nodeValue("Surface Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface Out", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Transform", false], 1, 2, 3, diff --git a/scripts/node_rm_combine/node_rm_combine.gml b/scripts/node_rm_combine/node_rm_combine.gml index 728a89800..4a24bf741 100644 --- a/scripts/node_rm_combine/node_rm_combine.gml +++ b/scripts/node_rm_combine/node_rm_combine.gml @@ -7,57 +7,54 @@ function Node_RM_Combine(_x, _y, _group = noone) : Node_RM(_x, _y, _group) const inputs[| 1] = nodeValue_Enum_Button("Projection", self, 0, [ "Perspective", "Orthographic" ]); - inputs[| 2] = nodeValue("FOV", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 30) + inputs[| 2] = nodeValue_Float("FOV", self, 30) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 90, 1 ] }); - inputs[| 3] = nodeValue("Ortho Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 5.) + inputs[| 3] = nodeValue_Float("Ortho Scale", self, 5.) - inputs[| 4] = nodeValue("View Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 3, 6 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("View Range", self, [ 3, 6 ]); - inputs[| 5] = nodeValue("Depth", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 5] = nodeValue_Float("Depth", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Draw BG", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 6] = nodeValue_Bool("Draw BG", self, false); - inputs[| 7] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 7] = nodeValue_Color("Background", self, c_black); - inputs[| 8] = nodeValue("Ambient Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 8] = nodeValue_Float("Ambient Level", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Light Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ -.4, -.5, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 9] = nodeValue_Vector("Light Position", self, [ -.4, -.5, 1 ]); inputs[| 10] = nodeValue_Surface("Environment", self); - inputs[| 11] = nodeValue("Camera Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 30, 45, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 11] = nodeValue_Vector("Camera Rotation", self, [ 30, 45, 0 ]); - inputs[| 12] = nodeValue("Camera Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Camera Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }); //////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 13] = nodeValue("Shape 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.sdf, {}) + inputs[| 13] = nodeValue_SDF("Shape 1", self, {}) .setVisible(true, true); - inputs[| 14] = nodeValue("Shape 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.sdf, {}) + inputs[| 14] = nodeValue_SDF("Shape 2", self, {}) .setVisible(true, true); //////////////////////////////////////////////////////////////////////////////////////////////////////////////// inputs[| 15] = nodeValue_Enum_Scroll("Type", self, 0, [ "Place", "Union", "Subtract", "Intersect" ]); - inputs[| 16] = nodeValue("Merge", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 16] = nodeValue_Float("Merge", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 17] = nodeValue("Render", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 17] = nodeValue_Bool("Render", self, true); - inputs[| 18] = nodeValue("Env Interpolation", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 18] = nodeValue_Bool("Env Interpolation", self, false); - outputs[| 0] = nodeValue("Surface Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface Out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Shape Data", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdf, noone); + outputs[| 1] = nodeValue_Output("Shape Data", self, VALUE_TYPE.sdf, noone); input_display_list = [ 0, ["Combine", false], 15, 16, 13, 14, diff --git a/scripts/node_rm_primitive/node_rm_primitive.gml b/scripts/node_rm_primitive/node_rm_primitive.gml index 211305e50..8c91cb0ee 100644 --- a/scripts/node_rm_primitive/node_rm_primitive.gml +++ b/scripts/node_rm_primitive/node_rm_primitive.gml @@ -20,151 +20,134 @@ function Node_RM_Primitive(_x, _y, _group = noone) : Node_RM(_x, _y, _group) con inputs[| 1] = nodeValue_Enum_Scroll("Shape", self, 1, { data: shape_types_str, horizontal: true, text_pad: ui(16) }); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Rotation", self, [ 0, 0, 0 ]); - inputs[| 4] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }); - inputs[| 5] = nodeValue("FOV", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 30) + inputs[| 5] = nodeValue_Float("FOV", self, 30) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 90, 1 ] }); - inputs[| 6] = nodeValue("View Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 3, 6 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("View Range", self, [ 3, 6 ]); - inputs[| 7] = nodeValue("Depth", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 7] = nodeValue_Float("Depth", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Light Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ -.4, -.5, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 8] = nodeValue_Vector("Light Position", self, [ -.4, -.5, 1 ]); - inputs[| 9] = nodeValue("Base Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 9] = nodeValue_Color("Base Color", self, c_white); - inputs[| 10] = nodeValue("Ambient Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 10] = nodeValue_Float("Ambient Level", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 11] = nodeValue("Elongate", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 11] = nodeValue_Vector("Elongate", self, [ 0, 0, 0 ]); - inputs[| 12] = nodeValue("Rounded", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 12] = nodeValue_Float("Rounded", self, 0.) .setDisplay(VALUE_DISPLAY.slider); inputs[| 13] = nodeValue_Enum_Button("Projection", self, 0, [ "Perspective", "Orthographic" ]); - inputs[| 14] = nodeValue("Ortho Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.) + inputs[| 14] = nodeValue_Float("Ortho Scale", self, 1.) - inputs[| 15] = nodeValue("Wave Amplitude", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 15] = nodeValue_Vector("Wave Amplitude", self, [ 4, 4, 4 ]); - inputs[| 16] = nodeValue("Wave Intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 16] = nodeValue_Vector("Wave Intensity", self, [ 0, 0, 0 ]); - inputs[| 17] = nodeValue("Wave Phase", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 17] = nodeValue_Vector("Wave Phase", self, [ 0, 0, 0 ]); inputs[| 18] = nodeValue_Enum_Button("Twist Axis", self, 0, [ "X", "Y", "Z" ]); - inputs[| 19] = nodeValue("Twist Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 19] = nodeValue_Float("Twist Amount", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 8, 0.1 ] }); - inputs[| 20] = nodeValue("Tile Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 20] = nodeValue_Vector("Tile Distance", self, [ 1, 1, 1 ]); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 21] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 21] = nodeValue_Vector("Size", self, [ 1, 1, 1 ]); - inputs[| 22] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .7) + inputs[| 22] = nodeValue_Float("Radius", self, .7) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 23] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .2) + inputs[| 23] = nodeValue_Float("Thickness", self, .2) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 24] = nodeValue("Crop", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 24] = nodeValue_Float("Crop", self, 0.) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }); inputs[| 25] = nodeValue_Rotation("Angle", self, 30); - inputs[| 26] = nodeValue("Height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .5) + inputs[| 26] = nodeValue_Float("Height", self, .5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 27] = nodeValue("Radius Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ .7, .1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 27] = nodeValue_Slider_Range("Radius Range", self, [ .7, .1 ]); - inputs[| 28] = nodeValue("Uniform Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 28] = nodeValue_Float("Uniform Size", self, 1) .setDisplay(VALUE_DISPLAY.slider); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 29] = nodeValue("Tile Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 29] = nodeValue_Vector("Tile Amount", self, [ 1, 1, 1 ]); - inputs[| 30] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 30] = nodeValue_Color("Background", self, c_black); - inputs[| 31] = nodeValue("Draw BG", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 31] = nodeValue_Bool("Draw BG", self, false); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 32] = nodeValue("Volumetric", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 32] = nodeValue_Bool("Volumetric", self, false); - inputs[| 33] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.3) + inputs[| 33] = nodeValue_Float("Density", self, 0.3) .setDisplay(VALUE_DISPLAY.slider); inputs[| 34] = nodeValue_Surface("Environment", self); - inputs[| 35] = nodeValue("Reflective", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.) + inputs[| 35] = nodeValue_Float("Reflective", self, 0.) .setDisplay(VALUE_DISPLAY.slider); inputs[| 36] = nodeValue_Surface("Texture", self); - inputs[| 37] = nodeValue("Triplanar Smoothing", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.) + inputs[| 37] = nodeValue_Float("Triplanar Smoothing", self, 1.) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 10, 0.1 ] }); - inputs[| 38] = nodeValue("Texture Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.); + inputs[| 38] = nodeValue_Float("Texture Scale", self, 1.); - inputs[| 39] = nodeValue("Corner", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.25, 0.25, 0.25, 0.25 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 39] = nodeValue_Vector("Corner", self, [ 0.25, 0.25, 0.25, 0.25 ]); - inputs[| 40] = nodeValue("2D Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 40] = nodeValue_Vector("2D Size", self, [ 0.5, 0.5 ]); - inputs[| 41] = nodeValue("Side", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 3); + inputs[| 41] = nodeValue_Int("Side", self, 3); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 42] = nodeValue("Camera Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 30, 45, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 42] = nodeValue_Vector("Camera Rotation", self, [ 30, 45, 0 ]); - inputs[| 43] = nodeValue("Camera Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 43] = nodeValue_Float("Camera Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }); - inputs[| 44] = nodeValue("Render", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 44] = nodeValue_Bool("Render", self, true); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 45] = nodeValue("Tile", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 45] = nodeValue_Bool("Tile", self, false); - inputs[| 46] = nodeValue("Tiled Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 46] = nodeValue_Vector("Tiled Shift", self, [ 0, 0, 0 ]); - inputs[| 47] = nodeValue("Tiled Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 47] = nodeValue_Vector("Tiled Rotation", self, [ 0, 0, 0 ]); - inputs[| 48] = nodeValue("Tiled Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 48] = nodeValue_Float("Tiled Scale", self, 0); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 49] = nodeValue("Env Interpolation", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 49] = nodeValue_Bool("Env Interpolation", self, false); - inputs[| 50] = nodeValue("Texture Interpolation", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 50] = nodeValue_Bool("Texture Interpolation", self, false); - outputs[| 0] = nodeValue("Surface Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface Out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Shape Data", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdf, noone); + outputs[| 1] = nodeValue_Output("Shape Data", self, VALUE_TYPE.sdf, noone); input_display_list = [ 0, ["Primitive", false], 1, 21, 22, 23, 24, 25, 26, 27, 28, 39, 40, 41, diff --git a/scripts/node_rm_render/node_rm_render.gml b/scripts/node_rm_render/node_rm_render.gml index 6a5fbdeb1..172a08f26 100644 --- a/scripts/node_rm_render/node_rm_render.gml +++ b/scripts/node_rm_render/node_rm_render.gml @@ -7,45 +7,42 @@ function Node_RM_Render(_x, _y, _group = noone) : Node_RM(_x, _y, _group) constr inputs[| 1] = nodeValue_Enum_Button("Projection", self, 0, [ "Perspective", "Orthographic" ]); - inputs[| 2] = nodeValue("FOV", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 30) + inputs[| 2] = nodeValue_Float("FOV", self, 30) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 90, 1 ] }); - inputs[| 3] = nodeValue("Ortho Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 5.) + inputs[| 3] = nodeValue_Float("Ortho Scale", self, 5.) - inputs[| 4] = nodeValue("View Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 3, 6 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("View Range", self, [ 3, 6 ]); - inputs[| 5] = nodeValue("Depth", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 5] = nodeValue_Float("Depth", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Draw BG", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 6] = nodeValue_Bool("Draw BG", self, false); - inputs[| 7] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 7] = nodeValue_Color("Background", self, c_black); - inputs[| 8] = nodeValue("Ambient Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 8] = nodeValue_Float("Ambient Level", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Light Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ -.4, -.5, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 9] = nodeValue_Vector("Light Position", self, [ -.4, -.5, 1 ]); inputs[| 10] = nodeValue_Surface("Environment", self); - inputs[| 11] = nodeValue("Camera Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 30, 45, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 11] = nodeValue_Vector("Camera Rotation", self, [ 30, 45, 0 ]); - inputs[| 12] = nodeValue("Camera Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Camera Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }); //////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 13] = nodeValue("SDF Object", self, JUNCTION_CONNECT.input, VALUE_TYPE.sdf, {}) + inputs[| 13] = nodeValue_SDF("SDF Object", self, {}) .setVisible(true, true); //////////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 14] = nodeValue("Env Interpolation", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 14] = nodeValue_Bool("Env Interpolation", self, false); - outputs[| 0] = nodeValue("Surface Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface Out", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, 13, ["Camera", false], 11, 12, 1, 2, 3, 4, 5, diff --git a/scripts/node_rm_terrain/node_rm_terrain.gml b/scripts/node_rm_terrain/node_rm_terrain.gml index 3fa4d9361..6a653f6a2 100644 --- a/scripts/node_rm_terrain/node_rm_terrain.gml +++ b/scripts/node_rm_terrain/node_rm_terrain.gml @@ -5,44 +5,40 @@ function Node_RM_Terrain(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 1] = nodeValue_Surface("Surface", self); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [ 0, 0, 0 ]); - inputs[| 3] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 30, 45, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Rotation", self, [ 30, 45, 0 ]); - inputs[| 4] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }); - inputs[| 5] = nodeValue("FOV", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 30) + inputs[| 5] = nodeValue_Float("FOV", self, 30) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 90, 1 ] }); - inputs[| 6] = nodeValue("View Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 6 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("View Range", self, [ 0, 6 ]); - inputs[| 7] = nodeValue("BG Bleed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 7] = nodeValue_Float("BG Bleed", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Ambient", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 8] = nodeValue_Color("Ambient", self, c_white); - inputs[| 9] = nodeValue("Height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 9] = nodeValue_Float("Height", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 4, 0.01 ] }); - inputs[| 10] = nodeValue("Tile", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true) + inputs[| 10] = nodeValue_Bool("Tile", self, true) inputs[| 11] = nodeValue_Surface("Texture", self); - inputs[| 12] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 12] = nodeValue_Color("Background", self, c_black); inputs[| 13] = nodeValue_Surface("Reflection", self); - inputs[| 14] = nodeValue("Sun Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ .5, 1, .5 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 14] = nodeValue_Vector("Sun Position", self, [ .5, 1, .5 ]); - inputs[| 15] = nodeValue("Shadow", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 15] = nodeValue_Float("Shadow", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Surface Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface Out", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Extrusion", false], 1, 9, 10, diff --git a/scripts/node_sampler/node_sampler.gml b/scripts/node_sampler/node_sampler.gml index 0500d4cfb..2aeeb4b1e 100644 --- a/scripts/node_sampler/node_sampler.gml +++ b/scripts/node_sampler/node_sampler.gml @@ -4,16 +4,15 @@ function Node_Sampler(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Sampling size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1, "Size of square around the position to sample and average pixel color.") + inputs[| 2] = nodeValue_Int("Sampling size", self, 1, "Size of square around the position to sample and average pixel color.") .setDisplay(VALUE_DISPLAY.slider, { range: [1, 3, 0.1] }); - inputs[| 3] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Alpha", self, false); - outputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, c_white); + outputs[| 0] = nodeValue_Output("Color", self, VALUE_TYPE.color, c_white); static getPreviewValues = function() { return getInputData(0); } diff --git a/scripts/node_scale/node_scale.gml b/scripts/node_scale/node_scale.gml index adc1ca3de..698b92046 100644 --- a/scripts/node_scale/node_scale.gml +++ b/scripts/node_scale/node_scale.gml @@ -6,19 +6,18 @@ function Node_Scale(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 1] = nodeValue_Float("Scale", self, 1); inputs[| 2] = nodeValue_Enum_Button("Mode", self, 0, [ "Upscale", "Scale to fit" ]); - inputs[| 3] = nodeValue("Target dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Target dimension", self, DEF_SURF); - inputs[| 4] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Active", self, true); active_index = 4; - inputs[| 5] = nodeValue("Scale atlas position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Scale atlas position", self, true); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 4, ["Surfaces", true], 0, diff --git a/scripts/node_scale_algo/node_scale_algo.gml b/scripts/node_scale_algo/node_scale_algo.gml index e9773a657..cab151648 100644 --- a/scripts/node_scale_algo/node_scale_algo.gml +++ b/scripts/node_scale_algo/node_scale_algo.gml @@ -20,17 +20,17 @@ function Node_Scale_Algo(_x, _y, _group = noone) : Node_Processor(_x, _y, _group inputs[| 1] = nodeValue_Enum_Scroll("Algorithm", self, 0, [ "Scale2x", "Scale3x", "CleanEdge" ]); - inputs[| 2] = nodeValue("Tolerance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Tolerance", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - inputs[| 4] = nodeValue("Scale atlas position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Scale atlas position", self, true); - inputs[| 5] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4); + inputs[| 5] = nodeValue_Float("Scale", self, 4); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 3, ["Surfaces", false], 0, diff --git a/scripts/node_scatter/node_scatter.gml b/scripts/node_scatter/node_scatter.gml index e01b166ed..6dfeea967 100644 --- a/scripts/node_scatter/node_scatter.gml +++ b/scripts/node_scatter/node_scatter.gml @@ -16,73 +16,67 @@ function Node_Scatter(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8) + inputs[| 2] = nodeValue_Int("Amount", self, 8) .setValidator(VV_min(0)); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1, 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector_range, { linked : true }); + inputs[| 3] = nodeValue_Vec2_Range("Scale", self, [ 1, 1, 1, 1 ] , { linked : true }); - inputs[| 4] = nodeValue("Angle", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.rotation_random); + inputs[| 4] = nodeValue_Rotation_Random("Angle", self, [ 0, 0, 0, 0, 0 ] ); onSurfaceSize = function() { return getInputData(1, DEF_SURF); }; - inputs[| 5] = nodeValue("Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_AREA_REF) - .setUnitRef(onSurfaceSize, VALUE_UNIT.reference) - .setDisplay(VALUE_DISPLAY.area, { onSurfaceSize }); + inputs[| 5] = nodeValue_Area("Area", self, DEF_AREA_REF, { onSurfaceSize }) + .setUnitRef(onSurfaceSize, VALUE_UNIT.reference); inputs[| 6] = nodeValue_Enum_Scroll("Distribution", self, 5, [ "Area", "Border", "Map", "Direct Data", "Path", "Full image + Tile" ]); - inputs[| 7] = nodeValue("Point at center", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Rotate each copy to face the spawn center."); + inputs[| 7] = nodeValue_Bool("Point at center", self, false, "Rotate each copy to face the spawn center."); - inputs[| 8] = nodeValue("Uniform scaling", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Uniform scaling", self, true); inputs[| 9] = nodeValue_Enum_Button("Scatter", self, 1, [ "Uniform", "Random" ]); - inputs[| 10] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 10] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 10].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 11] = nodeValue("Random blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 11] = nodeValue_Gradient("Random blend", self, new gradientObject(cola(c_white))) .setMappable(28); - inputs[| 12] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 12] = nodeValue_Slider_Range("Alpha", self, [ 1, 1 ]); inputs[| 13] = nodeValue_Surface("Distribution map", self); - inputs[| 14] = nodeValue("Distribution data", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, []) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 14] = nodeValue_Vector("Distribution data", self, []); inputs[| 14].array_depth = 1; - inputs[| 15] = nodeValue("Array", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0, @"What to do when input array of surface. + inputs[| 15] = nodeValue_Int("Array", self, 0, @"What to do when input array of surface. - Spread: Create Array of output each scattering single surface. - Mixed: Create single output scattering multiple images.") .setDisplay(VALUE_DISPLAY.enum_scroll, [ "Spread output", "Index", "Random", "Data", "Texture" ]); - inputs[| 16] = nodeValue("Multiply alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 16] = nodeValue_Bool("Multiply alpha", self, true); - inputs[| 17] = nodeValue("Use value", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, [ "Scale" ], "Apply the third value in each data point (if exist) on given properties.") + inputs[| 17] = nodeValue_Text("Use value", self, [ "Scale" ], "Apply the third value in each data point (if exist) on given properties.") .setDisplay(VALUE_DISPLAY.text_array, { data: [ "Scale", "Rotation", "Color" ] }); inputs[| 18] = nodeValue_Enum_Scroll("Blend mode", self, 0, [ "Normal", "Add", "Max" ]); - inputs[| 19] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone); + inputs[| 19] = nodeValue_PathNode("Path", self, noone); - inputs[| 20] = nodeValue("Rotate along path", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 20] = nodeValue_Bool("Rotate along path", self, true); - inputs[| 21] = nodeValue("Path Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 21] = nodeValue_Float("Path Shift", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 22] = nodeValue("Scatter Distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 22] = nodeValue_Float("Scatter Distance", self, 0); - inputs[| 23] = nodeValue("Sort Y", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 23] = nodeValue_Bool("Sort Y", self, false); - inputs[| 24] = nodeValue("Array indices", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, []) + inputs[| 24] = nodeValue_Int("Array indices", self, []) .setArrayDepth(1); inputs[| 25] = nodeValue_Surface("Array texture", self); - inputs[| 26] = nodeValue("Animated array", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 26] = nodeValue_Range("Animated array", self, [ 0, 0 ], { linked : true }); inputs[| 27] = nodeValue_Enum_Scroll("Animated array end", self, 0, [ "Loop", "Ping Pong" ]); @@ -94,32 +88,27 @@ function Node_Scatter(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 30] = nodeValue("Uniform amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 30] = nodeValue_Vector("Uniform amount", self, [ 4, 4 ]); - inputs[| 31] = nodeValue("Auto amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 31] = nodeValue_Bool("Auto amount", self, false); inputs[| 32] = nodeValue_Rotation("Rotate per radius", self, 0); - inputs[| 33] = nodeValue("Random position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector_range); + inputs[| 33] = nodeValue_Vec2_Range("Random position", self, [ 0, 0, 0, 0 ]); - inputs[| 34] = nodeValue("Scale per radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 34] = nodeValue_Vector("Scale per radius", self, [ 0, 0 ]); - inputs[| 35] = nodeValue("Angle range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 360 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 35] = nodeValue_Rotation_Range("Angle range", self, [ 0, 360 ]); - inputs[| 36] = nodeValue("Shift position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 36] = nodeValue_Vector("Shift position", self, [ 0, 0 ]); - inputs[| 37] = nodeValue("Exact", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 37] = nodeValue_Bool("Exact", self, false) inputs[| 38] = nodeValue_Enum_Button("Spacing", self, 0, [ "After", "Between", "Around" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas data", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []) + outputs[| 1] = nodeValue_Output("Atlas data", self, VALUE_TYPE.surface, []) .setVisible(false) .rejectArrayProcess(); diff --git a/scripts/node_scatter_points/node_area.gml b/scripts/node_scatter_points/node_area.gml index 2a08d50b1..ce6764dad 100644 --- a/scripts/node_scatter_points/node_area.gml +++ b/scripts/node_scatter_points/node_area.gml @@ -6,17 +6,15 @@ function Node_Area(_x, _y, _group = -1) : Node_Processor(_x, _y, _group) constru w = 96; - inputs[| 0] = nodeValue(0, "Postion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_vector(0, "Postion", self, [ 0, 0 ] ) .setVisible(true, true); - inputs[| 1] = nodeValue(1, "Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 16, 16 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_vector(1, "Size", self, [ 16, 16 ] ) .setVisible(true, true); inputs[| 2] = nodeValue(2, "Shape", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, AREA_SHAPE.rectangle ) .setDisplay(VALUE_DISPLAY.enum_scroll, ["Rectangle", "Elipse"]); - outputs[| 0] = nodeValue(0, "Area", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0, 0, 0, AREA_SHAPE.rectangle ]) + outputs[| 0] = nodeValue_Output(0, "Area", self, VALUE_TYPE.float, [ 0, 0, 0, 0, AREA_SHAPE.rectangle ]) .setDisplay(VALUE_DISPLAY.vector); static drawOverlay = function(active, _x, _y, _s, _mx, _my, _snx, _sny) { diff --git a/scripts/node_scatter_points/node_scatter_points.gml b/scripts/node_scatter_points/node_scatter_points.gml index e4925aca6..5956352ad 100644 --- a/scripts/node_scatter_points/node_scatter_points.gml +++ b/scripts/node_scatter_points/node_scatter_points.gml @@ -5,9 +5,8 @@ function Node_Scatter_Points(_x, _y, _group = noone) : Node(_x, _y, _group) cons setDimension(96, 48); onSurfaceSize = function() { return getInputData(7, DEF_SURF); }; - inputs[| 0] = nodeValue("Point area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA_REF ) - .setUnitRef(onSurfaceSize, VALUE_UNIT.reference) - .setDisplay(VALUE_DISPLAY.area, { onSurfaceSize }); + inputs[| 0] = nodeValue_Area("Point area", self, DEF_AREA_REF, { onSurfaceSize } ) + .setUnitRef(onSurfaceSize, VALUE_UNIT.reference); inputs[| 1] = nodeValue_Enum_Button("Point distribution", self, 0, [ "Area", "Border", "Map" ]) .rejectArray(); @@ -15,28 +14,27 @@ function Node_Scatter_Points(_x, _y, _group = noone) : Node(_x, _y, _group) cons inputs[| 2] = nodeValue_Enum_Button("Scatter", self, 1, [ "Uniform", "Random" ]) .rejectArray(); - inputs[| 3] = nodeValue("Point amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2, "Amount of particle spawn in that frame.") + inputs[| 3] = nodeValue_Int("Point amount", self, 2, "Amount of particle spawn in that frame.") .rejectArray(); inputs[| 4] = nodeValue_Surface("Distribution map", self) .rejectArray(); - inputs[| 5] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 5] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 5].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }) .rejectArray(); - inputs[| 6] = nodeValue("Fixed position", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Fix point position, and only select point in the area."); + inputs[| 6] = nodeValue_Bool("Fixed position", self, false, "Fix point position, and only select point in the area."); - inputs[| 7] = nodeValue("Reference dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Reference dimension", self, DEF_SURF); inputs[| 8] = nodeValue_Surface("Reference value", self); - inputs[| 9] = nodeValue("Output 3D", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 9] = nodeValue_Bool("Output 3D", self, false); inputs[| 10] = nodeValue_Enum_Button("Normal", self, 0, [ "X", "Y", "Z" ]); - inputs[| 11] = nodeValue("Plane position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 11] = nodeValue_Float("Plane position", self, 0); input_display_list = [ ["Base", false], 5, 6, 7, @@ -44,7 +42,7 @@ function Node_Scatter_Points(_x, _y, _group = noone) : Node(_x, _y, _group) cons ["3D", true, 9], 10, 11 ]; - outputs[| 0] = nodeValue("Points", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ ]) + outputs[| 0] = nodeValue_Output("Points", self, VALUE_TYPE.float, [ ]) .setDisplay(VALUE_DISPLAY.vector); static step = function() { diff --git a/scripts/node_sdf/node_sdf.gml b/scripts/node_sdf/node_sdf.gml index 78eb96b3b..f03efb3b5 100644 --- a/scripts/node_sdf/node_sdf.gml +++ b/scripts/node_sdf/node_sdf.gml @@ -10,15 +10,15 @@ function Node_SDF(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) const inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; inputs[| 2] = nodeValue_Enum_Button("Side", self, 2, [ "Inside", "Outside", "Both" ]); - inputs[| 3] = nodeValue("Max distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Max distance", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", false], 0, diff --git a/scripts/node_segment_filter/node_segment_filter.gml b/scripts/node_segment_filter/node_segment_filter.gml index 4aab4aff8..44caa43a5 100644 --- a/scripts/node_segment_filter/node_segment_filter.gml +++ b/scripts/node_segment_filter/node_segment_filter.gml @@ -3,18 +3,17 @@ function Node_Segment_Filter(_x, _y, _group = noone) : Node(_x, _y, _group) cons setDimension(96, 48); - inputs[| 0] = nodeValue("Segments", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [[]]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Segments", self, [[]]) .setVisible(true, true) .setArrayDepth(1); inputs[| 1] = nodeValue_Rotation("Angle", self, 0); - inputs[| 2] = nodeValue("Spread", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 15); + inputs[| 2] = nodeValue_Float("Spread", self, 15); - inputs[| 3] = nodeValue("Both side", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Both side", self, true); - outputs[| 0] = nodeValue("Segments", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [[]]) + outputs[| 0] = nodeValue_Output("Segments", self, VALUE_TYPE.float, [[]]) .setDisplay(VALUE_DISPLAY.vector) .setArrayDepth(2); diff --git a/scripts/node_seperate_shape/node_seperate_shape.gml b/scripts/node_seperate_shape/node_seperate_shape.gml index 9329e1494..3e9ed9471 100644 --- a/scripts/node_seperate_shape/node_seperate_shape.gml +++ b/scripts/node_seperate_shape/node_seperate_shape.gml @@ -4,24 +4,24 @@ function Node_Seperate_Shape(_x, _y, _group = noone) : Node(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Surface in", self) .rejectArray(); - inputs[| 1] = nodeValue("Tolerance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 1] = nodeValue_Float("Tolerance", self, 0.2) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 1, 0.01 ], update_stat: SLIDER_UPDATE.release }) .rejectArray(); - inputs[| 2] = nodeValue("Override color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 2] = nodeValue_Bool("Override color", self, false) .rejectArray(); - inputs[| 3] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white) + inputs[| 3] = nodeValue_Color("Color", self, c_white) .rejectArray(); - inputs[| 4] = nodeValue("Ignore blank", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Skip empty and black shape.") + inputs[| 4] = nodeValue_Bool("Ignore blank", self, true, "Skip empty and black shape.") .rejectArray(); inputs[| 5] = nodeValue_Enum_Button("Mode", self, 0 , [ "Greyscale", "Alpha" ] ) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []); + outputs[| 1] = nodeValue_Output("Atlas", self, VALUE_TYPE.surface, []); input_display_list = [ ["Shape", false], 0, 5, 1, 4, diff --git a/scripts/node_sequence_anim/node_sequence_anim.gml b/scripts/node_sequence_anim/node_sequence_anim.gml index 0b8f6c1da..0b77ee4c9 100644 --- a/scripts/node_sequence_anim/node_sequence_anim.gml +++ b/scripts/node_sequence_anim/node_sequence_anim.gml @@ -6,16 +6,16 @@ function Node_Sequence_Anim(_x, _y, _group = noone) : Node(_x, _y, _group) const inputs[| 0] = nodeValue_Surface("Surface in", self, []) .setArrayDepth(1); - inputs[| 1] = nodeValue("Speed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 1] = nodeValue_Float("Speed", self, 1) .rejectArray(); - inputs[| 2] = nodeValue("Sequence", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, []) + inputs[| 2] = nodeValue_Int("Sequence", self, []) .setVisible(true, true) .setArrayDepth(1); inputs[| 3] = nodeValue_Enum_Scroll("Overflow", self, 0, [ "Hold", "Loop", "Ping Pong", "Empty" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); sequence_surface = noone; sequence_renderer = new Inspector_Custom_Renderer(function(_x, _y, _w, _m, _hover, _focus) { diff --git a/scripts/node_shadow/node_shadow.gml b/scripts/node_shadow/node_shadow.gml index 1b281d81c..492657a32 100644 --- a/scripts/node_shadow/node_shadow.gml +++ b/scripts/node_shadow/node_shadow.gml @@ -2,38 +2,36 @@ function Node_Shadow(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co name = "Shadow"; inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 1] = nodeValue_Color("Color", self, c_black); - inputs[| 2] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, .5) + inputs[| 2] = nodeValue_Float("Strength", self, .5) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01] }); - inputs[| 3] = nodeValue("Shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Shift", self, [ 4, 4 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 4] = nodeValue("Grow", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3) + inputs[| 4] = nodeValue_Float("Grow", self, 3) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 16, 0.1] }); - inputs[| 5] = nodeValue("Blur", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3) + inputs[| 5] = nodeValue_Float("Blur", self, 3) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); inputs[| 6] = nodeValue_Surface("Mask", self); - inputs[| 7] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 7] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Active", self, true); active_index = 8; __init_mask_modifier(6); // inputs 9, 10 inputs[| 11] = nodeValue_Enum_Scroll("Positioning", self, 0, [ "Shift", "Light" ]); - inputs[| 12] = nodeValue("Light Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 12] = nodeValue_Vector("Light Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 8, ["Surfaces", true], 0, 6, 7, 9, 10, diff --git a/scripts/node_shadow_cast/node_shadow_cast.gml b/scripts/node_shadow_cast/node_shadow_cast.gml index aba435300..acc06f80d 100644 --- a/scripts/node_shadow_cast/node_shadow_cast.gml +++ b/scripts/node_shadow_cast/node_shadow_cast.gml @@ -6,8 +6,7 @@ function Node_Shadow_Cast(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 1] = nodeValue_Surface("Solid", self); - inputs[| 2] = nodeValue("Light Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Light Position", self, [ 0, 0 ]) .setUnitRef(function(index) { var _surf = getInputData(0); if(is_array(_surf) && array_length(_surf) == 0) @@ -22,32 +21,32 @@ function Node_Shadow_Cast(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou return [ surface_get_width_safe(_surf), surface_get_height_safe(_surf) ]; }, VALUE_UNIT.reference); - inputs[| 3] = nodeValue("Soft light radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Soft light radius", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 2, 0.01] }); - inputs[| 4] = nodeValue("Light density", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 4] = nodeValue_Int("Light density", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }); inputs[| 5] = nodeValue_Enum_Scroll("Light type", self, 0, [ new scrollItem("Point", s_node_shadow_type, 0), new scrollItem("Sun", s_node_shadow_type, 1) ]); - inputs[| 6] = nodeValue("Ambient color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_grey); + inputs[| 6] = nodeValue_Color("Ambient color", self, c_grey); - inputs[| 7] = nodeValue("Light color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 7] = nodeValue_Color("Light color", self, c_white); - inputs[| 8] = nodeValue("Light radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 16); + inputs[| 8] = nodeValue_Float("Light radius", self, 16); - inputs[| 9] = nodeValue("Render solid", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 9] = nodeValue_Bool("Render solid", self, true); - inputs[| 10] = nodeValue("Use BG color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "If checked, background color will be used as shadow caster."); + inputs[| 10] = nodeValue_Bool("Use BG color", self, false, "If checked, background color will be used as shadow caster."); - inputs[| 11] = nodeValue("BG threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 11] = nodeValue_Float("BG threshold", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 12] = nodeValue("Light intensity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Light intensity", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 2, 0.01] }); - inputs[| 13] = nodeValue("Banding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 13] = nodeValue_Int("Banding", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 16, 0.1] }); inputs[| 14] = nodeValue_Enum_Scroll("Attenuation", self, 0, [ new scrollItem("Quadratic", s_node_curve, 0), @@ -55,18 +54,18 @@ function Node_Shadow_Cast(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou new scrollItem("Linear", s_node_curve, 2), ]) .setTooltip("Control how light fade out over distance."); - inputs[| 15] = nodeValue("Ambient occlusion", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 15] = nodeValue_Int("Ambient occlusion", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 16, 0.1] }); - inputs[| 16] = nodeValue("Ambient occlusion strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 16] = nodeValue_Float("Ambient occlusion strength", self, 0.1) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }); - inputs[| 17] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 17] = nodeValue_Bool("Active", self, true); active_index = 17; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Light mask", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Light mask", self, VALUE_TYPE.surface, noone); input_display_list = [ 17, ["Surfaces", true], 0, 1, diff --git a/scripts/node_shape/node_shape.gml b/scripts/node_shape/node_shape.gml index 172769453..5818a0fa0 100644 --- a/scripts/node_shape/node_shape.gml +++ b/scripts/node_shape/node_shape.gml @@ -35,7 +35,7 @@ function Node_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Background", self, false); shape_types = [ "Rectangle", "Diamond", "Trapezoid", "Parallelogram", @@ -54,78 +54,70 @@ function Node_Shape(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 2] = nodeValue_Enum_Scroll("Shape", self, 0, { data: shape_types_str, horizontal: true, text_pad: ui(16) }); - inputs[| 3] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA_REF) - .setUnitRef(onSurfaceSize, VALUE_UNIT.reference) - .setDisplay(VALUE_DISPLAY.area, { onSurfaceSize, useShape : false }); + inputs[| 3] = nodeValue_Area("Position", self, DEF_AREA_REF, { onSurfaceSize, useShape : false }) + .setUnitRef(onSurfaceSize, VALUE_UNIT.reference); - inputs[| 4] = nodeValue("Sides", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 3) + inputs[| 4] = nodeValue_Int("Sides", self, 3) .setVisible(false); - inputs[| 5] = nodeValue("Inner radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 5] = nodeValue_Float("Inner radius", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) .setVisible(false); - inputs[| 6] = nodeValue("Anti-aliasing", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 6] = nodeValue_Bool("Anti-aliasing", self, false); inputs[| 7] = nodeValue_Rotation("Rotation", self, 0); - inputs[| 8] = nodeValue("Angle range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 180 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 8] = nodeValue_Rotation_Range("Angle range", self, [ 0, 180 ]); - inputs[| 9] = nodeValue("Corner radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 9] = nodeValue_Float("Corner radius", self, 0) .setValidator(VV_clamp(0, .5)) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }); inputs[| 9].overlay_draw_text = false; - inputs[| 10] = nodeValue("Shape color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 10] = nodeValue_Color("Shape color", self, c_white); - inputs[| 11] = nodeValue("Background color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 11] = nodeValue_Color("Background color", self, c_black); - inputs[| 12] = nodeValue("Height", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 12] = nodeValue_Bool("Height", self, false); - inputs[| 13] = nodeValue("Start radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| 13] = nodeValue_Float("Start radius", self, 0.1) .setDisplay(VALUE_DISPLAY.slider) .setVisible(false); - inputs[| 14] = nodeValue("Shape path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 14] = nodeValue_PathNode("Shape path", self, noone) .setVisible(true, true); inputs[| 15] = nodeValue_Enum_Scroll("Positioning Mode", self, 0, [ "Area", "Center + Scale", "Full Image" ]) - inputs[| 16] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 16] = nodeValue_Vector("Center", self, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ] ) .setUnitRef(onSurfaceSize); - inputs[| 17] = nodeValue("Half Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 17] = nodeValue_Vector("Half Size", self, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ] ) .setUnitRef(onSurfaceSize); - inputs[| 18] = nodeValue("Tile", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 18] = nodeValue_Bool("Tile", self, false); inputs[| 19] = nodeValue_Rotation("Shape rotation", self, 0); - inputs[| 20] = nodeValue("Level", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 20] = nodeValue_Slider_Range("Level", self, [ 0, 1 ]); - inputs[| 21] = nodeValue("Angles", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 1.0 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 21] = nodeValue_Slider_Range("Angles", self, [ 0.5, 1.0 ]); - inputs[| 22] = nodeValue("Skew", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5 ) + inputs[| 22] = nodeValue_Float("Skew", self, 0.5 ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 23] = nodeValue("Arrow Sizes", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.2, 0.3 ] ) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 23] = nodeValue_Slider_Range("Arrow Sizes", self, [ 0.2, 0.3 ] ); - inputs[| 24] = nodeValue("Arrow Head", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3 ); + inputs[| 24] = nodeValue_Float("Arrow Head", self, 3 ); - inputs[| 25] = nodeValue("Teeth Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 6 ); + inputs[| 25] = nodeValue_Int("Teeth Amount", self, 6 ); - inputs[| 26] = nodeValue("Teeth Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.2, 0.2 ] ) - .setDisplay(VALUE_DISPLAY.vector, { slideSpeed : 0.01 }); + inputs[| 26] = nodeValue_Vector("Teeth Size", self, [ 0.2, 0.2 ] , { slideSpeed : 0.01 }); inputs[| 27] = nodeValue_Rotation("Teeth Rotation", self, 0); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", false], 0, 6, diff --git a/scripts/node_shape_map/node_shape_map.gml b/scripts/node_shape_map/node_shape_map.gml index 5fed0bce2..666a9acbc 100644 --- a/scripts/node_shape_map/node_shape_map.gml +++ b/scripts/node_shape_map/node_shape_map.gml @@ -3,25 +3,24 @@ function Node_Shape_Map(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; inputs[| 2] = nodeValue_Enum_Scroll("Shape", self, 0, [ new scrollItem("Circle", s_node_shape_circle, 0), new scrollItem("Polygon", s_node_shape_misc, 1), ]); - inputs[| 3] = nodeValue("Map Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Map Scale", self, [ 4, 1 ]); - inputs[| 4] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5); + inputs[| 4] = nodeValue_Float("Radius", self, 0.5); - inputs[| 5] = nodeValue("Sides", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 5] = nodeValue_Int("Sides", self, 4); - inputs[| 6] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Scale", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }); inputs[| 7] = nodeValue_Rotation("Angle", self, 0); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", true], 0, diff --git a/scripts/node_shape_polygon/node_shape_polygon.gml b/scripts/node_shape_polygon/node_shape_polygon.gml index 24637cf26..ded875270 100644 --- a/scripts/node_shape_polygon/node_shape_polygon.gml +++ b/scripts/node_shape_polygon/node_shape_polygon.gml @@ -8,55 +8,52 @@ function Node_Shape_Polygon(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Background", self, false); - inputs[| 2] = nodeValue("Background color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 2] = nodeValue_Color("Background color", self, c_black); - inputs[| 3] = nodeValue("Shape color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 3] = nodeValue_Color("Shape color", self, c_white); inputs[| 4] = nodeValue_Enum_Scroll("Shape", self, 0, shapesArray); - inputs[| 5] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 5] = nodeValue_Vector("Position", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); inputs[| 6] = nodeValue_Rotation("Rotation", self, 0); - inputs[| 7] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0.5, 0.5 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 7] = nodeValue_Vector("Scale", self, [ 0.5, 0.5 ]) .setUnitRef(function(index) { return getDimension(index); }, VALUE_UNIT.reference); - inputs[| 8] = nodeValue("Sides", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 16) + inputs[| 8] = nodeValue_Int("Sides", self, 16) .setDisplay(VALUE_DISPLAY.slider, { range: [2, 64, 0.1] }); - inputs[| 9] = nodeValue("Inner radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 9] = nodeValue_Float("Inner radius", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 10] = nodeValue_Float("Radius", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 11] = nodeValue("Teeth", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 6) + inputs[| 11] = nodeValue_Int("Teeth", self, 6) .setDisplay(VALUE_DISPLAY.slider, { range: [3, 16, 0.1] }); - inputs[| 12] = nodeValue("Teeth height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 12] = nodeValue_Float("Teeth height", self, 0.2) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 13] = nodeValue("Teeth taper", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 13] = nodeValue_Float("Teeth taper", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-0.5, 0.5, 0.01] }); - inputs[| 14] = nodeValue("Angle range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 360 ]) - .setDisplay(VALUE_DISPLAY.rotation_range); + inputs[| 14] = nodeValue_Rotation_Range("Angle range", self, [ 0, 360 ]); - inputs[| 15] = nodeValue("Round cap", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 15] = nodeValue_Bool("Round cap", self, false); inputs[| 16] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.mesh, noone) .setVisible(true, true); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Mesh", self, JUNCTION_CONNECT.output, VALUE_TYPE.mesh, noone); + outputs[| 1] = nodeValue_Output("Mesh", self, VALUE_TYPE.mesh, noone); - outputs[| 2] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.pathnode, noone); + outputs[| 2] = nodeValue_Output("Path", self, VALUE_TYPE.pathnode, noone); input_display_list = [ 16, ["Output", false], 0, diff --git a/scripts/node_shard_noise/node_shard_noise.gml b/scripts/node_shard_noise/node_shard_noise.gml index be1e0bbaa..4b425efa7 100644 --- a/scripts/node_shard_noise/node_shard_noise.gml +++ b/scripts/node_shard_noise/node_shard_noise.gml @@ -2,26 +2,24 @@ function Node_Shard_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, _y name = "Shard Noise"; shader = sh_noise_shard; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 4 ]) .setMappable(6); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 4] = nodeValue("Sharpness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Sharpness", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }) .setMappable(7); addShaderProp(SHADER_UNIFORM.float, "sharpness"); - inputs[| 5] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 5] = nodeValue_Float("Progress", self, 0) .setMappable(8); addShaderProp(SHADER_UNIFORM.float, "progress") diff --git a/scripts/node_shell/node_shell.gml b/scripts/node_shell/node_shell.gml index e44c785d3..bdc699f68 100644 --- a/scripts/node_shell/node_shell.gml +++ b/scripts/node_shell/node_shell.gml @@ -2,9 +2,9 @@ function Node_Shell(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Execute Shell"; setDimension(96, 32 + 24 * 1); - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 0] = nodeValue_Text("Path", self, ""); - inputs[| 1] = nodeValue("Script", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Script", self, ""); insp1UpdateTooltip = "Run"; insp1UpdateIcon = [ THEME.sequence_control, 1, COLORS._main_value_positive ]; diff --git a/scripts/node_skew/node_skew.gml b/scripts/node_skew/node_skew.gml index 24113dd68..3be2edeaa 100644 --- a/scripts/node_skew/node_skew.gml +++ b/scripts/node_skew/node_skew.gml @@ -4,14 +4,13 @@ function Node_Skew(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Surface in", self); inputs[| 1] = nodeValue_Enum_Button("Axis", self, 0, ["x", "y"]); - inputs[| 2] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("Strength", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }) .setMappable(12); - inputs[| 3] = nodeValue("Wrap", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Wrap", self, false); - inputs[| 4] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0] ) - .setDisplay(VALUE_DISPLAY.vector, { side_button : button(function() { centerAnchor(); }) + inputs[| 4] = nodeValue_Vector("Center", self, [0, 0] , { side_button : button(function() { centerAnchor(); }) .setIcon(THEME.anchor) .setTooltip(__txt("Set to center")) }); @@ -20,14 +19,13 @@ function Node_Skew(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 6] = nodeValue_Surface("Mask", self); - inputs[| 7] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 7] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 8] = nodeValue_Bool("Active", self, true); active_index = 8; - inputs[| 9] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 9] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(6); // inputs 10, 11 @@ -42,7 +40,7 @@ function Node_Skew(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons ["Skew", false], 1, 2, 12, 4, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_slideshow/node_slideshow.gml b/scripts/node_slideshow/node_slideshow.gml index 37fcc30ec..38bcc33ed 100644 --- a/scripts/node_slideshow/node_slideshow.gml +++ b/scripts/node_slideshow/node_slideshow.gml @@ -6,9 +6,9 @@ function Node_Slideshow(_x, _y, _group = noone) : Node(_x, _y, _group) construct setDimension(128, 32); - inputs[| 0] = nodeValue("Order", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 0] = nodeValue_Int("Order", self, 0); - inputs[| 1] = nodeValue("Title", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Title", self, ""); inputs[| 2] = nodeValue_Enum_Scroll("Anchor", self, 0, [ "Center", "Top left" ]); diff --git a/scripts/node_smear/node_bw.gml b/scripts/node_smear/node_bw.gml index af27efe62..1d28185b4 100644 --- a/scripts/node_smear/node_bw.gml +++ b/scripts/node_smear/node_bw.gml @@ -11,13 +11,13 @@ function Node_BW(_x, _y) : Node_Processor(_x, _y) constructor { uniform_con = shader_get_uniform(sh_bw, "contrast"); inputs[| 0] = new NodeValue(0, "Surface in", self, JUNCTION_CONNECT.input, VALUE_TYPE.surface, 0); - inputs[| 1] = new NodeValue(1, "Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 1] = new NodeValue_Float(1, "Brightness", self, 0); inputs[| 1].setDisplay(VALUE_DISPLAY.slider, [ -1, 1, 0.01]); - inputs[| 2] = new NodeValue(2, "Contrast", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 2] = new NodeValue_Float(2, "Contrast", self, 1); inputs[| 2].setDisplay(VALUE_DISPLAY.slider, [ -1, 4, 0.01]); - outputs[| 0] = new NodeValue(0, "Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, surface_create(1, 1)); + outputs[| 0] = new nodeValue_Output(0, "Surface out", self, VALUE_TYPE.surface, surface_create(1, 1)); function process_data(_inSurf, _outSurf, _data) { var _exp = _data[1]; diff --git a/scripts/node_smear/node_smear.gml b/scripts/node_smear/node_smear.gml index 90d322eab..e56d853c0 100644 --- a/scripts/node_smear/node_smear.gml +++ b/scripts/node_smear/node_smear.gml @@ -3,7 +3,7 @@ function Node_Smear(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 1] = nodeValue_Float("Strength", self, 0.2) .setDisplay(VALUE_DISPLAY.slider, { range: [0, 0.5, 0.001] }) .setMappable(9); @@ -12,14 +12,13 @@ function Node_Smear(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 4] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 6] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(3); // inputs 7, 8 @@ -35,17 +34,17 @@ function Node_Smear(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 12] = nodeValue_Enum_Button("Modulate strength", self, 0, [ "Distance", "Color", "None" ]); - inputs[| 13] = nodeValue("Spread", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 13] = nodeValue_Int("Spread", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range : [ 0, 30, 1 ] }); - inputs[| 14] = nodeValue("Invert", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 14] = nodeValue_Bool("Invert", self, false); input_display_list = [ 5, 6, ["Surfaces", true], 0, 3, 4, 7, 8, ["Smear", false], 11, 14, 1, 9, 2, 10, 13, 12, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); attribute_oversample(); diff --git a/scripts/node_smoke_add/node_smoke_add.gml b/scripts/node_smoke_add/node_smoke_add.gml index c7ca258fc..6dee4cddf 100644 --- a/scripts/node_smoke_add/node_smoke_add.gml +++ b/scripts/node_smoke_add/node_smoke_add.gml @@ -11,21 +11,19 @@ function Node_Smoke_Add(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) con inputs[| 1] = nodeValue_Surface("Fluid brush", self); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [0, 0]); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); - inputs[| 4] = nodeValue("Inherit velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 4] = nodeValue_Float("Inherit velocity", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }); - inputs[| 5] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 5] = nodeValue_Float("Density", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Expand velocity mask", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 6] = nodeValue_Int("Expand velocity mask", self, 0); - inputs[| 7] = nodeValue("Velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Velocity", self, [0, 0]); input_display_list = [ ["Domain", false], 0, @@ -35,7 +33,7 @@ function Node_Smoke_Add(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) con _prevPos = noone; - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); temp_surface = [ surface_create(1, 1) ]; diff --git a/scripts/node_smoke_add_collider/node_smoke_add_collider.gml b/scripts/node_smoke_add_collider/node_smoke_add_collider.gml index 4febda26c..52b1c3e07 100644 --- a/scripts/node_smoke_add_collider/node_smoke_add_collider.gml +++ b/scripts/node_smoke_add_collider/node_smoke_add_collider.gml @@ -10,15 +10,14 @@ function Node_Smoke_Add_Collider(_x, _y, _group = noone) : Node_Smoke(_x, _y, _g inputs[| 1] = nodeValue_Surface("Collider", self); - inputs[| 2] = nodeValue("Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA ) - .setDisplay(VALUE_DISPLAY.area, { useShape : false }); + inputs[| 2] = nodeValue_Area("Area", self, DEF_AREA , { useShape : false }); input_display_list = [ ["Domain", false], 0, ["Collider", false], 1, 2, ]; - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var _mat = getInputData(1); diff --git a/scripts/node_smoke_apply_velocity/node_smoke_apply_velocity.gml b/scripts/node_smoke_apply_velocity/node_smoke_apply_velocity.gml index 435c87339..3ef5ca5a9 100644 --- a/scripts/node_smoke_apply_velocity/node_smoke_apply_velocity.gml +++ b/scripts/node_smoke_apply_velocity/node_smoke_apply_velocity.gml @@ -9,20 +9,18 @@ function Node_Smoke_Apply_Velocity(_x, _y, _group = noone) : Node_Smoke(_x, _y, inputs[| 1] = nodeValue_Surface("Brush", self); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Position", self, [0, 0]); - inputs[| 3] = nodeValue("Velocity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Velocity", self, [0, 0]); - inputs[| 4] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Active", self, true); input_display_list = [ ["Domain", false], 0, ["Velocity", false], 4, 1, 2, 3 ]; - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var _mat = getInputData(1); diff --git a/scripts/node_smoke_domain/node_smoke_domain.gml b/scripts/node_smoke_domain/node_smoke_domain.gml index 18a07006b..5e48cad34 100644 --- a/scripts/node_smoke_domain/node_smoke_domain.gml +++ b/scripts/node_smoke_domain/node_smoke_domain.gml @@ -11,32 +11,30 @@ function Node_Smoke_Domain(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) inputs[| 2] = nodeValue_Enum_Button("Material dissipation type", self, 1, [ "Multiply", "Subtract" ]); - inputs[| 3] = nodeValue("Material dissipation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.02) + inputs[| 3] = nodeValue_Float("Material dissipation", self, 0.02) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 0.1, 0.01 ] }); inputs[| 4] = nodeValue_Enum_Button("Velocity dissipation type", self, 1, [ "Multiply", "Subtract" ]); - inputs[| 5] = nodeValue("Velocity dissipation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.00) + inputs[| 5] = nodeValue_Float("Velocity dissipation", self, 0.00) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 0.1, 0.01 ] }); - inputs[| 6] = nodeValue("Acceleration", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Acceleration", self, [ 0, 0 ]); - inputs[| 7] = nodeValue("Material intertia", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, -0.2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Material intertia", self, [ 1, -0.2 ]); - inputs[| 8] = nodeValue("Initial pressure", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.75) + inputs[| 8] = nodeValue_Float("Initial pressure", self, 0.75) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Material Maccormack weight", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 9] = nodeValue_Float("Material Maccormack weight", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Velocity Maccormack weight", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 10] = nodeValue_Float("Velocity Maccormack weight", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 11] = nodeValue("Wrap", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Wrap", self, false); - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); input_display_list = [ ["Domain", false], 0, 11, 1, diff --git a/scripts/node_smoke_domain_queue/node_smoke_domain_queue.gml b/scripts/node_smoke_domain_queue/node_smoke_domain_queue.gml index 89d382b0f..7a9b1ef65 100644 --- a/scripts/node_smoke_domain_queue/node_smoke_domain_queue.gml +++ b/scripts/node_smoke_domain_queue/node_smoke_domain_queue.gml @@ -4,7 +4,7 @@ function Node_Smoke_Domain_Queue(_x, _y, _group = noone) : Node_Smoke(_x, _y, _g manual_ungroupable = false; - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); static createNewInput = function() { var index = ds_list_size(inputs); diff --git a/scripts/node_smoke_group/node_smoke_group.gml b/scripts/node_smoke_group/node_smoke_group.gml index 76032072f..fcda08536 100644 --- a/scripts/node_smoke_group/node_smoke_group.gml +++ b/scripts/node_smoke_group/node_smoke_group.gml @@ -18,30 +18,28 @@ function Node_Smoke_Group(_x, _y, _group = noone) : Node_Collection(_x, _y, _gro inputs[| 2] = nodeValue_Enum_Button("Material dissipation type", self, 1, [ "Multiply", "Subtract" ]); - inputs[| 3] = nodeValue("Material dissipation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.02) + inputs[| 3] = nodeValue_Float("Material dissipation", self, 0.02) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 0.1, 0.01 ] }); inputs[| 4] = nodeValue_Enum_Button("Velocity dissipation type", self, 1, [ "Multiply", "Subtract" ]); - inputs[| 5] = nodeValue("Velocity dissipation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.00) + inputs[| 5] = nodeValue_Float("Velocity dissipation", self, 0.00) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 0.1, 0.01 ] }); - inputs[| 6] = nodeValue("Acceleration", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Acceleration", self, [ 0, 0 ]); - inputs[| 7] = nodeValue("Material intertia", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, -0.2 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 7] = nodeValue_Vector("Material intertia", self, [ 1, -0.2 ]); - inputs[| 8] = nodeValue("Initial pressure", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.75) + inputs[| 8] = nodeValue_Float("Initial pressure", self, 0.75) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Material Maccormack weight", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 9] = nodeValue_Float("Material Maccormack weight", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Velocity Maccormack weight", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 10] = nodeValue_Float("Velocity Maccormack weight", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 11] = nodeValue("Wrap", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 11] = nodeValue_Bool("Wrap", self, false); input_display_list_def = [ ["Domain", false], 0, 11, 1, diff --git a/scripts/node_smoke_render/node_smoke_render.gml b/scripts/node_smoke_render/node_smoke_render.gml index 5cc9ca4b3..e3e4477ed 100644 --- a/scripts/node_smoke_render/node_smoke_render.gml +++ b/scripts/node_smoke_render/node_smoke_render.gml @@ -11,20 +11,20 @@ function Node_Smoke_Render(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Interpolate", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Interpolate", self, false); - inputs[| 3] = nodeValue("Draw Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Draw Domain", self, false); - inputs[| 4] = nodeValue("Auto Update", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Auto Update", self, true); input_display_list = [ ["Domain", false], 0, ["Render", false], 4, 1, 2, 3, ]; - outputs[| 0] = nodeValue("Smoke", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Smoke", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Domain", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_smoke_render_output/node_smoke_render_output.gml b/scripts/node_smoke_render_output/node_smoke_render_output.gml index bc5b7a1b7..f60172729 100644 --- a/scripts/node_smoke_render_output/node_smoke_render_output.gml +++ b/scripts/node_smoke_render_output/node_smoke_render_output.gml @@ -13,11 +13,11 @@ function Node_Smoke_Render_Output(_x, _y, _group = noone) : Node_Group_Output(_x inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Interpolate", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Interpolate", self, false); - inputs[| 3] = nodeValue("Draw Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Draw Domain", self, false); - inputs[| 4] = nodeValue("Auto Update", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Auto Update", self, true); input_display_list = [ ["Domain", false], 0, diff --git a/scripts/node_smoke_repulse/node_smoke_repulse.gml b/scripts/node_smoke_repulse/node_smoke_repulse.gml index 8b8f3697a..b0698e864 100644 --- a/scripts/node_smoke_repulse/node_smoke_repulse.gml +++ b/scripts/node_smoke_repulse/node_smoke_repulse.gml @@ -7,12 +7,11 @@ function Node_Smoke_Repulse(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.sdomain, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Position", self, [0, 0]); - inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 8); + inputs[| 2] = nodeValue_Float("Radius", self, 8); - inputs[| 3] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.10) + inputs[| 3] = nodeValue_Float("Strength", self, 0.10) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); inputs[| 4] = nodeValue_Enum_Button("Mode", self, 0, [ "Override", "Add" ]); @@ -22,7 +21,7 @@ function Node_Smoke_Repulse(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) ["Repulse", false], 4, 1, 2, 3 ]; - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var _pos = getInputData(1); diff --git a/scripts/node_smoke_turbulence/node_smoke_turbulence.gml b/scripts/node_smoke_turbulence/node_smoke_turbulence.gml index c9d204af5..660502b68 100644 --- a/scripts/node_smoke_turbulence/node_smoke_turbulence.gml +++ b/scripts/node_smoke_turbulence/node_smoke_turbulence.gml @@ -7,16 +7,15 @@ function Node_Smoke_Turbulence(_x, _y, _group = noone) : Node_Smoke(_x, _y, _gro inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.sdomain, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Effect area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA) - .setDisplay(VALUE_DISPLAY.area, { useShape : false }); + inputs[| 1] = nodeValue_Area("Effect area", self, DEF_AREA, { useShape : false }); - inputs[| 2] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.10) + inputs[| 2] = nodeValue_Float("Strength", self, 0.10) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 3] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4) + inputs[| 3] = nodeValue_Float("Scale", self, 4) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.01] }); - inputs[| 4] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 4] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 4].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); inputs[| 5] = nodeValue_Enum_Button("Mode", self, 0, [ "Override", "Add" ]); @@ -26,7 +25,7 @@ function Node_Smoke_Turbulence(_x, _y, _group = noone) : Node_Smoke(_x, _y, _gro ["Turbulence", false], 5, 1, 2, 4, 3 ]; - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { inputs[| 1].drawOverlay(hover, active, _x, _y, _s, _mx, _my, _snx, _sny); diff --git a/scripts/node_smoke_update/node_smoke_update.gml b/scripts/node_smoke_update/node_smoke_update.gml index 927cfd222..eea0c6041 100644 --- a/scripts/node_smoke_update/node_smoke_update.gml +++ b/scripts/node_smoke_update/node_smoke_update.gml @@ -9,14 +9,14 @@ function Node_Smoke_Update(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.sdomain, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); input_display_list = [ ["Domain", false], 0, ["Update", false], 1, ] - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); static update = function(frame = CURRENT_FRAME) { if(!PROJECT.animator.is_playing) return; diff --git a/scripts/node_smoke_vortex/node_smoke_vortex.gml b/scripts/node_smoke_vortex/node_smoke_vortex.gml index fbfed5e81..b40f6b15c 100644 --- a/scripts/node_smoke_vortex/node_smoke_vortex.gml +++ b/scripts/node_smoke_vortex/node_smoke_vortex.gml @@ -7,15 +7,14 @@ function Node_Smoke_Vortex(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) inputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.input, VALUE_TYPE.sdomain, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 1] = nodeValue_Vector("Position", self, [0, 0]); - inputs[| 2] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 8); + inputs[| 2] = nodeValue_Float("Radius", self, 8); - inputs[| 3] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.10) + inputs[| 3] = nodeValue_Float("Strength", self, 0.10) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); - inputs[| 4] = nodeValue("Attraction", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 4] = nodeValue_Float("Attraction", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [-1, 1, 0.01] }); inputs[| 5] = nodeValue_Enum_Button("Mode", self, 0, [ "Override", "Add" ]); @@ -25,8 +24,8 @@ function Node_Smoke_Vortex(_x, _y, _group = noone) : Node_Smoke(_x, _y, _group) ["Vortex", false], 5, 1, 2, 3, 4 ]; - outputs[| 0] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.sdomain, noone); - outputs[| 1] = nodeValue("Domain", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Domain", self, VALUE_TYPE.sdomain, noone); + outputs[| 1] = nodeValue_Output("Domain", self, VALUE_TYPE.surface, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var _pos = getInputData(1); diff --git a/scripts/node_solid/node_solid.gml b/scripts/node_solid/node_solid.gml index 023511e91..1cabf60f6 100644 --- a/scripts/node_solid/node_solid.gml +++ b/scripts/node_solid/node_solid.gml @@ -3,15 +3,15 @@ function Node_Solid(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, cola(c_white)); + inputs[| 1] = nodeValue_Color("Color", self, cola(c_white)); - inputs[| 2] = nodeValue("Empty", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Empty", self, false); inputs[| 3] = nodeValue_Surface("Mask", self); - inputs[| 4] = nodeValue("Use mask dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 4] = nodeValue_Bool("Use mask dimension", self, true); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surfaces", false], 0, 3, 4, diff --git a/scripts/node_spherize/node_spherize.gml b/scripts/node_spherize/node_spherize.gml index cec082e52..b4fefbcd0 100644 --- a/scripts/node_spherize/node_spherize.gml +++ b/scripts/node_spherize/node_spherize.gml @@ -3,15 +3,14 @@ function Node_Spherize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Center", self, [ DEF_SURF_W / 2, DEF_SURF_H / 2 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Strength", self, 1) .setDisplay(VALUE_DISPLAY.slider) .setMappable(11); - inputs[| 3] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2) + inputs[| 3] = nodeValue_Float("Radius", self, 0.2) .setDisplay(VALUE_DISPLAY.slider) .setMappable(12); @@ -20,14 +19,13 @@ function Node_Spherize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; - inputs[| 8] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 8] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(5); // inputs 9, 10 @@ -41,10 +39,10 @@ function Node_Spherize(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 13] = nodeValue("Trim edge", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 13] = nodeValue_Float("Trim edge", self, 0) .setDisplay(VALUE_DISPLAY.slider) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 7, 8, ["Surfaces", true], 0, 5, 6, 9, 10, diff --git a/scripts/node_spout_send/node_spout_send.gml b/scripts/node_spout_send/node_spout_send.gml index 6c590b286..c710bb334 100644 --- a/scripts/node_spout_send/node_spout_send.gml +++ b/scripts/node_spout_send/node_spout_send.gml @@ -1,11 +1,11 @@ function Node_Spout_Send(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Spout Send"; - inputs[| 0] = nodeValue("Sender name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "PixelComposer"); + inputs[| 0] = nodeValue_Text("Sender name", self, "PixelComposer"); inputs[| 1] = nodeValue_Surface("Surface", self); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone) + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone) .setVisible(false); spoutIndex = spoutSenderInit(); diff --git a/scripts/node_sprite_stack/node_sprite_stack.gml b/scripts/node_sprite_stack/node_sprite_stack.gml index 243890161..1eb6f3347 100644 --- a/scripts/node_sprite_stack/node_sprite_stack.gml +++ b/scripts/node_sprite_stack/node_sprite_stack.gml @@ -6,35 +6,33 @@ function Node_Sprite_Stack(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Stack amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 2] = nodeValue_Int("Stack amount", self, 4); - inputs[| 3] = nodeValue("Stack shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 3] = nodeValue_Vector("Stack shift", self, [ 0, 1 ] ); - inputs[| 4] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); inputs[| 5] = nodeValue_Rotation("Rotation", self, 0); - inputs[| 6] = nodeValue("Stack blend", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white ); + inputs[| 6] = nodeValue_Color("Stack blend", self, c_white ); - inputs[| 7] = nodeValue("Alpha end", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1, "Alpha value for the last copy." ) + inputs[| 7] = nodeValue_Float("Alpha end", self, 1, "Alpha value for the last copy." ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 8] = nodeValue("Move base", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false, "Make each copy move the original image." ); + inputs[| 8] = nodeValue_Bool("Move base", self, false, "Make each copy move the original image." ); inputs[| 9] = nodeValue_Enum_Scroll("Highlight", self, 0, [ "None", "Color", "Inner pixel" ]); - inputs[| 10] = nodeValue("Highlight color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 10] = nodeValue_Color("Highlight color", self, c_white); - inputs[| 11] = nodeValue("Highlight alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 11] = nodeValue_Float("Highlight alpha", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 12] = nodeValue("Array process", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Array process", self, 1) .setDisplay(VALUE_DISPLAY.enum_scroll, [ "Individual", "Combined" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surface", false], 0, 1, 12, diff --git a/scripts/node_stack/node_stack.gml b/scripts/node_stack/node_stack.gml index 365e2cd0b..b99085fe0 100644 --- a/scripts/node_stack/node_stack.gml +++ b/scripts/node_stack/node_stack.gml @@ -9,16 +9,15 @@ function Node_Stack(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { inputs[| 1] = nodeValue_Enum_Button("Align", self, 1, [ "Start", "Middle", "End"]) .rejectArray(); - inputs[| 2] = nodeValue("Spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0) + inputs[| 2] = nodeValue_Int("Spacing", self, 0) .rejectArray(); - inputs[| 3] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.padding) + inputs[| 3] = nodeValue_Padding("Padding", self, [ 0, 0, 0, 0 ]) .rejectArray(); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Atlas data", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, []); + outputs[| 1] = nodeValue_Output("Atlas data", self, VALUE_TYPE.surface, []); temp_surface = [ noone, noone ]; diff --git a/scripts/node_stagger/node_stagger.gml b/scripts/node_stagger/node_stagger.gml index 1f1d03d8c..b466e97ee 100644 --- a/scripts/node_stagger/node_stagger.gml +++ b/scripts/node_stagger/node_stagger.gml @@ -3,15 +3,15 @@ function Node_Stagger(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 0] = nodeValue_Surface("Surface", self); - inputs[| 1] = nodeValue("Delay Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 1] = nodeValue_Int("Delay Step", self, 1); - inputs[| 2] = nodeValue("Delay Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 2] = nodeValue_Int("Delay Amount", self, 1); inputs[| 3] = nodeValue("Stagger Curve", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_01); inputs[| 4] = nodeValue_Enum_Button("Overflow", self, 0, [ "Hide", "Clamp" ]); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone); input_display_list = [ 0, ["Stagger", false], 3, 1, 2, 4, diff --git a/scripts/node_statistic/node_statistic.gml b/scripts/node_statistic/node_statistic.gml index 75e3a2826..64cf8b36c 100644 --- a/scripts/node_statistic/node_statistic.gml +++ b/scripts/node_statistic/node_statistic.gml @@ -35,7 +35,7 @@ function Node_Statistic(_x, _y, _group = noone) : Node(_x, _y, _group) construct static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index] = nodeValue("Input", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, -1 ) + inputs[| index] = nodeValue_Float("Input", self, -1 ) .setVisible(false, true); return inputs[| index]; @@ -43,7 +43,7 @@ function Node_Statistic(_x, _y, _group = noone) : Node(_x, _y, _group) construct setDynamicInput(1, true, VALUE_TYPE.float); - outputs[| 0] = nodeValue("Statistic", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, -1); + outputs[| 0] = nodeValue_Output("Statistic", self, VALUE_TYPE.float, -1); static update = function(frame = CURRENT_FRAME) { #region var type = getInputData(0); diff --git a/scripts/node_strand_break/node_strand_break.gml b/scripts/node_strand_break/node_strand_break.gml index a11240b85..7abd3f5b9 100644 --- a/scripts/node_strand_break/node_strand_break.gml +++ b/scripts/node_strand_break/node_strand_break.gml @@ -6,10 +6,10 @@ function Node_Strand_Break(_x, _y, _group = noone) : _Node_Strand_Affector(_x, _ manual_ungroupable = false; - inputs[| input_fix_len + 0] = nodeValue("Chance", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| input_fix_len + 0] = nodeValue_Float("Chance", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| input_fix_len + 1] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| input_fix_len + 1] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| input_fix_len + 1].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); array_push(input_display_list, diff --git a/scripts/node_strand_collision/node_strand_collision.gml b/scripts/node_strand_collision/node_strand_collision.gml index 50e3f5e2d..3f1c2c5b7 100644 --- a/scripts/node_strand_collision/node_strand_collision.gml +++ b/scripts/node_strand_collision/node_strand_collision.gml @@ -12,7 +12,7 @@ function Node_Strand_Collision(_x, _y, _group = noone) : Node(_x, _y, _group) co inputs[| 1] = nodeValue("Collision mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.mesh, noone) .setVisible(true, true); - outputs[| 0] = nodeValue("Strand", self, JUNCTION_CONNECT.output, VALUE_TYPE.strands, noone); + outputs[| 0] = nodeValue_Output("Strand", self, VALUE_TYPE.strands, noone); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { var _msh = getInputData(1); diff --git a/scripts/node_strand_create/node_strand_create.gml b/scripts/node_strand_create/node_strand_create.gml index 13e1fe0ff..37f8831df 100644 --- a/scripts/node_strand_create/node_strand_create.gml +++ b/scripts/node_strand_create/node_strand_create.gml @@ -9,42 +9,40 @@ function Node_Strand_Create(_x, _y, _group = noone) : Node(_x, _y, _group) const inputs[| 0] = nodeValue_Enum_Scroll("Type", self, 0, [ "Point", "Path", "Mesh" ]); - inputs[| 1] = nodeValue("Density", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 8, "How many strands to generate."); + inputs[| 1] = nodeValue_Int("Density", self, 8, "How many strands to generate."); - inputs[| 2] = nodeValue("Length", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Length", self, [ 4, 4 ]); - inputs[| 3] = nodeValue("Segment", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 3] = nodeValue_Int("Segment", self, 4); - inputs[| 4] = nodeValue("Elasticity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.05, "Length preservation, the higher the value the easier it is to stretch each segment.") + inputs[| 4] = nodeValue_Float("Elasticity", self, 0.05, "Length preservation, the higher the value the easier it is to stretch each segment.") .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone); + inputs[| 5] = nodeValue_PathNode("Path", self, noone); - inputs[| 6] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 6] = nodeValue_Vector("Position", self, [ 0, 0 ]); inputs[| 7] = nodeValue_Enum_Button("Side", self, 0, [ "Inner", "Outer", "Both" ]); - inputs[| 8] = nodeValue("Spring", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.8, "Angular stiffness, the higher the value the easier it is to bend each segment.") + inputs[| 8] = nodeValue_Float("Spring", self, 0.8, "Angular stiffness, the higher the value the easier it is to bend each segment.") .setDisplay(VALUE_DISPLAY.slider); - inputs[| 9] = nodeValue("Structure", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.2, "The ability to keep its original shape.") + inputs[| 9] = nodeValue_Float("Structure", self, 0.2, "The ability to keep its original shape.") .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| 10] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 10].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 11] = nodeValue("Curl frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 11] = nodeValue_Float("Curl frequency", self, 0); - inputs[| 12] = nodeValue("Curliness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 12] = nodeValue_Float("Curliness", self, 1) .setDisplay(VALUE_DISPLAY.slider); inputs[| 13] = nodeValue("Mesh", self, JUNCTION_CONNECT.input, VALUE_TYPE.mesh, noone); inputs[| 14] = nodeValue_Enum_Scroll("Distribution", self, 0, [ "Uniform", "Random" ]); - inputs[| 15] = nodeValue("Bake hair", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false, "Prevent strand reseting to apply manual modification. Unbaking will remove all changes.") + inputs[| 15] = nodeValue_Trigger("Bake hair", self, false, "Prevent strand reseting to apply manual modification. Unbaking will remove all changes.") .setDisplay(VALUE_DISPLAY.button, { name: "Bake", UI : true, onClick: function() { attributes.use_groom = !attributes.use_groom; if(attributes.use_groom) @@ -52,12 +50,12 @@ function Node_Strand_Create(_x, _y, _group = noone) : Node(_x, _y, _group) const strandUpdate(true); } }); - inputs[| 16] = nodeValue("View fix hair", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 16] = nodeValue_Bool("View fix hair", self, false); - inputs[| 17] = nodeValue("Root strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [-1, -1], "The force required to break strand from its root. Set to -1 to make strand infinitely strong.") - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 17] = nodeValue_Vector("Root strength", self, [-1, -1]) + .setTooltip("The force required to break strand from its root. Set to -1 to make strand infinitely strong."); - outputs[| 0] = nodeValue("Strand", self, JUNCTION_CONNECT.output, VALUE_TYPE.strands, noone); + outputs[| 0] = nodeValue_Output("Strand", self, VALUE_TYPE.strands, noone); input_display_list = [ 10, ["Generation", false], 0, 1, 5, 6, 7, 13, 14, 15, diff --git a/scripts/node_strand_force_apply/node_strand_force_apply.gml b/scripts/node_strand_force_apply/node_strand_force_apply.gml index f968eac59..5d62e74a5 100644 --- a/scripts/node_strand_force_apply/node_strand_force_apply.gml +++ b/scripts/node_strand_force_apply/node_strand_force_apply.gml @@ -6,17 +6,17 @@ function Node_Strand_Force_Apply(_x, _y, _group = noone) : _Node_Strand_Affector manual_ungroupable = false; - inputs[| input_fix_len + 0] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| input_fix_len + 0] = nodeValue_Float("Strength", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 5, 0.01 ] }); - inputs[| input_fix_len + 1] = nodeValue("Turbulence", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| input_fix_len + 1] = nodeValue_Float("Turbulence", self, 0); - inputs[| input_fix_len + 2] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, seed_random(6)) + inputs[| input_fix_len + 2] = nodeValue_Int("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| input_fix_len + 2].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| input_fix_len + 3] = nodeValue("Turbulence frequency", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5); + inputs[| input_fix_len + 3] = nodeValue_Float("Turbulence frequency", self, 0.5); - inputs[| input_fix_len + 4] = nodeValue("Turbulence detail", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 2); + inputs[| input_fix_len + 4] = nodeValue_Int("Turbulence detail", self, 2); array_push(input_display_list, ["Force", false], input_fix_len + 0, input_fix_len + 2, input_fix_len + 1, input_fix_len + 3, input_fix_len + 4 diff --git a/scripts/node_strand_gravity/node_strand_gravity.gml b/scripts/node_strand_gravity/node_strand_gravity.gml index ab2e90452..277d44d5d 100644 --- a/scripts/node_strand_gravity/node_strand_gravity.gml +++ b/scripts/node_strand_gravity/node_strand_gravity.gml @@ -9,11 +9,11 @@ function Node_Strand_Gravity(_x, _y, _group = noone) : Node(_x, _y, _group) cons inputs[| 0] = nodeValue("Strand", self, JUNCTION_CONNECT.input, VALUE_TYPE.strands, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Gravity", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 1] = nodeValue_Float("Gravity", self, 1); inputs[| 2] = nodeValue_Rotation("Direction", self, 0); - outputs[| 0] = nodeValue("Strand", self, JUNCTION_CONNECT.output, VALUE_TYPE.strands, noone); + outputs[| 0] = nodeValue_Output("Strand", self, VALUE_TYPE.strands, noone); static update = function(frame = CURRENT_FRAME) { var _str = getInputData(0); diff --git a/scripts/node_strand_length_adjust/node_strand_length_adjust.gml b/scripts/node_strand_length_adjust/node_strand_length_adjust.gml index 2d276900e..6af735cf8 100644 --- a/scripts/node_strand_length_adjust/node_strand_length_adjust.gml +++ b/scripts/node_strand_length_adjust/node_strand_length_adjust.gml @@ -8,7 +8,7 @@ function Node_Strand_Length_Adjust(_x, _y, _group = noone) : _Node_Strand_Affect inputs[| input_fix_len + 0] = nodeValue_Enum_Button("Type", self, 0, [ "Increase", "Decrease" ]); - inputs[| input_fix_len + 1] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1) + inputs[| input_fix_len + 1] = nodeValue_Float("Strength", self, 0.1) .setDisplay(VALUE_DISPLAY.slider); array_push(input_display_list, diff --git a/scripts/node_strand_render/node_strand_render.gml b/scripts/node_strand_render/node_strand_render.gml index 5dfc3ccaf..699807f38 100644 --- a/scripts/node_strand_render/node_strand_render.gml +++ b/scripts/node_strand_render/node_strand_render.gml @@ -11,23 +11,22 @@ function Node_Strand_Render(_x, _y, _group = noone) : Node(_x, _y, _group) const inputs[| 1] = nodeValue("Strand", self, JUNCTION_CONNECT.input, VALUE_TYPE.strands, noone) .setVisible(true, true); - inputs[| 2] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 2] = nodeValue_Range("Thickness", self, [ 1, 1 ], { linked : true }); inputs[| 3] = nodeValue("Thickness over length", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - inputs[| 4] = nodeValue("Random color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))); + inputs[| 4] = nodeValue_Gradient("Random color", self, new gradientObject(cola(c_white))); - inputs[| 5] = nodeValue("Color over length", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))); + inputs[| 5] = nodeValue_Gradient("Color over length", self, new gradientObject(cola(c_white))); - inputs[| 6] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 6] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 6].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 7] = nodeValue("Child", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0, "Render extra strands between the real strands."); + inputs[| 7] = nodeValue_Float("Child", self, 0, "Render extra strands between the real strands."); - inputs[| 8] = nodeValue("Update quality", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4); + inputs[| 8] = nodeValue_Int("Update quality", self, 4); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 6, 8, ["Output", false], 0, diff --git a/scripts/node_strand_render_texture/node_strand_render_texture.gml b/scripts/node_strand_render_texture/node_strand_render_texture.gml index f294eee42..e49dd2cdb 100644 --- a/scripts/node_strand_render_texture/node_strand_render_texture.gml +++ b/scripts/node_strand_render_texture/node_strand_render_texture.gml @@ -11,17 +11,16 @@ function Node_Strand_Render_Texture(_x, _y, _group = noone) : Node(_x, _y, _grou inputs[| 1] = nodeValue("Strand", self, JUNCTION_CONNECT.input, VALUE_TYPE.strands, noone) .setVisible(true, true); - inputs[| 2] = nodeValue("Thickness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 8, 8 ]) - .setDisplay(VALUE_DISPLAY.range, { linked : true }); + inputs[| 2] = nodeValue_Range("Thickness", self, [ 8, 8 ], { linked : true }); - inputs[| 3] = nodeValue("Random color", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))); + inputs[| 3] = nodeValue_Gradient("Random color", self, new gradientObject(cola(c_white))); inputs[| 4] = nodeValue_Surface("Texture", self); - inputs[| 5] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 5] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 5].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 5, ["Output", false], 0, diff --git a/scripts/node_strand_update/node_strand_update.gml b/scripts/node_strand_update/node_strand_update.gml index 8732375d7..6e9d80ed4 100644 --- a/scripts/node_strand_update/node_strand_update.gml +++ b/scripts/node_strand_update/node_strand_update.gml @@ -9,9 +9,9 @@ function Node_Strand_Update(_x, _y, _group = noone) : Node(_x, _y, _group) const inputs[| 0] = nodeValue("Strand", self, JUNCTION_CONNECT.input, VALUE_TYPE.strands, noone) .setVisible(true, true); - inputs[| 1] = nodeValue("Step", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 4) + inputs[| 1] = nodeValue_Int("Step", self, 4) - outputs[| 0] = nodeValue("Strand", self, JUNCTION_CONNECT.output, VALUE_TYPE.strands, noone); + outputs[| 0] = nodeValue_Output("Strand", self, VALUE_TYPE.strands, noone); static update = function(frame = CURRENT_FRAME) { var _str = getInputData(0); diff --git a/scripts/node_string/node_string.gml b/scripts/node_string/node_string.gml index a5428d090..4c016a911 100644 --- a/scripts/node_string/node_string.gml +++ b/scripts/node_string/node_string.gml @@ -2,9 +2,9 @@ function Node_String(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co name = "Text"; setDimension(96, 48);; - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 0] = nodeValue_Text("Text", self, ""); - outputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Text", self, VALUE_TYPE.text, ""); static processData = function(_output, _data, _index = 0) { return _data[0]; diff --git a/scripts/node_string_get_char/node_string_get_char.gml b/scripts/node_string_get_char/node_string_get_char.gml index b878f7d63..61d78eb0a 100644 --- a/scripts/node_string_get_char/node_string_get_char.gml +++ b/scripts/node_string_get_char/node_string_get_char.gml @@ -2,14 +2,14 @@ function Node_String_Get_Char(_x, _y, _group = noone) : Node_Processor(_x, _y, _ name = "Get Character"; setDimension(96, 48); - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 1] = nodeValue_Int("Index", self, 1); - inputs[| 2] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1); + inputs[| 2] = nodeValue_Int("Amount", self, 1); - outputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Text", self, VALUE_TYPE.text, ""); static processData = function(_output, _data, _index = 0) { return string_copy(_data[0], _data[1], _data[2]); diff --git a/scripts/node_string_join/node_string_join.gml b/scripts/node_string_join/node_string_join.gml index d23655752..6fb21e752 100644 --- a/scripts/node_string_join/node_string_join.gml +++ b/scripts/node_string_join/node_string_join.gml @@ -3,15 +3,15 @@ function Node_String_Join(_x, _y, _group = noone) : Node(_x, _y, _group) constru setDimension(96, 48); - inputs[| 0] = nodeValue("Text array", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, []) + inputs[| 0] = nodeValue_Text("Text array", self, []) .setVisible(true, true); - inputs[| 1] = nodeValue("Divider", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 1] = nodeValue_Text("Divider", self, "") .rejectArray(); inputs[| 1].editWidget.format = TEXT_AREA_FORMAT.delimiter; - outputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Text", self, VALUE_TYPE.text, ""); static update = function() { var _arr = getInputData(0); diff --git a/scripts/node_string_length/node_string_length.gml b/scripts/node_string_length/node_string_length.gml index e3d21f405..adc322e88 100644 --- a/scripts/node_string_length/node_string_length.gml +++ b/scripts/node_string_length/node_string_length.gml @@ -3,12 +3,12 @@ function Node_String_Length(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr setDimension(96, 48); - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); inputs[| 1] = nodeValue_Enum_Scroll("Mode", self, 0, ["Character", "Word"]); - outputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Text", self, VALUE_TYPE.text, ""); static processData = function(_output, _data, _index = 0) { if(_data[1] == 0) diff --git a/scripts/node_string_merge/node_string_merge.gml b/scripts/node_string_merge/node_string_merge.gml index 65ddf581d..3c797f004 100644 --- a/scripts/node_string_merge/node_string_merge.gml +++ b/scripts/node_string_merge/node_string_merge.gml @@ -3,12 +3,12 @@ function Node_String_Merge(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro setDimension(96, 48); - outputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Text", self, VALUE_TYPE.text, ""); static createNewInput = function() { var index = ds_list_size(inputs); - inputs[| index] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) + inputs[| index] = nodeValue_Text("Text", self, "" ) .setVisible(true, true); return inputs[| index]; diff --git a/scripts/node_string_regex_match/node_string_regex_match.gml b/scripts/node_string_regex_match/node_string_regex_match.gml index 24393b227..3cc968b77 100644 --- a/scripts/node_string_regex_match/node_string_regex_match.gml +++ b/scripts/node_string_regex_match/node_string_regex_match.gml @@ -3,12 +3,12 @@ function Node_String_Regex_Match(_x, _y, _group = noone) : Node_Processor(_x, _y setDimension(96, 48); - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Regex", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Regex", self, ""); - outputs[| 0] = nodeValue("Results", self, JUNCTION_CONNECT.output, VALUE_TYPE.boolean, false); + outputs[| 0] = nodeValue_Output("Results", self, VALUE_TYPE.boolean, false); input_display_list = [ 0, 1, diff --git a/scripts/node_string_regex_replace/node_string_regex_replace.gml b/scripts/node_string_regex_replace/node_string_regex_replace.gml index 2464aac41..e32dd332d 100644 --- a/scripts/node_string_regex_replace/node_string_regex_replace.gml +++ b/scripts/node_string_regex_replace/node_string_regex_replace.gml @@ -3,14 +3,14 @@ function Node_String_Regex_Replace(_x, _y, _group = noone) : Node_Processor(_x, setDimension(96, 48); - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Regex", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Regex", self, ""); - inputs[| 2] = nodeValue("Replacement", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 2] = nodeValue_Text("Replacement", self, ""); - outputs[| 0] = nodeValue("Results", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Results", self, VALUE_TYPE.text, ""); input_display_list = [ 0, 1, 2, diff --git a/scripts/node_string_regex_search/node_string_regex_search.gml b/scripts/node_string_regex_search/node_string_regex_search.gml index 10f58b6ae..235e58598 100644 --- a/scripts/node_string_regex_search/node_string_regex_search.gml +++ b/scripts/node_string_regex_search/node_string_regex_search.gml @@ -3,12 +3,12 @@ function Node_String_Regex_Search(_x, _y, _group = noone) : Node_Processor(_x, _ setDimension(96, 48); - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Regex", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Regex", self, ""); - outputs[| 0] = nodeValue("Results", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, []); + outputs[| 0] = nodeValue_Output("Results", self, VALUE_TYPE.text, []); input_display_list = [ 0, 1, diff --git a/scripts/node_string_split/node_string_split.gml b/scripts/node_string_split/node_string_split.gml index b77045a63..a274e93ea 100644 --- a/scripts/node_string_split/node_string_split.gml +++ b/scripts/node_string_split/node_string_split.gml @@ -2,12 +2,12 @@ function Node_String_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro name = "Split Text"; setDimension(96, 48); - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Delimiter", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, " ", "Character that used to split text,\nleave blank to create character array."); + inputs[| 1] = nodeValue_Text("Delimiter", self, " ", "Character that used to split text,\nleave blank to create character array."); inputs[| 1].editWidget.format = TEXT_AREA_FORMAT.delimiter; - outputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Text", self, VALUE_TYPE.text, ""); static processData = function(_output, _data, _index = 0) { if(_data[1] == "") diff --git a/scripts/node_string_trim/node_string_trim.gml b/scripts/node_string_trim/node_string_trim.gml index 77311bf36..09e13b7db 100644 --- a/scripts/node_string_trim/node_string_trim.gml +++ b/scripts/node_string_trim/node_string_trim.gml @@ -3,19 +3,19 @@ function Node_String_Trim(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou setDimension(96, 48); - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Head", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 1] = nodeValue_Int("Head", self, 0); - inputs[| 2] = nodeValue("Tail", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0); + inputs[| 2] = nodeValue_Int("Tail", self, 0); inputs[| 3] = nodeValue_Enum_Scroll("Trim", self, 0, ["Character", "Word"]); inputs[| 4] = nodeValue_Enum_Scroll("Mode", self, 0, ["Counter", "Progress"]) .setTooltip("Set to progress to use ratio, where 0 means no change and 1 means the entire length of the text."); - outputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Text", self, VALUE_TYPE.text, ""); input_display_list = [ ["Text", false], 0, diff --git a/scripts/node_stripe/node_stripe.gml b/scripts/node_stripe/node_stripe.gml index 7d302e7f7..27d0c348d 100644 --- a/scripts/node_stripe/node_stripe.gml +++ b/scripts/node_stripe/node_stripe.gml @@ -3,7 +3,7 @@ function Node_Stripe(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 1] = nodeValue_Float("Amount", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }) .setMappable(11); @@ -12,24 +12,23 @@ function Node_Stripe(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 3] = nodeValue_Enum_Button("Type", self, 0, [ "Solid", "Smooth", "AA" ]); - inputs[| 4] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Position", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 5] = nodeValue("Random", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 5] = nodeValue_Float("Random", self, 0) .setDisplay(VALUE_DISPLAY.slider) .setMappable(13); inputs[| 6] = nodeValue_Enum_Button("Coloring", self, 0, [ "Alternate", "Palette", "Random" ]); - inputs[| 7] = nodeValue("Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white)) ) + inputs[| 7] = nodeValue_Gradient("Colors", self, new gradientObject(cola(c_white))) .setMappable(15); - inputs[| 8] = nodeValue("Color 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 8] = nodeValue_Color("Color 1", self, c_white); - inputs[| 9] = nodeValue("Color 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 9] = nodeValue_Color("Color 2", self, c_black); - inputs[| 10] = nodeValue("Strip ratio", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 10] = nodeValue_Float("Strip ratio", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) .setMappable(14); @@ -49,15 +48,14 @@ function Node_Stripe(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co ////////////////////////////////////////////////////////////////////////////////////////////////// - inputs[| 17] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 17] = nodeValue_Float("Progress", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 18] = nodeValue("Colors", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, [ c_black, c_white ] ) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 18] = nodeValue_Palette("Colors", self, [ c_black, c_white ] ); inputs[| 19] = nodeValueSeed(self, VALUE_TYPE.float); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 19, ["Output", true], 0, diff --git a/scripts/node_struct/node_struct.gml b/scripts/node_struct/node_struct.gml index 8f19407a8..6ad73f06c 100644 --- a/scripts/node_struct/node_struct.gml +++ b/scripts/node_struct/node_struct.gml @@ -20,7 +20,7 @@ function Node_Struct(_x, _y, _group = noone) : Node(_x, _y, _group) constructor input_display_list = [ size_adjust_tool, ]; - outputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); + outputs[| 0] = nodeValue_Output("Struct", self, VALUE_TYPE.struct, {}); #region //////////////////////////////// Dynamic IO //////////////////////////////// @@ -30,7 +30,7 @@ function Node_Struct(_x, _y, _group = noone) : Node(_x, _y, _group) constructor var bDel = button(function() { node.deleteInput(index); }) .setIcon(THEME.minus_16, 0, COLORS._main_icon); - list[| index + 0] = nodeValue("Key", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) + list[| index + 0] = nodeValue_Text("Key", self, "" ) .setDisplay(VALUE_DISPLAY.text_box, { side_button : bDel }) .setAnimable(false); bDel.setContext(list[| index + 0]); diff --git a/scripts/node_struct_get/node_struct_get.gml b/scripts/node_struct_get/node_struct_get.gml index 85c3b9560..50cd7fdbe 100644 --- a/scripts/node_struct_get/node_struct_get.gml +++ b/scripts/node_struct_get/node_struct_get.gml @@ -3,12 +3,12 @@ function Node_Struct_Get(_x, _y, _group = noone) : Node(_x, _y, _group) construc setDimension(96, 48); - inputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, {}) + inputs[| 0] = nodeValue_Struct("Struct", self, {}) .setVisible(true, true); - inputs[| 1] = nodeValue("Key", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Key", self, ""); - outputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); + outputs[| 0] = nodeValue_Output("Struct", self, VALUE_TYPE.struct, {}); static getStructValue = function(str, keys) { #region var _pnt = str, val = 0; diff --git a/scripts/node_struct_json_parse/node_struct_json_parse.gml b/scripts/node_struct_json_parse/node_struct_json_parse.gml index 68bb6f347..2be241930 100644 --- a/scripts/node_struct_json_parse/node_struct_json_parse.gml +++ b/scripts/node_struct_json_parse/node_struct_json_parse.gml @@ -2,10 +2,10 @@ function Node_Struct_JSON_Parse(_x, _y, _group = noone) : Node(_x, _y, _group) c name = "JSON Parse"; setDimension(96, 32 + 24); - inputs[| 0] = nodeValue("JSON string", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, 0) + inputs[| 0] = nodeValue_Text("JSON string", self, 0) .setVisible(true, true); - outputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {} ); + outputs[| 0] = nodeValue_Output("Struct", self, VALUE_TYPE.struct, {} ); static update = function(frame = CURRENT_FRAME) { var _str = getInputData(0); diff --git a/scripts/node_struct_set/node_struct_set.gml b/scripts/node_struct_set/node_struct_set.gml index b958df468..fdda0b4e6 100644 --- a/scripts/node_struct_set/node_struct_set.gml +++ b/scripts/node_struct_set/node_struct_set.gml @@ -3,14 +3,14 @@ function Node_Struct_Set(_x, _y, _group = noone) : Node(_x, _y, _group) construc setDimension(96, 48); - inputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, {}) + inputs[| 0] = nodeValue_Struct("Struct", self, {}) .setVisible(true, true); - inputs[| 1] = nodeValue("Key", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 1] = nodeValue_Text("Key", self, ""); inputs[| 2] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0); - outputs[| 0] = nodeValue("Struct", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); + outputs[| 0] = nodeValue_Output("Struct", self, VALUE_TYPE.struct, {}); static update = function() { var str = getInputData(0); diff --git a/scripts/node_surface_data/node_surface_data.gml b/scripts/node_surface_data/node_surface_data.gml index 48cc81366..40cee05ed 100644 --- a/scripts/node_surface_data/node_surface_data.gml +++ b/scripts/node_surface_data/node_surface_data.gml @@ -7,7 +7,7 @@ function Node_Surface_data(_x, _y, _group = noone) : Node(_x, _y, _group) constr outputs[| 0] = nodeValue_Output("Dimension", self, VALUE_TYPE.integer, [ 1, 1 ]) .setDisplay(VALUE_DISPLAY.vector); - outputs[| 1] = nodeValue("Array length", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 0); + outputs[| 1] = nodeValue_Output("Array length", self, VALUE_TYPE.integer, 0); setDimension(96, 48); diff --git a/scripts/node_surface_from_buffer/node_surface_from_buffer.gml b/scripts/node_surface_from_buffer/node_surface_from_buffer.gml index d91f812bf..52740a35f 100644 --- a/scripts/node_surface_from_buffer/node_surface_from_buffer.gml +++ b/scripts/node_surface_from_buffer/node_surface_from_buffer.gml @@ -1,10 +1,10 @@ function Node_Surface_From_Buffer(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Surface from Buffer"; - inputs[| 0] = nodeValue("Buffer", self, JUNCTION_CONNECT.input, VALUE_TYPE.buffer, noone) + inputs[| 0] = nodeValue_Buffer("Buffer", self, noone) .setVisible(true, true); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone); static processData = function(_outSurf, _data, _output_index, _array_index) { var _buff = _data[0]; diff --git a/scripts/node_surface_from_color/node_surface_from_color.gml b/scripts/node_surface_from_color/node_surface_from_color.gml index fe10a2eb5..3d318415b 100644 --- a/scripts/node_surface_from_color/node_surface_from_color.gml +++ b/scripts/node_surface_from_color/node_surface_from_color.gml @@ -1,10 +1,9 @@ function Node_Surface_From_Color(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) constructor { name = "Surface from Color"; - inputs[| 0] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) - .setDisplay(VALUE_DISPLAY.palette); + inputs[| 0] = nodeValue_Palette("Color", self, array_clone(DEF_PALETTE)); - outputs[| 0] = nodeValue("Surface", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface", self, VALUE_TYPE.surface, noone); static processData = function(_outSurf, _data, _output_index, _array_index) { var _col = _data[0]; diff --git a/scripts/node_surface_replace/node_surface_replace.gml b/scripts/node_surface_replace/node_surface_replace.gml index caf44c55e..84724297c 100644 --- a/scripts/node_surface_replace/node_surface_replace.gml +++ b/scripts/node_surface_replace/node_surface_replace.gml @@ -9,24 +9,24 @@ function Node_Surface_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _ inputs[| 2] = nodeValue_Surface("Replacement Image", self) .setArrayDepth(1); - inputs[| 3] = nodeValue("Color Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1, "How similiar the color need to be in order to be count as matched." ) + inputs[| 3] = nodeValue_Float("Color Threshold", self, 0.1, "How similiar the color need to be in order to be count as matched." ) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 4] = nodeValue("Draw Base Image", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 4] = nodeValue_Bool("Draw Base Image", self, true ); - inputs[| 5] = nodeValue("Fast Mode", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 5] = nodeValue_Bool("Fast Mode", self, true ); - inputs[| 6] = nodeValue("Pixel Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.1, "How many pixel need to me matched to replace with replacement image." ) + inputs[| 6] = nodeValue_Float("Pixel Threshold", self, 0.1, "How many pixel need to me matched to replace with replacement image." ) .setDisplay(VALUE_DISPLAY.slider); inputs[| 7] = nodeValue_Enum_Scroll("Array mode", self, 0, { data: [ "Match index", "Randomized" ], update_hover: false }); - inputs[| 8] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 8] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 8].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); - inputs[| 9] = nodeValue("Replace Empty", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 9] = nodeValue_Bool("Replace Empty", self, false) - outputs[| 0] = nodeValue("Surface Out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface Out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surfaces", true], 0, 1, 2, 7, 8, diff --git a/scripts/node_surface_to_buffer/node_surface_to_buffer.gml b/scripts/node_surface_to_buffer/node_surface_to_buffer.gml index a34c2a7f6..66d7960bf 100644 --- a/scripts/node_surface_to_buffer/node_surface_to_buffer.gml +++ b/scripts/node_surface_to_buffer/node_surface_to_buffer.gml @@ -3,7 +3,7 @@ function Node_Surface_To_Buffer(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 0] = nodeValue_Surface("Surface", self); - outputs[| 0] = nodeValue("Buffer", self, JUNCTION_CONNECT.output, VALUE_TYPE.buffer, noone); + outputs[| 0] = nodeValue_Output("Buffer", self, VALUE_TYPE.buffer, noone); static processData = function(_outSurf, _data, _output_index, _array_index) { var _surf = _data[0]; diff --git a/scripts/node_surface_to_color/node_surface_to_color.gml b/scripts/node_surface_to_color/node_surface_to_color.gml index 6833edef3..05fe24cd5 100644 --- a/scripts/node_surface_to_color/node_surface_to_color.gml +++ b/scripts/node_surface_to_color/node_surface_to_color.gml @@ -3,7 +3,7 @@ function Node_Surface_To_Color(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 0] = nodeValue_Surface("Surface", self); - outputs[| 0] = nodeValue("Colors", self, JUNCTION_CONNECT.output, VALUE_TYPE.color, []) + outputs[| 0] = nodeValue_Output("Colors", self, VALUE_TYPE.color, []) .setDisplay(VALUE_DISPLAY.palette); static processData = function(_outSurf, _data, _output_index, _array_index) { diff --git a/scripts/node_svg/node_svg.gml b/scripts/node_svg/node_svg.gml index 9e12442e7..40968d399 100644 --- a/scripts/node_svg/node_svg.gml +++ b/scripts/node_svg/node_svg.gml @@ -11,14 +11,14 @@ function Node_SVG(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "SVG"; color = COLORS.node_blend_input; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "Scalable Vector Graphics|*.svg" }); - inputs[| 1] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 1] = nodeValue_Float("Scale", self, 1); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("SVG Struct", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); + outputs[| 1] = nodeValue_Output("SVG Struct", self, VALUE_TYPE.struct, {}); attribute_surface_depth(); diff --git a/scripts/node_switch/node_switch.gml b/scripts/node_switch/node_switch.gml index ee5228ef0..e4fb56d37 100644 --- a/scripts/node_switch/node_switch.gml +++ b/scripts/node_switch/node_switch.gml @@ -3,7 +3,7 @@ function Node_Switch(_x, _y, _group = noone) : Node(_x, _y, _group) constructor setDimension(96, 48); - inputs[| 0] = nodeValue("Index", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) + inputs[| 0] = nodeValue_Text("Index", self, "" ) .setVisible(true, true) .rejectArray(); @@ -25,7 +25,7 @@ function Node_Switch(_x, _y, _group = noone) : Node(_x, _y, _group) constructor return _h; }); #endregion - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, 0); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.any, 0); input_display_list = [ 0, 1, ["Cases", false], size_adjust_tool @@ -38,7 +38,7 @@ function Node_Switch(_x, _y, _group = noone) : Node(_x, _y, _group) constructor var bDel = button(function() { node.deleteInput(index); }) .setIcon(THEME.minus_16, 0, COLORS._main_icon); - list[| index + 0] = nodeValue("Case", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "" ) + list[| index + 0] = nodeValue_Text("Case", self, "" ) .setDisplay(VALUE_DISPLAY.text_box, { side_button : bDel }) .setAnimable(false); bDel.setContext(list[| index + 0]); diff --git a/scripts/node_terminal_trigger/node_terminal_trigger.gml b/scripts/node_terminal_trigger/node_terminal_trigger.gml index d94444584..3092aa408 100644 --- a/scripts/node_terminal_trigger/node_terminal_trigger.gml +++ b/scripts/node_terminal_trigger/node_terminal_trigger.gml @@ -4,7 +4,7 @@ function Node_Terminal_Trigger(_x, _y, _group = noone) : Node(_x, _y, _group) co draw_padding = 8; - outputs[| 0] = nodeValue("Terminal", self, JUNCTION_CONNECT.output, VALUE_TYPE.trigger, false ); + outputs[| 0] = nodeValue_Output("Terminal", self, VALUE_TYPE.trigger, false ); static onDrawNode = function(xx, yy, _mx, _my, _s, _hover, _focus) { var bbox = drawGetBbox(xx, yy, _s); diff --git a/scripts/node_text/node_text.gml b/scripts/node_text/node_text.gml index 335e7528b..de182a99f 100644 --- a/scripts/node_text/node_text.gml +++ b/scripts/node_text/node_text.gml @@ -2,23 +2,21 @@ function Node_Text(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons name = "Draw Text"; font = f_p0; - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); - inputs[| 1] = nodeValue("Font", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 1] = nodeValue_Text("Font", self, "") .setDisplay(VALUE_DISPLAY.path_font); - inputs[| 2] = nodeValue("Size", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 16); + inputs[| 2] = nodeValue_Int("Size", self, 16); - inputs[| 3] = nodeValue("Anti-Aliasing ", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Anti-Aliasing ", self, false); - inputs[| 4] = nodeValue("Character range", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [ 32, 128 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 4] = nodeValue_Vector("Character range", self, [ 32, 128 ]); - inputs[| 5] = nodeValue("Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 5] = nodeValue_Color("Color", self, c_white); - inputs[| 6] = nodeValue("Fixed dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, DEF_SURF ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 6] = nodeValue_Vector("Fixed dimension", self, DEF_SURF ) .setVisible(true, false); inputs[| 7] = nodeValue_Enum_Button("Horizontal alignment", self, 0 , [ THEME.inspector_text_halign, THEME.inspector_text_halign, THEME.inspector_text_halign]); @@ -27,45 +25,43 @@ function Node_Text(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 9] = nodeValue_Enum_Scroll("Output dimension", self, 1 , [ "Fixed", "Dynamic" ]); - inputs[| 10] = nodeValue("Padding", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0, 0, 0]) - .setDisplay(VALUE_DISPLAY.padding); + inputs[| 10] = nodeValue_Padding("Padding", self, [0, 0, 0, 0]); - inputs[| 11] = nodeValue("Letter spacing", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 11] = nodeValue_Float("Letter spacing", self, 0); - inputs[| 12] = nodeValue("Line height", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 12] = nodeValue_Float("Line height", self, 0); - inputs[| 13] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.pathnode, noone) + inputs[| 13] = nodeValue_PathNode("Path", self, noone) .setVisible(true, true); - inputs[| 14] = nodeValue("Path shift", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); + inputs[| 14] = nodeValue_Float("Path shift", self, 0); - inputs[| 15] = nodeValue("Scale to fit", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 15] = nodeValue_Bool("Scale to fit", self, false); - inputs[| 16] = nodeValue("Render background", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 16] = nodeValue_Bool("Render background", self, false); - inputs[| 17] = nodeValue("BG Color", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 17] = nodeValue_Color("BG Color", self, c_black); - inputs[| 18] = nodeValue("Wave", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 18] = nodeValue_Bool("Wave", self, false); - inputs[| 19] = nodeValue("Wave amplitude", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 4); + inputs[| 19] = nodeValue_Float("Wave amplitude", self, 4); - inputs[| 20] = nodeValue("Wave scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 30); + inputs[| 20] = nodeValue_Float("Wave scale", self, 30); inputs[| 21] = nodeValue_Rotation("Wave phase", self, 0); - inputs[| 22] = nodeValue("Wave shape", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 22] = nodeValue_Float("Wave shape", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 3, 0.01 ] }); - inputs[| 23] = nodeValue("Typewriter", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 23] = nodeValue_Bool("Typewriter", self, false); - inputs[| 24] = nodeValue("Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.slider_range); + inputs[| 24] = nodeValue_Slider_Range("Range", self, [ 0, 1 ]); inputs[| 25] = nodeValue_Enum_Button("Trim type", self, 0 , [ "Character", "Word", "Line" ]); - inputs[| 26] = nodeValue("Use full text size", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true ); + inputs[| 26] = nodeValue_Bool("Use full text size", self, true ); - inputs[| 27] = nodeValue("Max line width", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0 ); + inputs[| 27] = nodeValue_Int("Max line width", self, 0 ); input_display_list = [ ["Output", true], 9, 6, 10, @@ -77,7 +73,7 @@ function Node_Text(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons ["Trim", true, 23], 25, 24, 26, ]; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_text_file_read/node_text_file_read.gml b/scripts/node_text_file_read/node_text_file_read.gml index b3b5b313b..8f26a7a10 100644 --- a/scripts/node_text_file_read/node_text_file_read.gml +++ b/scripts/node_text_file_read/node_text_file_read.gml @@ -29,12 +29,12 @@ function Node_Text_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) cons w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "any file|*" }) .rejectArray(); - outputs[| 0] = nodeValue("Content", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); - outputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, "") + outputs[| 0] = nodeValue_Output("Content", self, VALUE_TYPE.text, ""); + outputs[| 1] = nodeValue_Output("Path", self, VALUE_TYPE.path, "") .setVisible(true, true); content = ""; diff --git a/scripts/node_text_file_write/node_text_file_write.gml b/scripts/node_text_file_write/node_text_file_write.gml index 6b1ca0ba2..2a5f9c1ef 100644 --- a/scripts/node_text_file_write/node_text_file_write.gml +++ b/scripts/node_text_file_write/node_text_file_write.gml @@ -4,11 +4,11 @@ function Node_Text_File_Write(_x, _y, _group = noone) : Node(_x, _y, _group) con w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_save, { filter: "text file|*.txt" }) .rejectArray(); - inputs[| 1] = nodeValue("Content", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 1] = nodeValue_Text("Content", self, "") .setVisible(true, true); static writeFile = function() { diff --git a/scripts/node_texture_remap/node_texture_remap.gml b/scripts/node_texture_remap/node_texture_remap.gml index eec532379..7bb3195c3 100644 --- a/scripts/node_texture_remap/node_texture_remap.gml +++ b/scripts/node_texture_remap/node_texture_remap.gml @@ -8,12 +8,12 @@ function Node_Texture_Remap(_x, _y, _group = noone) : Node_Processor(_x, _y, _gr inputs[| 1] = nodeValue_Surface("RG Map", self, "Displacement map where red retermine the X position, and green determine the Y position."); - inputs[| 2] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Active", self, true); active_index = 2; inputs[| 3] = nodeValue_Enum_Button("Dimension Source", self, 0, [ "Surface", "RG Map" ]); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 2, ["Surfaces", false], 0, 1, 3, diff --git a/scripts/node_threshold/node_threshold.gml b/scripts/node_threshold/node_threshold.gml index c8439685c..072434fd5 100644 --- a/scripts/node_threshold/node_threshold.gml +++ b/scripts/node_threshold/node_threshold.gml @@ -3,34 +3,33 @@ function Node_Threshold(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Brightness", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 1] = nodeValue_Bool("Brightness", self, false); - inputs[| 2] = nodeValue("Brightness Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Brightness Threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) .setMappable(13); - inputs[| 3] = nodeValue("Brightness Smoothness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 3] = nodeValue_Float("Brightness Smoothness", self, 0) .setDisplay(VALUE_DISPLAY.slider); inputs[| 4] = nodeValue_Surface("Mask", self); - inputs[| 5] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 5] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 6] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 6] = nodeValue_Bool("Active", self, true); active_index = 6; - inputs[| 7] = nodeValue("Alpha", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 7] = nodeValue_Bool("Alpha", self, false); - inputs[| 8] = nodeValue("Alpha Threshold", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 8] = nodeValue_Float("Alpha Threshold", self, 0.5) .setDisplay(VALUE_DISPLAY.slider) .setMappable(14); - inputs[| 9] = nodeValue("Alpha Smoothness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 9] = nodeValue_Float("Alpha Smoothness", self, 0) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 10] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 10] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(4); // inputs 11, 12 @@ -42,7 +41,7 @@ function Node_Threshold(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) ////////////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 6, 10, ["Surfaces", true], 0, 4, 5, 11, 12, diff --git a/scripts/node_tile/node_tile.gml b/scripts/node_tile/node_tile.gml index e3f3aebea..0e4387011 100644 --- a/scripts/node_tile/node_tile.gml +++ b/scripts/node_tile/node_tile.gml @@ -5,7 +5,7 @@ function Node_Tile(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 1] = nodeValue_Surface("Border texture", self); - outputs[| 0] = nodeValue("", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("", self, VALUE_TYPE.surface, noone); input_display_list = [ 0 ]; diff --git a/scripts/node_tile_random/node_tile_random.gml b/scripts/node_tile_random/node_tile_random.gml index b79083953..d9ef38374 100644 --- a/scripts/node_tile_random/node_tile_random.gml +++ b/scripts/node_tile_random/node_tile_random.gml @@ -6,10 +6,10 @@ function Node_Tile_Random(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 1] = nodeValue_Dimension(self); - inputs[| 2] = nodeValue("Randomness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.5) + inputs[| 2] = nodeValue_Float("Randomness", self, 0.5) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", true], 0, diff --git a/scripts/node_time_remap/node_time_remap.gml b/scripts/node_time_remap/node_time_remap.gml index 6a301f976..dfbab5705 100644 --- a/scripts/node_time_remap/node_time_remap.gml +++ b/scripts/node_time_remap/node_time_remap.gml @@ -14,12 +14,12 @@ function Node_Time_Remap(_x, _y, _group = noone) : Node(_x, _y, _group) construc inputs[| 1] = nodeValue_Surface("Map", self) .rejectArray(); - inputs[| 2] = nodeValue("Max life", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 3) + inputs[| 2] = nodeValue_Int("Max life", self, 3) .rejectArray(); - inputs[| 3] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 3] = nodeValue_Bool("Loop", self, false) - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surfaces", false], 0, 1, diff --git a/scripts/node_to_number/node_to_number.gml b/scripts/node_to_number/node_to_number.gml index 469afda09..c36c07e1f 100644 --- a/scripts/node_to_number/node_to_number.gml +++ b/scripts/node_to_number/node_to_number.gml @@ -4,10 +4,10 @@ function Node_To_Number(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) setDimension(96, 48); - inputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") + inputs[| 0] = nodeValue_Text("Text", self, "") .setVisible(true, true); - outputs[| 0] = nodeValue("Number", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("Number", self, VALUE_TYPE.float, 0); static processData = function(_output, _data, _output_index, _array_index = 0) { return toNumber(_data[0]); diff --git a/scripts/node_to_text/node_to_text.gml b/scripts/node_to_text/node_to_text.gml index 714f345ae..4eddc84ce 100644 --- a/scripts/node_to_text/node_to_text.gml +++ b/scripts/node_to_text/node_to_text.gml @@ -6,7 +6,7 @@ function Node_To_Text(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c inputs[| 0] = nodeValue("Value", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, 0) .setVisible(true, true); - outputs[| 0] = nodeValue("Text", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, ""); + outputs[| 0] = nodeValue_Output("Text", self, VALUE_TYPE.text, ""); static processData = function(_output, _data, _output_index, _array_index = 0) { return string(_data[0]); diff --git a/scripts/node_tonemap_ace/node_tonemap_ace.gml b/scripts/node_tonemap_ace/node_tonemap_ace.gml index f3ea8832e..e838898d6 100644 --- a/scripts/node_tonemap_ace/node_tonemap_ace.gml +++ b/scripts/node_tonemap_ace/node_tonemap_ace.gml @@ -5,14 +5,13 @@ function Node_Tonemap_ACE(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou inputs[| 1] = nodeValue_Surface("Mask", self); - inputs[| 2] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 2] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 3] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 3] = nodeValue_Bool("Active", self, true); active_index = 3; - inputs[| 4] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 4] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(1); // inputs 5, 6 @@ -20,7 +19,7 @@ function Node_Tonemap_ACE(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou ["Surfaces", true], 0, 1, 2, 5, 6, ] - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); attribute_surface_depth(); diff --git a/scripts/node_trail/node_trail.gml b/scripts/node_trail/node_trail.gml index c53e84c67..2eba2c85c 100644 --- a/scripts/node_trail/node_trail.gml +++ b/scripts/node_trail/node_trail.gml @@ -5,21 +5,21 @@ function Node_Trail(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Max life", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 5); + inputs[| 1] = nodeValue_Int("Max life", self, 5); - inputs[| 2] = nodeValue("Loop", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Loop", self, false); - inputs[| 3] = nodeValue("Max distance", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, -1, "Maximum distance to search for movement, set to -1 to search the entire image."); + inputs[| 3] = nodeValue_Int("Max distance", self, -1, "Maximum distance to search for movement, set to -1 to search the entire image."); - inputs[| 4] = nodeValue("Match color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Make trail track pixels of the same color, instead of the closet pixels."); + inputs[| 4] = nodeValue_Bool("Match color", self, true, "Make trail track pixels of the same color, instead of the closet pixels."); - inputs[| 5] = nodeValue("Blend color", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true, "Blend color between two pixel smoothly."); + inputs[| 5] = nodeValue_Bool("Blend color", self, true, "Blend color between two pixel smoothly."); inputs[| 6] = nodeValue("Alpha over life", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); - outputs[| 1] = nodeValue("Trail UV", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 1] = nodeValue_Output("Trail UV", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Surfaces", true], 0, diff --git a/scripts/node_transform_array/node_transform_array.gml b/scripts/node_transform_array/node_transform_array.gml index f94a28028..590774aed 100644 --- a/scripts/node_transform_array/node_transform_array.gml +++ b/scripts/node_transform_array/node_transform_array.gml @@ -4,18 +4,16 @@ function Node_Transform_Array(_x, _y, _group = noone) : Node_Processor(_x, _y, _ setDimension(96, 48); - inputs[| 0] = nodeValue("Postion", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Postion", self, [ 0, 0 ] ) .setVisible(true, true); inputs[| 1] = nodeValue_Rotation("Rotation", self, 0) .setVisible(true, true); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 1, 1 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 1, 1 ] ) .setVisible(true, true); - outputs[| 0] = nodeValue("Transform", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0, 0, 1, 1 ]) + outputs[| 0] = nodeValue_Output("Transform", self, VALUE_TYPE.float, [ 0, 0, 0, 1, 1 ]) .setDisplay(VALUE_DISPLAY.vector); static drawOverlay = function(hover, active, _x, _y, _s, _mx, _my, _snx, _sny) { diff --git a/scripts/node_transform_single/node_transform_single.gml b/scripts/node_transform_single/node_transform_single.gml index 0f39285c5..c79e8aa62 100644 --- a/scripts/node_transform_single/node_transform_single.gml +++ b/scripts/node_transform_single/node_transform_single.gml @@ -3,15 +3,15 @@ function Node_Transform_Single(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Position x", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); - inputs[| 2] = nodeValue("Position y", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); - inputs[| 3] = nodeValue("Anchor x", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); - inputs[| 4] = nodeValue("Anchor y", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); - inputs[| 5] = nodeValue("Rotation", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0); - inputs[| 6] = nodeValue("Scale x", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); - inputs[| 7] = nodeValue("Scale y", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1); + inputs[| 1] = nodeValue_Float("Position x", self, 0); + inputs[| 2] = nodeValue_Float("Position y", self, 0); + inputs[| 3] = nodeValue_Float("Anchor x", self, 0); + inputs[| 4] = nodeValue_Float("Anchor y", self, 0); + inputs[| 5] = nodeValue_Float("Rotation", self, 0); + inputs[| 6] = nodeValue_Float("Scale x", self, 1); + inputs[| 7] = nodeValue_Float("Scale y", self, 1); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); static processData = function(_outSurf, _data, _output_index, _array_index) { var pos_x = _data[1]; diff --git a/scripts/node_trigger/node_trigger.gml b/scripts/node_trigger/node_trigger.gml index ef12e50db..6616e2791 100644 --- a/scripts/node_trigger/node_trigger.gml +++ b/scripts/node_trigger/node_trigger.gml @@ -2,10 +2,10 @@ function Node_Trigger(_x, _y, _group = noone) : Node(_x, _y, _group) constructor name = "Trigger"; setDimension(96, 56); - inputs[| 0] = nodeValue("Trigger", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 0] = nodeValue_Trigger("Trigger", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Trigger" }); - outputs[| 0] = nodeValue("Trigger", self, JUNCTION_CONNECT.output, VALUE_TYPE.trigger, false ); + outputs[| 0] = nodeValue_Output("Trigger", self, VALUE_TYPE.trigger, false ); insp2UpdateTooltip = "Trigger"; insp2UpdateIcon = [ THEME.sequence_control, 1, COLORS._main_value_positive ]; diff --git a/scripts/node_trigger_bool/node_trigger_bool.gml b/scripts/node_trigger_bool/node_trigger_bool.gml index 3663c7552..a453b7c29 100644 --- a/scripts/node_trigger_bool/node_trigger_bool.gml +++ b/scripts/node_trigger_bool/node_trigger_bool.gml @@ -3,14 +3,14 @@ function Node_Trigger_Bool(_x, _y, _group = noone) : Node(_x, _y, _group) constr update_on_frame = true; setDimension(96, 32 + 24 * 1); - inputs[| 0] = nodeValue("Boolean", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 0] = nodeValue_Bool("Boolean", self, false); inputs[| 1] = nodeValue_Enum_Scroll("Trigger condition", self, 0, [ new scrollItem("True frame", s_node_trigger_cond, 0), new scrollItem("False to True", s_node_trigger_cond, 1), new scrollItem("True to False", s_node_trigger_cond, 2), new scrollItem("Value changed", s_node_trigger_cond, 3), ]); - outputs[| 0] = nodeValue("Trigger", self, JUNCTION_CONNECT.output, VALUE_TYPE.trigger, false); + outputs[| 0] = nodeValue_Output("Trigger", self, VALUE_TYPE.trigger, false); prevVal = false; preview = false; diff --git a/scripts/node_tunnel_in/node_tunnel_in.gml b/scripts/node_tunnel_in/node_tunnel_in.gml index 76a396c46..3e509568b 100644 --- a/scripts/node_tunnel_in/node_tunnel_in.gml +++ b/scripts/node_tunnel_in/node_tunnel_in.gml @@ -17,7 +17,7 @@ function Node_Tunnel_In(_x, _y, _group = noone) : Node(_x, _y, _group) construct var tname = ""; if(!LOADING && !APPENDING) tname = $"tunnel{ds_map_size(TUNNELS_IN_MAP)}"; - inputs[| 0] = nodeValue("Name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, tname ) + inputs[| 0] = nodeValue_Text("Name", self, tname ) .rejectArray(); inputs[| 1] = nodeValue("Value in", self, JUNCTION_CONNECT.input, VALUE_TYPE.any, noone ) diff --git a/scripts/node_tunnel_out/node_tunnel_out.gml b/scripts/node_tunnel_out/node_tunnel_out.gml index afd31f74f..da0b4e951 100644 --- a/scripts/node_tunnel_out/node_tunnel_out.gml +++ b/scripts/node_tunnel_out/node_tunnel_out.gml @@ -18,11 +18,11 @@ function Node_Tunnel_Out(_x, _y, _group = noone) : Node(_x, _y, _group) construc if(!LOADING && !APPENDING && !ds_map_empty(TUNNELS_IN)) tname = ds_map_find_first(TUNNELS_IN); - inputs[| 0] = nodeValue("Name", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, tname ) + inputs[| 0] = nodeValue_Text("Name", self, tname ) .setDisplay(VALUE_DISPLAY.text_tunnel) .rejectArray(); - outputs[| 0] = nodeValue("Value out", self, JUNCTION_CONNECT.output, VALUE_TYPE.any, noone ); + outputs[| 0] = nodeValue_Output("Value out", self, VALUE_TYPE.any, noone ); insp2UpdateTooltip = "Goto tunnel in"; insp2UpdateIcon = [ THEME.tunnel, 1, c_white ]; diff --git a/scripts/node_twirl/node_twirl.gml b/scripts/node_twirl/node_twirl.gml index d6ab2feec..7bd3e1bac 100644 --- a/scripts/node_twirl/node_twirl.gml +++ b/scripts/node_twirl/node_twirl.gml @@ -3,15 +3,14 @@ function Node_Twirl(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Center", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Center", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 3) + inputs[| 2] = nodeValue_Float("Strength", self, 3) .setDisplay(VALUE_DISPLAY.slider, { range: [-10, 10, 0.01] }) .setMappable(11); - inputs[| 3] = nodeValue("Radius", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 16) + inputs[| 3] = nodeValue_Float("Radius", self, 16) .setMappable(12); inputs[| 4] = nodeValue_Enum_Scroll("Oversample mode", self, 0, [ "Empty", "Clamp", "Repeat" ]) @@ -19,14 +18,13 @@ function Node_Twirl(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con inputs[| 5] = nodeValue_Surface("Mask", self); - inputs[| 6] = nodeValue("Mix", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 6] = nodeValue_Float("Mix", self, 1) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 7] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 7] = nodeValue_Bool("Active", self, true); active_index = 7; - inputs[| 8] = nodeValue("Channel", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 0b1111) - .setDisplay(VALUE_DISPLAY.toggle, { data: array_create(4, THEME.inspector_channel) }); + inputs[| 8] = nodeValue_Toggle("Channel", self, 0b1111, { data: array_create(4, THEME.inspector_channel) }); __init_mask_modifier(5); // inputs 9, 10 @@ -40,7 +38,7 @@ function Node_Twirl(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) con //////////////////////////////////////////////////////////////////////////////////////////// - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 7, 8, ["Surfaces", true], 0, 5, 6, 9, 10, diff --git a/scripts/node_unicode/node_unicode.gml b/scripts/node_unicode/node_unicode.gml index 4bd5fd808..c590e46de 100644 --- a/scripts/node_unicode/node_unicode.gml +++ b/scripts/node_unicode/node_unicode.gml @@ -5,9 +5,9 @@ function Node_Unicode(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c setDimension(96, 48); - inputs[| 0] = nodeValue("Unicode", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 64); + inputs[| 0] = nodeValue_Int("Unicode", self, 64); - outputs[| 0] = nodeValue("Character", self, JUNCTION_CONNECT.output, VALUE_TYPE.text, 0); + outputs[| 0] = nodeValue_Output("Character", self, VALUE_TYPE.text, 0); static processData = function(_output, _data, index = 0) { return chr(_data[0]); diff --git a/scripts/node_value_area/node_value_area.gml b/scripts/node_value_area/node_value_area.gml index d9f7d881b..bc4e1af93 100644 --- a/scripts/node_value_area/node_value_area.gml +++ b/scripts/node_value_area/node_value_area.gml @@ -21,10 +21,10 @@ enum AREA_INDEX { #macro DEF_AREA_REF [ 0.5, 0.5, 0.5, 0.5, AREA_SHAPE.rectangle, AREA_MODE.area ] #macro AREA_ARRAY_LENGTH 6 -function nodeValue_Area(_name, _node, _value, _tooltip = "") { return new NodeValue_Area(_name, _node, _value, _tooltip); } +function nodeValue_Area(_name, _node, _value, _data = {}) { return new NodeValue_Area(_name, _node, _value, _data); } -function NodeValue_Area(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.float, _value, _tooltip) constructor { - setDisplay(VALUE_DISPLAY.area); +function NodeValue_Area(_name, _node, _value, _data = {}) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.float, _value, "") constructor { + setDisplay(VALUE_DISPLAY.area, _data); /////============== GET ============= diff --git a/scripts/node_value_d3_mesh/node_value_d3_mesh.gml b/scripts/node_value_d3_mesh/node_value_d3_mesh.gml index 54a0f9551..e02bce2a3 100644 --- a/scripts/node_value_d3_mesh/node_value_d3_mesh.gml +++ b/scripts/node_value_d3_mesh/node_value_d3_mesh.gml @@ -1,6 +1,6 @@ function nodeValue_D3Mesh(_name, _node, _value, _tooltip = "") { return new NodeValue_D3Mesh(_name, _node, _value, _tooltip); } -function NodeValue_D3Mesh(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.d3Material, _value, _tooltip) constructor { +function NodeValue_D3Mesh(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.d3Mesh, _value, _tooltip) constructor { animable = false; diff --git a/scripts/node_value_enum_button/node_value_enum_button.gml b/scripts/node_value_enum_button/node_value_enum_button.gml index 37300ab85..2d5446d2e 100644 --- a/scripts/node_value_enum_button/node_value_enum_button.gml +++ b/scripts/node_value_enum_button/node_value_enum_button.gml @@ -1,6 +1,6 @@ function nodeValue_Enum_Button(_name, _node, _value, _data) { return new NodeValue_Enum_Button(_name, _node, _value, _data); } -function NodeValue_Enum_Button(_name, _node, _value, _data) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.integer, _value) constructor { +function NodeValue_Enum_Button(_name, _node, _value, _data) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.integer, _value, "") constructor { setDisplay(VALUE_DISPLAY.enum_button, _data); /////============== GET ============= diff --git a/scripts/node_value_enum_scroll/node_value_enum_scroll.gml b/scripts/node_value_enum_scroll/node_value_enum_scroll.gml index 7003ebcf1..fde758815 100644 --- a/scripts/node_value_enum_scroll/node_value_enum_scroll.gml +++ b/scripts/node_value_enum_scroll/node_value_enum_scroll.gml @@ -1,6 +1,6 @@ function nodeValue_Enum_Scroll(_name, _node, _value, _data) { return new NodeValue_Enum_Scroll(_name, _node, _value, _data); } -function NodeValue_Enum_Scroll(_name, _node, _value, _data) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.integer, _value) constructor { +function NodeValue_Enum_Scroll(_name, _node, _value, _data) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.integer, _value, "") constructor { setDisplay(VALUE_DISPLAY.enum_scroll, _data); /////============== GET ============= diff --git a/scripts/node_value_fdomain/node_value_fdomain.gml b/scripts/node_value_fdomain/node_value_fdomain.gml new file mode 100644 index 000000000..a470dbbe0 --- /dev/null +++ b/scripts/node_value_fdomain/node_value_fdomain.gml @@ -0,0 +1,5 @@ +function nodeValue_Fdomain(_name, _node, _value, _tooltip = "") { return new NodeValue_Fdomain(_name, _node, _value, _tooltip); } + +function NodeValue_Fdomain(_name, _node, _value, _tooltip = "") : __NodeValue_Object(_name, _node, VALUE_TYPE.fdomain, _value, _tooltip) constructor { + +} \ No newline at end of file diff --git a/scripts/node_value_fdomain/node_value_fdomain.yy b/scripts/node_value_fdomain/node_value_fdomain.yy new file mode 100644 index 000000000..c226e04eb --- /dev/null +++ b/scripts/node_value_fdomain/node_value_fdomain.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"", + "%Name":"node_value_fdomain", + "isCompatibility":false, + "isDnD":false, + "name":"node_value_fdomain", + "parent":{ + "name":"object", + "path":"folders/nodes/values/types/object.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/node_value_padding/node_value_padding.gml b/scripts/node_value_padding/node_value_padding.gml index 589c92e08..da20ca21c 100644 --- a/scripts/node_value_padding/node_value_padding.gml +++ b/scripts/node_value_padding/node_value_padding.gml @@ -1,5 +1,39 @@ function nodeValue_Padding(_name, _node, _value, _tooltip = "") { return new NodeValue_Padding(_name, _node, _value, _tooltip); } -function NodeValue_Padding(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor { +function NodeValue_Padding(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.float, _value, _tooltip) constructor { setDisplay(VALUE_DISPLAY.padding); + + /////============== GET ============= + + static valueProcess = function(value, nodeFrom = undefined, applyUnit = true, arrIndex = 0) { + var typeFrom = nodeFrom == undefined? VALUE_TYPE.any : nodeFrom.type; + + if(typeFrom == VALUE_TYPE.text) value = toNumber(value); + if(validator != noone) value = validator.validate(value); + + return applyUnit? unit.apply(value, arrIndex) : value; + } + + static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value + getValueRecursive(self.__curr_get_val, _time); + var val = __curr_get_val[0]; + var nod = __curr_get_val[1]; + + val = array_verify(val, 4); + return valueProcess(val, nod, applyUnit, arrIndex); + } + + static __getAnimValue = function(_time = CURRENT_FRAME) { + if(!is_anim) { + if(sep_axis) return array_create_ext(4, function(i) /*=>*/ {return animators[i].processType(animators[i].values[| 0].value)}); + return ds_list_empty(animator.values)? 0 : animator.processType(animator.values[| 0].value); + } + + if(sep_axis) { + __temp_time = _time; + return array_create_ext(4, function(i) /*=>*/ {return animators[i].getValue(__temp_time)}); + } + + return animator.getValue(_time); + } } \ No newline at end of file diff --git a/scripts/node_value_palette/node_value_palette.gml b/scripts/node_value_palette/node_value_palette.gml index 6b7232d22..c74c483f7 100644 --- a/scripts/node_value_palette/node_value_palette.gml +++ b/scripts/node_value_palette/node_value_palette.gml @@ -1,7 +1,6 @@ function nodeValue_Palette(_name, _node, _value, _tooltip = "") { return new NodeValue_Palette(_name, _node, _value, _tooltip); } -function NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.color, _value, _tooltip) constructor { - setDisplay(VALUE_DISPLAY.palette); +function NodeValue_Palette(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.color, _value, _tooltip) constructor {; /////============== GET ============= diff --git a/scripts/node_value_path_anchor/node_value_path_anchor.gml b/scripts/node_value_path_anchor/node_value_path_anchor.gml index fb4b58a51..e1703a0f3 100644 --- a/scripts/node_value_path_anchor/node_value_path_anchor.gml +++ b/scripts/node_value_path_anchor/node_value_path_anchor.gml @@ -1,5 +1,9 @@ function nodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") { return new NodeValue_Path_Anchor(_name, _node, _value, _tooltip); } - function NodeValue_Path_Anchor(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR.amount) constructor { setDisplay(VALUE_DISPLAY.path_anchor); +} + +function nodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") { return new NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip); } +function NodeValue_Path_Anchor_3D(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, _ANCHOR3.amount) constructor { + setDisplay(VALUE_DISPLAY.path_anchor); } \ No newline at end of file diff --git a/scripts/node_value_range/node_value_range.gml b/scripts/node_value_range/node_value_range.gml index 5adf83683..79adbaffe 100644 --- a/scripts/node_value_range/node_value_range.gml +++ b/scripts/node_value_range/node_value_range.gml @@ -1,7 +1,7 @@ -function nodeValue_Range(_name, _node, _value, _tooltip = "") { return new NodeValue_Range(_name, _node, _value, _tooltip); } +function nodeValue_Range(_name, _node, _value, _data = {}) { return new NodeValue_Range(_name, _node, _value, _data); } -function NodeValue_Range(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.float, _value, _tooltip) constructor { - setDisplay(VALUE_DISPLAY.range); +function NodeValue_Range(_name, _node, _value, _data) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.float, _value, "") constructor { + setDisplay(VALUE_DISPLAY.range, _data); /////============== GET ============= diff --git a/scripts/node_value_slider_range/node_value_slider_range.gml b/scripts/node_value_slider_range/node_value_slider_range.gml index a1c04f95a..0a6d5acab 100644 --- a/scripts/node_value_slider_range/node_value_slider_range.gml +++ b/scripts/node_value_slider_range/node_value_slider_range.gml @@ -1,6 +1,6 @@ -function nodeValue_Slider_Range(_name, _node, _value, _tooltip = "") { return new NodeValue_Slider_Range(_name, _node, _value, _tooltip); } +function nodeValue_Slider_Range(_name, _node, _value, _data = {}) { return new NodeValue_Slider_Range(_name, _node, _value, _data); } -function NodeValue_Slider_Range(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 2) constructor { - setDisplay(VALUE_DISPLAY.slider_range); +function NodeValue_Slider_Range(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 2) constructor { + setDisplay(VALUE_DISPLAY.slider_range, _data); } \ No newline at end of file diff --git a/scripts/node_value_toggle/node_value_toggle.gml b/scripts/node_value_toggle/node_value_toggle.gml new file mode 100644 index 000000000..af5ee3fef --- /dev/null +++ b/scripts/node_value_toggle/node_value_toggle.gml @@ -0,0 +1,19 @@ +function nodeValue_Toggle(_name, _node, _value, _data = {}) { return new NodeValue_Toggle(_name, _node, _value, _data); } + +function NodeValue_Toggle(_name, _node, _value, _data = {}) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.integer, _value, "") constructor { + + setDisplay(VALUE_DISPLAY.toggle, _data); + + /////============== GET ============= + + static getValue = function(_time = CURRENT_FRAME, applyUnit = true, arrIndex = 0, useCache = false, log = false) { //// Get value + getValueRecursive(self.__curr_get_val, _time); + var val = __curr_get_val[0]; + return val; + } + + static __getAnimValue = function(_time = CURRENT_FRAME) { + if(is_anim) return animator.getValue(_time); + return ds_list_empty(animator.values)? 0 : animator.values[| 0].value; + } +} \ No newline at end of file diff --git a/scripts/node_value_toggle/node_value_toggle.yy b/scripts/node_value_toggle/node_value_toggle.yy new file mode 100644 index 000000000..835c38cb1 --- /dev/null +++ b/scripts/node_value_toggle/node_value_toggle.yy @@ -0,0 +1,13 @@ +{ + "$GMScript":"", + "%Name":"node_value_toggle", + "isCompatibility":false, + "isDnD":false, + "name":"node_value_toggle", + "parent":{ + "name":"numeric", + "path":"folders/nodes/values/types/numeric.yy", + }, + "resourceType":"GMScript", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/node_value_vec2/node_value_vec2.gml b/scripts/node_value_vec2/node_value_vec2.gml index 347003e4c..718f04140 100644 --- a/scripts/node_value_vec2/node_value_vec2.gml +++ b/scripts/node_value_vec2/node_value_vec2.gml @@ -1,7 +1,7 @@ -function nodeValue_Vec2(_name, _node, _value, _tooltip = "") { return new NodeValue_Vec2(_name, _node, _value, _tooltip); } +function nodeValue_Vec2(_name, _node, _value, _data = {}) { return new NodeValue_Vec2(_name, _node, _value, _data); } -function NodeValue_Vec2(_name, _node, _value, _tooltip = "") : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.float, _value, _tooltip) constructor { - setDisplay(VALUE_DISPLAY.vector, 2); +function NodeValue_Vec2(_name, _node, _value, _data = {}) : NodeValue(_name, _node, JUNCTION_CONNECT.input, VALUE_TYPE.float, _value, "") constructor { + setDisplay(VALUE_DISPLAY.vector, _data); /////============== GET ============= diff --git a/scripts/node_value_vec2_range/node_value_vec2_range.gml b/scripts/node_value_vec2_range/node_value_vec2_range.gml index c649f70b4..6c595e974 100644 --- a/scripts/node_value_vec2_range/node_value_vec2_range.gml +++ b/scripts/node_value_vec2_range/node_value_vec2_range.gml @@ -1,6 +1,6 @@ -function nodeValue_Vec2_Range(_name, _node, _value, _tooltip = "") { return new NodeValue_Vec2_Range(_name, _node, _value, _tooltip); } +function nodeValue_Vec2_Range(_name, _node, _value, _data = {}) { return new NodeValue_Vec2_Range(_name, _node, _value, _data); } -function NodeValue_Vec2_Range(_name, _node, _value, _data, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor { +function NodeValue_Vec2_Range(_name, _node, _value, _data, _data = {}) : NodeValue_Array(_name, _node, _value, "", 4) constructor { setDisplay(VALUE_DISPLAY.vector_range, _data); } \ No newline at end of file diff --git a/scripts/node_value_vec3/node_value_vec3.gml b/scripts/node_value_vec3/node_value_vec3.gml index 3b5f43b68..f5a90db24 100644 --- a/scripts/node_value_vec3/node_value_vec3.gml +++ b/scripts/node_value_vec3/node_value_vec3.gml @@ -1,5 +1,5 @@ -function nodeValue_Vec3(_name, _node, _value, _tooltip = "") { return new NodeValue_Vec3(_name, _node, _value, _tooltip); } +function nodeValue_Vec3(_name, _node, _value, _data = {}) { return new NodeValue_Vec3(_name, _node, _value, _data); } -function NodeValue_Vec3(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 3) constructor { - setDisplay(VALUE_DISPLAY.vector, 3); +function NodeValue_Vec3(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 3) constructor { + setDisplay(VALUE_DISPLAY.vector, _data); } \ No newline at end of file diff --git a/scripts/node_value_vec4/node_value_vec4.gml b/scripts/node_value_vec4/node_value_vec4.gml index 5d68cca55..4ee3c7d07 100644 --- a/scripts/node_value_vec4/node_value_vec4.gml +++ b/scripts/node_value_vec4/node_value_vec4.gml @@ -1,5 +1,5 @@ -function nodeValue_Vec4(_name, _node, _value, _tooltip = "") { return new NodeValue_Vec4(_name, _node, _value, _tooltip); } +function nodeValue_Vec4(_name, _node, _value, _data = {}) { return new NodeValue_Vec4(_name, _node, _value, _data); } -function NodeValue_Vec4(_name, _node, _value, _tooltip = "") : NodeValue_Array(_name, _node, _value, _tooltip, 4) constructor { - setDisplay(VALUE_DISPLAY.vector, 4); +function NodeValue_Vec4(_name, _node, _value, _data = {}) : NodeValue_Array(_name, _node, _value, "", 4) constructor { + setDisplay(VALUE_DISPLAY.vector, _data); } \ No newline at end of file diff --git a/scripts/node_vector2/node_vector2.gml b/scripts/node_vector2/node_vector2.gml index 168333f2a..1e76359a6 100644 --- a/scripts/node_vector2/node_vector2.gml +++ b/scripts/node_vector2/node_vector2.gml @@ -4,17 +4,17 @@ function Node_Vector2(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c setDimension(96, 32 + 24 * 2); - inputs[| 0] = nodeValue("x", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 0] = nodeValue_Float("x", self, 0) .setVisible(true, true); - inputs[| 1] = nodeValue("y", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("y", self, 0) .setVisible(true, true); - inputs[| 2] = nodeValue("Integer", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Integer", self, false); inputs[| 3] = nodeValue_Enum_Scroll("Display", self, 0, [ "Number", "Coordinate" ]); - outputs[| 0] = nodeValue("Vector", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0 ]) + outputs[| 0] = nodeValue_Output("Vector", self, VALUE_TYPE.float, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); drag_type = 0; diff --git a/scripts/node_vector3/node_vector3.gml b/scripts/node_vector3/node_vector3.gml index 9548932d7..61729aa7a 100644 --- a/scripts/node_vector3/node_vector3.gml +++ b/scripts/node_vector3/node_vector3.gml @@ -3,18 +3,18 @@ function Node_Vector3(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c color = COLORS.node_blend_number; setDimension(96, 32 + 24 * 3); - inputs[| 0] = nodeValue("x", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 0] = nodeValue_Float("x", self, 0) .setVisible(true, true); - inputs[| 1] = nodeValue("y", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("y", self, 0) .setVisible(true, true); - inputs[| 2] = nodeValue("z", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("z", self, 0) .setVisible(true, true); - inputs[| 3] = nodeValue("Integer", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 3] = nodeValue_Bool("Integer", self, false); - outputs[| 0] = nodeValue("Vector", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0, 0 ]) + outputs[| 0] = nodeValue_Output("Vector", self, VALUE_TYPE.float, [ 0, 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); static step = function() { diff --git a/scripts/node_vector4/node_vector4.gml b/scripts/node_vector4/node_vector4.gml index a4ee6105d..77c802765 100644 --- a/scripts/node_vector4/node_vector4.gml +++ b/scripts/node_vector4/node_vector4.gml @@ -3,21 +3,21 @@ function Node_Vector4(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) c color = COLORS.node_blend_number; setDimension(96, 32 + 24 * 4); - inputs[| 0] = nodeValue("x", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 0] = nodeValue_Float("x", self, 0) .setVisible(true, true); - inputs[| 1] = nodeValue("y", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 1] = nodeValue_Float("y", self, 0) .setVisible(true, true); - inputs[| 2] = nodeValue("z", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 2] = nodeValue_Float("z", self, 0) .setVisible(true, true); - inputs[| 3] = nodeValue("w", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 3] = nodeValue_Float("w", self, 0) .setVisible(true, true); - inputs[| 4] = nodeValue("Integer", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 4] = nodeValue_Bool("Integer", self, false); - outputs[| 0] = nodeValue("Vector", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0, 0, 0 ]) + outputs[| 0] = nodeValue_Output("Vector", self, VALUE_TYPE.float, [ 0, 0, 0, 0 ]) .setDisplay(VALUE_DISPLAY.vector); static step = function() { diff --git a/scripts/node_vector_cross_2D/node_vector_cross_2D.gml b/scripts/node_vector_cross_2D/node_vector_cross_2D.gml index e7c68c84e..b22c3212d 100644 --- a/scripts/node_vector_cross_2D/node_vector_cross_2D.gml +++ b/scripts/node_vector_cross_2D/node_vector_cross_2D.gml @@ -4,15 +4,13 @@ function Node_Vector_Cross_2D(_x, _y, _group = noone) : Node_Processor(_x, _y, _ setDimension(96, 48); - inputs[| 0] = nodeValue("Point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Point 1", self, [ 0, 0 ]) .setVisible(true, true); - inputs[| 1] = nodeValue("Point 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Point 2", self, [ 0, 0 ]) .setVisible(true, true); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.float, 0 ); static processData = function(_output, _data, _output_index, _array_index = 0) { var vec1 = _data[0]; diff --git a/scripts/node_vector_cross_3D/node_vector_cross_3D.gml b/scripts/node_vector_cross_3D/node_vector_cross_3D.gml index f9ac68c06..bda68dac8 100644 --- a/scripts/node_vector_cross_3D/node_vector_cross_3D.gml +++ b/scripts/node_vector_cross_3D/node_vector_cross_3D.gml @@ -4,15 +4,13 @@ function Node_Vector_Cross_3D(_x, _y, _group = noone) : Node_Processor(_x, _y, _ setDimension(96, 48); - inputs[| 0] = nodeValue("Point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Point 1", self, [ 0, 0, 0 ]) .setVisible(true, true); - inputs[| 1] = nodeValue("Point 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Point 2", self, [ 0, 0, 0 ]) .setVisible(true, true); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, [ 0, 0, 0 ] ) + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.float, [ 0, 0, 0 ] ) .setDisplay(VALUE_DISPLAY.vector); static processData = function(_output, _data, _output_index, _array_index = 0) { diff --git a/scripts/node_vector_dot/node_vector_dot.gml b/scripts/node_vector_dot/node_vector_dot.gml index fadb3e386..eceb66054 100644 --- a/scripts/node_vector_dot/node_vector_dot.gml +++ b/scripts/node_vector_dot/node_vector_dot.gml @@ -3,15 +3,13 @@ function Node_Vector_Dot(_x, _y, _group = noone) : Node_Processor(_x, _y, _group color = COLORS.node_blend_number; setDimension(96, 48); - inputs[| 0] = nodeValue("Point 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Point 1", self, [ 0, 0 ]) .setVisible(true, true); - inputs[| 1] = nodeValue("Point 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Point 2", self, [ 0, 0 ]) .setVisible(true, true); - outputs[| 0] = nodeValue("Result", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0 ); + outputs[| 0] = nodeValue_Output("Result", self, VALUE_TYPE.float, 0 ); static processData = function(_output, _data, _output_index, _array_index = 0) { var _pnt1 = _data[0]; diff --git a/scripts/node_vector_split/node_vector_split.gml b/scripts/node_vector_split/node_vector_split.gml index e4308cfea..bc95af4e2 100644 --- a/scripts/node_vector_split/node_vector_split.gml +++ b/scripts/node_vector_split/node_vector_split.gml @@ -7,15 +7,14 @@ function Node_Vector_Split(_x, _y, _group = noone) : Node_Processor(_x, _y, _gro draw_padding = 4; - inputs[| 0] = nodeValue("Vector", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 0] = nodeValue_Vector("Vector", self, [ 0, 0, 0, 0 ]) .setArrayDynamic() .setVisible(true, true); - outputs[| 0] = nodeValue("x", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); - outputs[| 1] = nodeValue("y", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); - outputs[| 2] = nodeValue("z", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); - outputs[| 3] = nodeValue("w", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0); + outputs[| 0] = nodeValue_Output("x", self, VALUE_TYPE.float, 0); + outputs[| 1] = nodeValue_Output("y", self, VALUE_TYPE.float, 0); + outputs[| 2] = nodeValue_Output("z", self, VALUE_TYPE.float, 0); + outputs[| 3] = nodeValue_Output("w", self, VALUE_TYPE.float, 0); static step = function() { if(inputs[| 0].value_from == noone) return; diff --git a/scripts/node_vignette/node_vignette.gml b/scripts/node_vignette/node_vignette.gml index fbe829206..1744c0f92 100644 --- a/scripts/node_vignette/node_vignette.gml +++ b/scripts/node_vignette/node_vignette.gml @@ -3,21 +3,21 @@ function Node_Vignette(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; - inputs[| 2] = nodeValue("Exposure", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 15); + inputs[| 2] = nodeValue_Float("Exposure", self, 15); - inputs[| 3] = nodeValue("Strength", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1) + inputs[| 3] = nodeValue_Float("Strength", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }); - inputs[| 4] = nodeValue("Exponent", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0.25) + inputs[| 4] = nodeValue_Float("Exponent", self, 0.25) .setDisplay(VALUE_DISPLAY.slider); - inputs[| 5] = nodeValue("Roundness", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 5] = nodeValue_Float("Roundness", self, 0) .setDisplay(VALUE_DISPLAY.slider); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", false], 0, diff --git a/scripts/node_voronoi_extra/node_voronoi_extra.gml b/scripts/node_voronoi_extra/node_voronoi_extra.gml index 0a89f3364..e811e4776 100644 --- a/scripts/node_voronoi_extra/node_voronoi_extra.gml +++ b/scripts/node_voronoi_extra/node_voronoi_extra.gml @@ -2,26 +2,24 @@ function Node_Voronoi_Extra(_x, _y, _group = noone) : Node_Shader_Generator(_x, name = "Extra Voronoi"; shader = sh_voronoi_extra; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 4 ]); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 4] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 4] = nodeValue_Float("Progress", self, 0) addShaderProp(SHADER_UNIFORM.float, "progress"); inputs[| 5] = nodeValue_Enum_Scroll("Mode", self, 0, [ "Block", "Triangle" ]); addShaderProp(SHADER_UNIFORM.integer, "mode"); - inputs[| 6] = nodeValue("Parameter A", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 6] = nodeValue_Float("Parameter A", self, 0) .setDisplay(VALUE_DISPLAY.slider, { range: [ -1, 1, 0.01 ] }); addShaderProp(SHADER_UNIFORM.float, "paramA"); diff --git a/scripts/node_warp/node_warp.gml b/scripts/node_warp/node_warp.gml index a3d4bcf04..d9c6ba156 100644 --- a/scripts/node_warp/node_warp.gml +++ b/scripts/node_warp/node_warp.gml @@ -3,30 +3,26 @@ function Node_Warp(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) cons inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Top left", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Top left", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 2] = nodeValue("Top right", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Top right", self, [ DEF_SURF_W, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 3] = nodeValue("Bottom left", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, DEF_SURF_H ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Bottom left", self, [ 0, DEF_SURF_H ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 4] = nodeValue("Bottom right", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_SURF ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Bottom right", self, DEF_SURF ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 5] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 5] = nodeValue_Bool("Active", self, true); active_index = 5; - inputs[| 6] = nodeValue("Use custom dimension", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 6] = nodeValue_Bool("Use custom dimension", self, false); inputs[| 7] = nodeValue_Dimension(self); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 5, ["Surfaces", false], 0, 6, 7, diff --git a/scripts/node_wav_file_read/node_wav_file_read.gml b/scripts/node_wav_file_read/node_wav_file_read.gml index e557d8298..c62fbb6cf 100644 --- a/scripts/node_wav_file_read/node_wav_file_read.gml +++ b/scripts/node_wav_file_read/node_wav_file_read.gml @@ -27,30 +27,30 @@ function Node_WAV_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const name = "WAV File In"; color = COLORS.node_blend_input; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "audio|*.wav" }) .rejectArray(); - inputs[| 1] = nodeValue("Sync length", self, JUNCTION_CONNECT.input, VALUE_TYPE.trigger, false ) + inputs[| 1] = nodeValue_Trigger("Sync length", self, false ) .setDisplay(VALUE_DISPLAY.button, { name: "Sync", UI : true, onClick: function() { if(content == noone) return; TOTAL_FRAMES = max(1, ceil(content.duration * PROJECT.animator.framerate)); } }); - inputs[| 2] = nodeValue("Mono", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false); + inputs[| 2] = nodeValue_Bool("Mono", self, false); - outputs[| 0] = nodeValue("Data", self, JUNCTION_CONNECT.output, VALUE_TYPE.audioBit, noone) + outputs[| 0] = nodeValue_Output("Data", self, VALUE_TYPE.audioBit, noone) .setArrayDepth(1); - outputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, ""); + outputs[| 1] = nodeValue_Output("Path", self, VALUE_TYPE.path, ""); - outputs[| 2] = nodeValue("Sample rate", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 44100) + outputs[| 2] = nodeValue_Output("Sample rate", self, VALUE_TYPE.integer, 44100) .setVisible(false); - outputs[| 3] = nodeValue("Channels", self, JUNCTION_CONNECT.output, VALUE_TYPE.integer, 2) + outputs[| 3] = nodeValue_Output("Channels", self, VALUE_TYPE.integer, 2) .setVisible(false); - outputs[| 4] = nodeValue("Duration (s)", self, JUNCTION_CONNECT.output, VALUE_TYPE.float, 0) + outputs[| 4] = nodeValue_Output("Duration (s)", self, VALUE_TYPE.float, 0) .setVisible(false); content = noone; diff --git a/scripts/node_wav_file_write/node_wav_file_write.gml b/scripts/node_wav_file_write/node_wav_file_write.gml index b235ee8bc..87a087805 100644 --- a/scripts/node_wav_file_write/node_wav_file_write.gml +++ b/scripts/node_wav_file_write/node_wav_file_write.gml @@ -3,23 +3,22 @@ function Node_WAV_File_Write(_x, _y, _group = noone) : Node(_x, _y, _group) cons color = COLORS.node_blend_input; setDimension(, 72); - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_save, { filter: "audio file|*.wav" }) .rejectArray() .setVisible(true); - inputs[| 1] = nodeValue("Audio Data", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [[]]) + inputs[| 1] = nodeValue_Float("Audio Data", self, [[]]) .setArrayDepth(1) .setVisible(true, true); - inputs[| 2] = nodeValue("Sample", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 44100); + inputs[| 2] = nodeValue_Int("Sample", self, 44100); inputs[| 3] = nodeValue_Enum_Scroll("Bit Depth", self, 0, [ "8 bit positive", "16 bit integer" ]); - inputs[| 4] = nodeValue("Remap Data", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) + inputs[| 4] = nodeValue_Bool("Remap Data", self, false) - inputs[| 5] = nodeValue("Data Range", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 1 ]) - .setDisplay(VALUE_DISPLAY.vector); + inputs[| 5] = nodeValue_Vector("Data Range", self, [ 0, 1 ]); input_display_list = [ [ "Data", false], 1, 0, 4, 5, diff --git a/scripts/node_wavelet_noise/node_wavelet_noise.gml b/scripts/node_wavelet_noise/node_wavelet_noise.gml index 048528edd..c100236ff 100644 --- a/scripts/node_wavelet_noise/node_wavelet_noise.gml +++ b/scripts/node_wavelet_noise/node_wavelet_noise.gml @@ -2,25 +2,23 @@ function Node_Wavelet_Noise(_x, _y, _group = noone) : Node_Shader_Generator(_x, name = "Wavelet Noise"; shader = sh_noise_wavelet; - inputs[| 1] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 1] = nodeValue_Vector("Position", self, [ 0, 0 ]) .setUnitRef(function(index) { return getDimension(index); }); addShaderProp(SHADER_UNIFORM.float, "position"); - inputs[| 2] = nodeValue("Scale", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 4, 4 ]) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Scale", self, [ 4, 4 ]) .setMappable(6); addShaderProp(SHADER_UNIFORM.float, "scale"); - inputs[| 3] = nodeValue("Seed", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, seed_random(6)) + inputs[| 3] = nodeValue_Float("Seed", self, seed_random(6)) .setDisplay(VALUE_DISPLAY._default, { side_button : button(function() { randomize(); inputs[| 3].setValue(seed_random(6)); }).setIcon(THEME.icon_random, 0, COLORS._main_icon) }); addShaderProp(SHADER_UNIFORM.float, "seed"); - inputs[| 4] = nodeValue("Progress", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) + inputs[| 4] = nodeValue_Float("Progress", self, 0) .setMappable(7) addShaderProp(SHADER_UNIFORM.float, "progress"); - inputs[| 5] = nodeValue("Detail", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 1.24) + inputs[| 5] = nodeValue_Float("Detail", self, 1.24) .setDisplay(VALUE_DISPLAY.slider, { range: [ 0, 2, 0.01 ] }) .setMappable(8); addShaderProp(SHADER_UNIFORM.float, "detail"); diff --git a/scripts/node_websocket_receiver/node_websocket_receiver.gml b/scripts/node_websocket_receiver/node_websocket_receiver.gml index 19fa90b79..d73abc1ae 100644 --- a/scripts/node_websocket_receiver/node_websocket_receiver.gml +++ b/scripts/node_websocket_receiver/node_websocket_receiver.gml @@ -1,17 +1,17 @@ function Node_Websocket_Receiver(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Websocket Receiver"; - inputs[| 0] = nodeValue("Port", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 22400); + inputs[| 0] = nodeValue_Int("Port", self, 22400); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); inputs[| 2] = nodeValue_Enum_Button("Mode", self, 1, [ "Client", "Server" ]); - inputs[| 3] = nodeValue("Url", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, ""); + inputs[| 3] = nodeValue_Text("Url", self, ""); - outputs[| 0] = nodeValue("Data", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); + outputs[| 0] = nodeValue_Output("Data", self, VALUE_TYPE.struct, {}); - outputs[| 1] = nodeValue("Receive data", self, JUNCTION_CONNECT.output, VALUE_TYPE.trigger, false); + outputs[| 1] = nodeValue_Output("Receive data", self, VALUE_TYPE.trigger, false); input_display_list = [ 1, 2, ["Connection", false], 0, 3, diff --git a/scripts/node_websocket_sender/node_websocket_sender.gml b/scripts/node_websocket_sender/node_websocket_sender.gml index 0f5973319..79d00b1a3 100644 --- a/scripts/node_websocket_sender/node_websocket_sender.gml +++ b/scripts/node_websocket_sender/node_websocket_sender.gml @@ -1,21 +1,21 @@ function Node_Websocket_Sender(_x, _y, _group = noone) : Node(_x, _y, _group) constructor { name = "Websocket Sender"; - inputs[| 0] = nodeValue("Port", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 22800); + inputs[| 0] = nodeValue_Int("Port", self, 22800); inputs[| 1] = nodeValue_Enum_Scroll("Data type", self, 0, [ "Struct", "Surface", "File", "Buffer" ]); - inputs[| 2] = nodeValue("Struct", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, {}); + inputs[| 2] = nodeValue_Struct("Struct", self, {}); inputs[| 3] = nodeValue_Surface("Surface", self); - inputs[| 4] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 4] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load) .nonValidate(); - inputs[| 5] = nodeValue("Target", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "127.0.0.1"); + inputs[| 5] = nodeValue_Text("Target", self, "127.0.0.1"); - inputs[| 6] = nodeValue("Buffer", self, JUNCTION_CONNECT.input, VALUE_TYPE.buffer, noone); + inputs[| 6] = nodeValue_Buffer("Buffer", self, noone); input_display_list = [ 5, 0, 1, 2, 3, 4, 6 ]; diff --git a/scripts/node_widget_test/node_widget_test.gml b/scripts/node_widget_test/node_widget_test.gml index 51b8edc9c..3c94306c9 100644 --- a/scripts/node_widget_test/node_widget_test.gml +++ b/scripts/node_widget_test/node_widget_test.gml @@ -9,7 +9,7 @@ function Node_Widget_Test(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 3] = nodeValue("vectorRangeBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0, 0, 0]) .setDisplay(VALUE_DISPLAY.vector_range) inputs[| 4] = nodeValue("rotator", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) .setDisplay(VALUE_DISPLAY.rotation) inputs[| 5] = nodeValue("rotatorRange", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0]) .setDisplay(VALUE_DISPLAY.rotation_range) - inputs[| 6] = nodeValue("rotatorRandom", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [0, 0, 0, 0, 0]) .setDisplay(VALUE_DISPLAY.rotation_random) + inputs[| 6] = nodeValue_Float("rotatorRandom", self, [0, 0, 0, 0, 0]) .setDisplay(VALUE_DISPLAY.rotation_random) inputs[| 7] = nodeValue("slider", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, 0) .setDisplay(VALUE_DISPLAY.slider) inputs[| 8] = nodeValue("sliderRange", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ]) .setDisplay(VALUE_DISPLAY.slider_range) inputs[| 9] = nodeValue("areaBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA) .setDisplay(VALUE_DISPLAY.area) @@ -23,11 +23,11 @@ function Node_Widget_Test(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 17] = nodeValue("transformBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 0, 0 ]) .setDisplay(VALUE_DISPLAY.transform) inputs[| 18] = nodeValue("quarternionBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0, 0, 0 ]) .setDisplay(VALUE_DISPLAY.d3quarternion) - inputs[| 19] = nodeValue("checkBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, false) .setDisplay(VALUE_DISPLAY._default) + inputs[| 19] = nodeValue_Bool("checkBox", self, false) .setDisplay(VALUE_DISPLAY._default) - inputs[| 20] = nodeValue("buttonColor", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, 0) .setDisplay(VALUE_DISPLAY._default) - inputs[| 21] = nodeValue("buttonPalette", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, array_clone(DEF_PALETTE)) .setDisplay(VALUE_DISPLAY.palette) - inputs[| 22] = nodeValue("buttonGradient", self, JUNCTION_CONNECT.input, VALUE_TYPE.gradient, new gradientObject(cola(c_white))) .setDisplay(VALUE_DISPLAY._default) + inputs[| 20] = nodeValue_Color("buttonColor", self, 0) .setDisplay(VALUE_DISPLAY._default) + inputs[| 21] = nodeValue_Palette("buttonPalette", self, array_clone(DEF_PALETTE)) .setDisplay(VALUE_DISPLAY.palette) + inputs[| 22] = nodeValue_Gradient("buttonGradient", self, new gradientObject(cola(c_white))) .setDisplay(VALUE_DISPLAY._default) inputs[| 23] = nodeValue("pathArrayBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, []) .setDisplay(VALUE_DISPLAY.path_array, { filter: [ "image|*.png;*.jpg", "" ] }) inputs[| 24] = nodeValue("pathLoad", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") .setDisplay(VALUE_DISPLAY.path_load) @@ -36,11 +36,11 @@ function Node_Widget_Test(_x, _y, _group = noone) : Node(_x, _y, _group) constru inputs[| 27] = nodeValue("curveBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.curve, CURVE_DEF_11) .setDisplay(VALUE_DISPLAY._default) - inputs[| 28] = nodeValue("textArea", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setDisplay(VALUE_DISPLAY._default) - inputs[| 29] = nodeValue("textBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setDisplay(VALUE_DISPLAY.text_box) - inputs[| 30] = nodeValue("textArea", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setDisplay(VALUE_DISPLAY.codeLUA) - inputs[| 31] = nodeValue("textArea", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, "") .setDisplay(VALUE_DISPLAY.codeHLSL) - inputs[| 32] = nodeValue("textArrayBox", self, JUNCTION_CONNECT.input, VALUE_TYPE.text, []) .setDisplay(VALUE_DISPLAY.text_array, { data: [ "Choice 1", "Choice 2" ] }) + inputs[| 28] = nodeValue_Text("textArea", self, "") .setDisplay(VALUE_DISPLAY._default) + inputs[| 29] = nodeValue_Text("textBox", self, "") .setDisplay(VALUE_DISPLAY.text_box) + inputs[| 30] = nodeValue_Text("textArea", self, "") .setDisplay(VALUE_DISPLAY.codeLUA) + inputs[| 31] = nodeValue_Text("textArea", self, "") .setDisplay(VALUE_DISPLAY.codeHLSL) + inputs[| 32] = nodeValue_Text("textArrayBox", self, []) .setDisplay(VALUE_DISPLAY.text_array, { data: [ "Choice 1", "Choice 2" ] }) inputs[| 33] = nodeValue_Surface("surfaceBox", self) .setDisplay(VALUE_DISPLAY._default) diff --git a/scripts/node_wrap_area/node_wrap_area.gml b/scripts/node_wrap_area/node_wrap_area.gml index 75c5b4e54..ec9bbe884 100644 --- a/scripts/node_wrap_area/node_wrap_area.gml +++ b/scripts/node_wrap_area/node_wrap_area.gml @@ -4,14 +4,13 @@ function Node_Wrap_Area(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) inputs[| 0] = nodeValue_Surface("Surface in", self); onSurfaceSize = function() { return surface_get_dimension(getInputData(0)); }; - inputs[| 1] = nodeValue("Area", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_AREA_REF ) - .setUnitRef(onSurfaceSize, VALUE_UNIT.reference) - .setDisplay(VALUE_DISPLAY.area, { onSurfaceSize, useShape : false }); + inputs[| 1] = nodeValue_Area("Area", self, DEF_AREA_REF, { onSurfaceSize, useShape : false }) + .setUnitRef(onSurfaceSize, VALUE_UNIT.reference); - inputs[| 2] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 2] = nodeValue_Bool("Active", self, true); active_index = 2; - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 2, ["Surfaces", false], 0, diff --git a/scripts/node_wrap_perspective/node_wrap_perspective.gml b/scripts/node_wrap_perspective/node_wrap_perspective.gml index e03c04d36..a42df483c 100644 --- a/scripts/node_wrap_perspective/node_wrap_perspective.gml +++ b/scripts/node_wrap_perspective/node_wrap_perspective.gml @@ -3,42 +3,34 @@ function Node_Warp_Perspective(_x, _y, _group = noone) : Node_Processor(_x, _y, inputs[| 0] = nodeValue_Surface("Surface in", self); - inputs[| 1] = nodeValue("Active", self, JUNCTION_CONNECT.input, VALUE_TYPE.boolean, true); + inputs[| 1] = nodeValue_Bool("Active", self, true); active_index = 1; - inputs[| 2] = nodeValue("Top left", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Top left", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 3] = nodeValue("Top right", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 3] = nodeValue_Vector("Top right", self, [ DEF_SURF_W, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 4] = nodeValue("Bottom left", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, DEF_SURF_H ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 4] = nodeValue_Vector("Bottom left", self, [ 0, DEF_SURF_H ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 5] = nodeValue("Bottom right", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_SURF ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 5] = nodeValue_Vector("Bottom right", self, DEF_SURF ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 6] = nodeValue("Top left", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 6] = nodeValue_Vector("Top left", self, [ 0, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 7] = nodeValue("Top right", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ DEF_SURF_W, 0 ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 7] = nodeValue_Vector("Top right", self, [ DEF_SURF_W, 0 ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 8] = nodeValue("Bottom left", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, [ 0, DEF_SURF_H ] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 8] = nodeValue_Vector("Bottom left", self, [ 0, DEF_SURF_H ] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 9] = nodeValue("Bottom right", self, JUNCTION_CONNECT.input, VALUE_TYPE.float, DEF_SURF ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 9] = nodeValue_Vector("Bottom right", self, DEF_SURF ) .setUnitRef(function(index) { return getDimension(index); }); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ 1, ["Surfaces", false], 0, diff --git a/scripts/node_xml_file_read/node_xml_file_read.gml b/scripts/node_xml_file_read/node_xml_file_read.gml index 1017da91e..3ff5e8e5c 100644 --- a/scripts/node_xml_file_read/node_xml_file_read.gml +++ b/scripts/node_xml_file_read/node_xml_file_read.gml @@ -29,13 +29,13 @@ function Node_XML_File_Read(_x, _y, _group = noone) : Node(_x, _y, _group) const w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_load, { filter: "XML file|*.xml" }) .rejectArray(); - outputs[| 0] = nodeValue("Content", self, JUNCTION_CONNECT.output, VALUE_TYPE.struct, {}); + outputs[| 0] = nodeValue_Output("Content", self, VALUE_TYPE.struct, {}); - outputs[| 1] = nodeValue("Path", self, JUNCTION_CONNECT.output, VALUE_TYPE.path, "") + outputs[| 1] = nodeValue_Output("Path", self, VALUE_TYPE.path, "") .setVisible(true, true); content = {}; diff --git a/scripts/node_xml_file_write/node_xml_file_write.gml b/scripts/node_xml_file_write/node_xml_file_write.gml index 25ff761b7..2936eaefa 100644 --- a/scripts/node_xml_file_write/node_xml_file_write.gml +++ b/scripts/node_xml_file_write/node_xml_file_write.gml @@ -4,11 +4,11 @@ function Node_XML_File_Write(_x, _y, _group = noone) : Node(_x, _y, _group) cons w = 128; - inputs[| 0] = nodeValue("Path", self, JUNCTION_CONNECT.input, VALUE_TYPE.path, "") + inputs[| 0] = nodeValue_Text("Path", self, "") .setDisplay(VALUE_DISPLAY.path_save, { filter: "xml file|*.xml" }) .rejectArray(); - inputs[| 1] = nodeValue("Struct", self, JUNCTION_CONNECT.input, VALUE_TYPE.struct, {}) + inputs[| 1] = nodeValue_Struct("Struct", self, {}) .setVisible(true, true); input_display_list = [ 0, 1 ] diff --git a/scripts/node_zigzag/node_zigzag.gml b/scripts/node_zigzag/node_zigzag.gml index c1630f483..9390e8370 100644 --- a/scripts/node_zigzag/node_zigzag.gml +++ b/scripts/node_zigzag/node_zigzag.gml @@ -3,17 +3,16 @@ function Node_Zigzag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 0] = nodeValue_Dimension(self); - inputs[| 1] = nodeValue("Amount", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, 1) + inputs[| 1] = nodeValue_Int("Amount", self, 1) .setDisplay(VALUE_DISPLAY.slider, { range: [1, 16, 0.1] }) .setMappable(6); - inputs[| 2] = nodeValue("Position", self, JUNCTION_CONNECT.input, VALUE_TYPE.integer, [0, 0] ) - .setDisplay(VALUE_DISPLAY.vector) + inputs[| 2] = nodeValue_Vector("Position", self, [0, 0] ) .setUnitRef(function(index) { return getDimension(index); }); - inputs[| 3] = nodeValue("Color 1", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_white); + inputs[| 3] = nodeValue_Color("Color 1", self, c_white); - inputs[| 4] = nodeValue("Color 2", self, JUNCTION_CONNECT.input, VALUE_TYPE.color, c_black); + inputs[| 4] = nodeValue_Color("Color 2", self, c_black); inputs[| 5] = nodeValue_Enum_Button("Type", self, 0, [ "Solid", "Smooth", "AA" ]); @@ -28,7 +27,7 @@ function Node_Zigzag(_x, _y, _group = noone) : Node_Processor(_x, _y, _group) co inputs[| 8] = nodeValue_Rotation("Angle", self, 0) .setMappable(7); - outputs[| 0] = nodeValue("Surface out", self, JUNCTION_CONNECT.output, VALUE_TYPE.surface, noone); + outputs[| 0] = nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone); input_display_list = [ ["Output", false], 0,