mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2024-12-25 06:26:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

- Fix node deletion not merge all connections.

Browse source
This commit is contained in:
Tanasart 2024-07-23 15:51:13 +07:00
parent 20c89a5d3d
commit 2e314c343f
17 changed files with 31 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/globals/globals.gml
View file

@ -38,7 +38,7 @@
LATEST_VERSION = 11700; LATEST_VERSION = 11700;
VERSION = 11770; VERSION = 11770;
SAVE_VERSION = 11700; SAVE_VERSION = 11700;
VERSION_STRING = "1.17.8.006"; VERSION_STRING = "1.17.8";
BUILD_NUMBER = 11770; BUILD_NUMBER = 11770;
globalvar HOTKEYS, HOTKEY_CONTEXT; globalvar HOTKEYS, HOTKEY_CONTEXT;

25
scripts/node_data/node_data.gml
View file

@ -2359,22 +2359,27 @@ function Node(_x, _y, _group = noone) : __Node_Base(_x, _y) constructor {
PANEL_PREVIEW.removeNodePreview(self); PANEL_PREVIEW.removeNodePreview(self);
var val_from_map = {};
for( var i = 0; i < ds_list_size(inputs); i++ ) {
var _i = inputs[| i];
if(_i.value_from == noone) continue;
val_from_map[$ _i.type] = _i.value_from;
}
for(var i = 0; i < ds_list_size(outputs); i++) { for(var i = 0; i < ds_list_size(outputs); i++) {
var jun = outputs[| i]; var jun = outputs[| i];
for(var j = 0; j < array_length(jun.value_to); j++) { for(var j = array_length(jun.value_to) - 1; j >= 0; j--) {
var _vt = jun.value_to[j]; var _vt = jun.value_to[j];
if(_vt.value_from == noone) break;
if(_vt.value_from.node != self) break;
if(_merge) { if(_vt.value_from == noone || _vt.value_from.node != self)
for( var k = 0; k < ds_list_size(inputs); k++ ) { continue;
if(inputs[| k].value_from == noone) continue;
if(_vt.setFrom(inputs[| k].value_from)) break; if(_merge && struct_has(val_from_map, _vt.type))
} _vt.setFrom(val_from_map[$ _vt.type]);
} else { else
_vt.removeFrom(false); _vt.removeFrom(false);
}
} }
jun.value_to = []; jun.value_to = [];

2
scripts/shader_functions/shader_functions.gml
View file

@ -158,7 +158,7 @@ function shader_set_color(uniform, col, alpha = 1) {
shader_set_f(uniform, colToVec4(col, alpha)); shader_set_f(uniform, colToVec4(col, alpha));
} }
function shader_set_palette(pal, pal_uni = "palette", amo_uni = "paletteAmount", max_length = 128) { function shader_set_palette(pal, pal_uni = "palette", amo_uni = "paletteAmount", max_length = 1024) {
INLINE INLINE
shader_set_i(amo_uni, min(max_length, array_length(pal))); shader_set_i(amo_uni, min(max_length, array_length(pal)));

2
scripts/shader_functions/shader_functions.yy
View file

@ -1,5 +1,5 @@
{ {
"$GMScript":"v1", "$GMScript":"",
"%Name":"shader_functions", "%Name":"shader_functions",
"isCompatibility":false, "isCompatibility":false,
"isDnD":false, "isDnD":false,

2
shaders/sh_blink_extract/sh_blink_extract.fsh
View file

@ -5,7 +5,7 @@ uniform float tolerance;
uniform int useMask; uniform int useMask;
uniform sampler2D mask; uniform sampler2D mask;
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
uniform vec4 colorTarget[PALETTE_LIMIT]; uniform vec4 colorTarget[PALETTE_LIMIT];
uniform int colorTargetAmount; uniform int colorTargetAmount;

2
shaders/sh_blink_replace/sh_blink_replace.fsh
View file

@ -4,7 +4,7 @@ varying vec4 v_vColour;
uniform float seed; uniform float seed;
uniform float ratio; uniform float ratio;
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
uniform int usePalette; uniform int usePalette;
uniform vec4 palette[PALETTE_LIMIT]; uniform vec4 palette[PALETTE_LIMIT];

2
shaders/sh_color_picker_hue/sh_color_picker_hue.fsh
View file

@ -5,7 +5,7 @@ varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;
uniform float hue; uniform float hue;
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
uniform int usePalette; uniform int usePalette;
uniform vec4 palette[PALETTE_LIMIT]; uniform vec4 palette[PALETTE_LIMIT];

2
shaders/sh_color_picker_side_hue/sh_color_picker_side_hue.fsh
View file

@ -4,7 +4,7 @@
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
uniform float sat; uniform float sat;
uniform float value; uniform float value;

2
shaders/sh_color_picker_side_value/sh_color_picker_side_value.fsh
View file

@ -4,7 +4,7 @@
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
uniform float hue; uniform float hue;
uniform float sat; uniform float sat;

2
shaders/sh_color_picker_value/sh_color_picker_value.fsh
View file

@ -4,7 +4,7 @@
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
uniform float value; uniform float value;

2
shaders/sh_color_select_content/sh_color_select_content.fsh
View file

@ -1,4 +1,4 @@
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;

2
shaders/sh_color_select_side/sh_color_select_side.fsh
View file

@ -1,4 +1,4 @@
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;

2
shaders/sh_dither/sh_dither.fsh
View file

@ -15,7 +15,7 @@ uniform int useConMap;
uniform float ditherSize; uniform float ditherSize;
uniform float dither[64]; uniform float dither[64];
uniform vec2 dimension; uniform vec2 dimension;
uniform vec4 palette[32]; uniform vec4 palette[1024];
uniform int keys; uniform int keys;
uniform float seed; uniform float seed;

2
shaders/sh_palette_mixer_atlas_expand_palette/sh_palette_mixer_atlas_expand_palette.fsh
View file

@ -1,4 +1,4 @@
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;

2
shaders/sh_pixel_sample/sh_pixel_sample.fsh
View file

@ -1,4 +1,4 @@
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;

2
shaders/sh_posterize_palette/sh_posterize_palette.fsh
View file

@ -1,7 +1,7 @@
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
uniform vec4 palette[PALETTE_LIMIT]; uniform vec4 palette[PALETTE_LIMIT];
uniform int keys; uniform int keys;

2
shaders/sh_stripe/sh_stripe.fsh
View file

@ -2,7 +2,7 @@ varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;
#define PI 3.14159265359 #define PI 3.14159265359
#define PALETTE_LIMIT 128 #define PALETTE_LIMIT 1024
uniform float seed; uniform float seed;
uniform vec2 dimension; uniform vec2 dimension;