mirrors/Pixel-Composer
1
0
Fork 0
mirror of https://github.com/Ttanasart-pt/Pixel-Composer.git synced 2025-02-03 16:55:14 +01:00
Code Issues Projects Releases Packages Wiki Activity

[Region fill] Add random rotation property for texture mapping.

Browse source
This commit is contained in:
Tanasart 2024-12-19 14:04:30 +07:00
parent 8879bfb770
commit 04ecbe8cbb
3 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scripts/node_region_fill/node_region_fill.gml
View file

@ -25,12 +25,14 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
newInput(11, nodeValue_Bool("Color Filter", self, false)); newInput(11, nodeValue_Bool("Color Filter", self, false));
newInput(12, nodeValue_Rotation_Range("Random rotation", self, [ 0, 0 ]));
newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone)); newOutput(0, nodeValue_Output("Surface out", self, VALUE_TYPE.surface, noone));
input_display_list = [ 4, input_display_list = [ 4,
["Surfaces", false], 0, 1, ["Surfaces", false], 0, 1,
["Region Filter", false, 11], 5, 6, ["Region Filter", false, 11], 5, 6,
["Fill", false], 8, 2, 9, 10, ["Fill", false], 8, 2, 9, 10, 12,
["Render", false], 7, ["Render", false], 7,
]; ];
@ -43,6 +45,7 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
inputs[ 2].setVisible(_filt == 0); inputs[ 2].setVisible(_filt == 0);
inputs[ 9].setVisible(_filt == 1, _filt == 1); inputs[ 9].setVisible(_filt == 1, _filt == 1);
inputs[10].setVisible(_filt == 2, _filt == 2); inputs[10].setVisible(_filt == 2, _filt == 2);
inputs[12].setVisible(_filt == 2 || _filt == 3);
inputs[ 5].setVisible(_fclr); inputs[ 5].setVisible(_fclr);
inputs[ 6].setVisible(_fclr); inputs[ 6].setVisible(_fclr);
@ -63,6 +66,7 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
var _fclr = _data[11]; var _fclr = _data[11];
var _targ = _data[5]; var _targ = _data[5];
var _innr = _data[6]; var _innr = _data[6];
var _trot = _data[12];
var _sw = surface_get_width_safe(_surf); var _sw = surface_get_width_safe(_surf);
var _sh = surface_get_height_safe(_surf) var _sh = surface_get_height_safe(_surf)
@ -186,6 +190,8 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
case 2 : // Texture Map case 2 : // Texture Map
shader_set(sh_region_fill_rg_map); shader_set(sh_region_fill_rg_map);
shader_set_surface("textureMap", _tmap); shader_set_surface("textureMap", _tmap);
shader_set_2("rotationRandom", [degtorad(_trot[0]), degtorad(_trot[1])]);
shader_set_f("seed", _seed)
draw_surface_safe(cmap); draw_surface_safe(cmap);
shader_reset(); shader_reset();
@ -193,6 +199,9 @@ function Node_Region_Fill(_x, _y, _group = noone) : Node_Processor(_x, _y, _grou
case 3 : // Texture Map case 3 : // Texture Map
shader_set(sh_region_fill_rg_coord); shader_set(sh_region_fill_rg_coord);
shader_set_2("rotationRandom", [degtorad(_trot[0]), degtorad(_trot[1])]);
shader_set_f("seed", _seed)
draw_surface_safe(cmap); draw_surface_safe(cmap);
shader_reset(); shader_reset();
break; break;

8
shaders/sh_region_fill_rg_coord/sh_region_fill_rg_coord.fsh
View file

@ -1,6 +1,11 @@
varying vec2 v_vTexcoord; varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;
uniform vec2 rotationRandom;
uniform float seed;
float random (in vec2 st, float seed) { return fract(sin(dot(st.xy + seed / 1000., vec2(1892.9898, 78.23453))) * 437.54123); }
void main() { void main() {
vec4 c = texture2D( gm_BaseTexture, v_vTexcoord ); vec4 c = texture2D( gm_BaseTexture, v_vTexcoord );
@ -10,5 +15,8 @@ void main() {
} }
vec2 t = (v_vTexcoord - c.xy) / (c.zw - c.xy); vec2 t = (v_vTexcoord - c.xy) / (c.zw - c.xy);
float r = mix(rotationRandom.x, rotationRandom.y, random(c.xy, seed));
t = (t - .5) * mat2(cos(r), -sin(r), sin(r), cos(r)) + .5;
gl_FragColor = vec4( t, 0., 1. ); gl_FragColor = vec4( t, 0., 1. );
} }

7
shaders/sh_region_fill_rg_map/sh_region_fill_rg_map.fsh
View file

@ -2,6 +2,10 @@ varying vec2 v_vTexcoord;
varying vec4 v_vColour; varying vec4 v_vColour;
uniform sampler2D textureMap; uniform sampler2D textureMap;
uniform vec2 rotationRandom;
uniform float seed;
float random (in vec2 st, float seed) { return fract(sin(dot(st.xy + seed / 1000., vec2(1892.9898, 78.23453))) * 437.54123); }
void main() { void main() {
vec4 c = texture2D( gm_BaseTexture, v_vTexcoord ); vec4 c = texture2D( gm_BaseTexture, v_vTexcoord );
@ -12,5 +16,8 @@ void main() {
} }
vec2 t = (v_vTexcoord - c.xy) / (c.zw - c.xy); vec2 t = (v_vTexcoord - c.xy) / (c.zw - c.xy);
float r = mix(rotationRandom.x, rotationRandom.y, random(c.xy, seed));
t = (t - .5) * mat2(cos(r), -sin(r), sin(r), cos(r)) + .5;
gl_FragColor = texture2D( textureMap, t ); gl_FragColor = texture2D( textureMap, t );
} }