diff --git a/PixelComposer.resource_order b/PixelComposer.resource_order index cb8a1700a..f5dd8bd17 100644 --- a/PixelComposer.resource_order +++ b/PixelComposer.resource_order @@ -48,18 +48,10 @@ {"name":"fixes","order":5,"path":"folders/nodes/data/filter/fixes.yy",}, {"name":"warps","order":6,"path":"folders/nodes/data/filter/warps.yy",}, {"name":"generator","order":17,"path":"folders/nodes/data/generator.yy",}, - {"name":"blinker","order":19,"path":"folders/shader/generator/blinker.yy",}, - {"name":"cell","order":20,"path":"folders/shader/generator/cell.yy",}, {"name":"drawer","order":11,"path":"folders/nodes/data/generator/drawer.yy",}, - {"name":"grid","order":18,"path":"folders/shader/generator/grid.yy",}, - {"name":"interpret","order":17,"path":"folders/shader/generator/interpret.yy",}, {"name":"noise","order":14,"path":"folders/nodes/data/generator/noise.yy",}, {"name":"pattern","order":15,"path":"folders/nodes/data/generator/pattern.yy",}, - {"name":"random_shape","order":21,"path":"folders/shader/generator/random_shape.yy",}, - {"name":"reaction_diffusion","order":22,"path":"folders/shader/generator/reaction_diffusion.yy",}, - {"name":"region","order":23,"path":"folders/shader/generator/region.yy",}, {"name":"regions","order":19,"path":"folders/nodes/data/generator/regions.yy",}, - {"name":"vector_mapper","order":24,"path":"folders/shader/generator/vector_mapper.yy",}, {"name":"group","order":18,"path":"folders/nodes/data/group.yy",}, {"name":"io","order":19,"path":"folders/nodes/data/io.yy",}, {"name":"network","order":22,"path":"folders/nodes/data/io/network.yy",}, @@ -143,7 +135,15 @@ {"name":"shape_seperator","order":47,"path":"folders/shader/filter/shape_seperator.yy",}, {"name":"surface_replace","order":48,"path":"folders/shader/filter/surface_replace.yy",}, {"name":"warp","order":49,"path":"folders/shader/filter/warp.yy",}, + {"name":"blinker","order":19,"path":"folders/shader/generator/blinker.yy",}, + {"name":"cell","order":20,"path":"folders/shader/generator/cell.yy",}, + {"name":"grid","order":18,"path":"folders/shader/generator/grid.yy",}, + {"name":"interpret","order":17,"path":"folders/shader/generator/interpret.yy",}, {"name":"noise","order":16,"path":"folders/shader/generator/noise.yy",}, + {"name":"random_shape","order":21,"path":"folders/shader/generator/random_shape.yy",}, + {"name":"reaction_diffusion","order":22,"path":"folders/shader/generator/reaction_diffusion.yy",}, + {"name":"region","order":23,"path":"folders/shader/generator/region.yy",}, + {"name":"vector_mapper","order":24,"path":"folders/shader/generator/vector_mapper.yy",}, {"name":"find_boundary","order":7,"path":"folders/shader/misc/find_boundary.yy",}, {"name":"Flag","order":3,"path":"folders/shader/MK effects/Flag.yy",}, {"name":"Tile","order":4,"path":"folders/shader/MK effects/Tile.yy",}, diff --git a/PixelComposer.yyp b/PixelComposer.yyp index d4c3baaa7..898d5dd38 100644 --- a/PixelComposer.yyp +++ b/PixelComposer.yyp @@ -146,18 +146,10 @@ {"$GMFolder":"","%Name":"fixes","folderPath":"folders/nodes/data/filter/fixes.yy","name":"fixes","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"warps","folderPath":"folders/nodes/data/filter/warps.yy","name":"warps","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"generator","folderPath":"folders/nodes/data/generator.yy","name":"generator","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"blinker","folderPath":"folders/shader/generator/blinker.yy","name":"blinker","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"cell","folderPath":"folders/shader/generator/cell.yy","name":"cell","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"drawer","folderPath":"folders/nodes/data/generator/drawer.yy","name":"drawer","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"grid","folderPath":"folders/shader/generator/grid.yy","name":"grid","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"interpret","folderPath":"folders/shader/generator/interpret.yy","name":"interpret","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"noise","folderPath":"folders/nodes/data/generator/noise.yy","name":"noise","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"pattern","folderPath":"folders/nodes/data/generator/pattern.yy","name":"pattern","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"random_shape","folderPath":"folders/shader/generator/random_shape.yy","name":"random_shape","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"reaction_diffusion","folderPath":"folders/shader/generator/reaction_diffusion.yy","name":"reaction_diffusion","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"region","folderPath":"folders/shader/generator/region.yy","name":"region","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"regions","folderPath":"folders/nodes/data/generator/regions.yy","name":"regions","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"vector_mapper","folderPath":"folders/shader/generator/vector_mapper.yy","name":"vector_mapper","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"group","folderPath":"folders/nodes/data/group.yy","name":"group","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"io","folderPath":"folders/nodes/data/io.yy","name":"io","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"network","folderPath":"folders/nodes/data/io/network.yy","name":"network","resourceType":"GMFolder","resourceVersion":"2.0",}, @@ -274,7 +266,15 @@ {"$GMFolder":"","%Name":"warp","folderPath":"folders/shader/filter/warp.yy","name":"warp","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"flood_fill","folderPath":"folders/shader/flood_fill.yy","name":"flood_fill","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"generator","folderPath":"folders/shader/generator.yy","name":"generator","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"blinker","folderPath":"folders/shader/generator/blinker.yy","name":"blinker","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"cell","folderPath":"folders/shader/generator/cell.yy","name":"cell","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"grid","folderPath":"folders/shader/generator/grid.yy","name":"grid","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"interpret","folderPath":"folders/shader/generator/interpret.yy","name":"interpret","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"noise","folderPath":"folders/shader/generator/noise.yy","name":"noise","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"random_shape","folderPath":"folders/shader/generator/random_shape.yy","name":"random_shape","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"reaction_diffusion","folderPath":"folders/shader/generator/reaction_diffusion.yy","name":"reaction_diffusion","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"region","folderPath":"folders/shader/generator/region.yy","name":"region","resourceType":"GMFolder","resourceVersion":"2.0",}, + {"$GMFolder":"","%Name":"vector_mapper","folderPath":"folders/shader/generator/vector_mapper.yy","name":"vector_mapper","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"mask","folderPath":"folders/shader/mask.yy","name":"mask","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"misc","folderPath":"folders/shader/misc.yy","name":"misc","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"find_boundary","folderPath":"folders/shader/misc/find_boundary.yy","name":"find_boundary","resourceType":"GMFolder","resourceVersion":"2.0",}, diff --git a/scripts/load_function/load_function.gml b/scripts/load_function/load_function.gml index bdb784652..19b3b6a54 100644 --- a/scripts/load_function/load_function.gml +++ b/scripts/load_function/load_function.gml @@ -23,7 +23,7 @@ function TEST_PATH(path) { #region function LOAD_PATH(path, readonly = false, safe_mode = false) { #region for( var i = 0, n = array_length(PROJECTS); i < n; i++ ) - if(PROJECTS[i].path == path) return; + if(PROJECTS[i].path == path) closeProject(PROJECTS[i]); var _PROJECT = PROJECT; PROJECT = new Project(); diff --git a/scripts/node_colors_replace/node_colors_replace.gml b/scripts/node_colors_replace/node_colors_replace.gml index 3bf32d278..80660a09a 100644 --- a/scripts/node_colors_replace/node_colors_replace.gml +++ b/scripts/node_colors_replace/node_colors_replace.gml @@ -28,7 +28,7 @@ function Node_Colors_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _g function setColor(colr) { #region palette_selecting = noone; - var _to = array_clone(getInputData(2)); + var _to = array_clone(getInputData(2)); for (var i = palette_select[0]; i <= palette_select[1]; i++) _to[i] = colr; @@ -115,7 +115,8 @@ function Node_Colors_Replace(_x, _y, _group = noone) : Node_Processor(_x, _y, _g var dialog = dialogCall(o_dialog_color_selector, WIN_W / 2, WIN_H / 2); dialog.selector.dropper_active = true; dialog.selector.dropper_close = true; - + + palette_select = [ i, i ]; dialog.selector.onApply = setColor; dialog.onApply = setColor; }