Skip to content

Commit

Permalink
Provide TEXTURE and UV by default, removed "Rectangle creation" and "…
Browse files Browse the repository at this point in the history
…RandomFloatInput" nodes

Rectangle creation functionality can be easily reproduced with "RegularPolygonShape" node.
  • Loading branch information
arkology committed Oct 16, 2020
1 parent eabbcc4 commit cb544af
Show file tree
Hide file tree
Showing 69 changed files with 636 additions and 601 deletions.
584 changes: 186 additions & 398 deletions addons/shaderV/examples/basic_examples.tscn

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion addons/shaderV/rgba/blur/blur9sample.gd
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,17 @@ vec4 blur9sampleFunc(sampler2D _samp_b1ur, vec2 _uv_b1ur, float _lod_b1ur, float
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var texture = "TEXTURE"
var uv = "UV"

if input_vars[0]:
texture = input_vars[0]
if input_vars[1]:
uv = input_vars[1]

return """vec4 %s%s = blur9sampleFunc(%s, %s.xy, %s, %s);
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3],
output_vars[0], output_vars[1], texture, uv, input_vars[2], input_vars[3],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
10 changes: 9 additions & 1 deletion addons/shaderV/rgba/blur/blurCustom.gd
Original file line number Diff line number Diff line change
Expand Up @@ -92,9 +92,17 @@ vec4 blurWithAmountFunc(sampler2D _tex_b1r_cst, vec2 _uv_b1r_cst, float _l0d_b1r
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var texture = "TEXTURE"
var uv = "UV"

if input_vars[0]:
texture = input_vars[0]
if input_vars[1]:
uv = input_vars[1]

return """vec4 %s%s = blurWithAmountFunc(%s, %s.xy, %s, int(%s), %s);
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3], input_vars[4],
output_vars[0], output_vars[1], texture, uv, input_vars[2], input_vars[3], input_vars[4],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
10 changes: 9 additions & 1 deletion addons/shaderV/rgba/blur/zoomBlur.gd
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,17 @@ vec4 zoomBlurFunc(sampler2D _tex_z00m_blur, vec2 _uv_z00m_blur, int _amount_z00m
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var texture = "TEXTURE"
var uv = "UV"

if input_vars[0]:
texture = input_vars[0]
if input_vars[1]:
uv = input_vars[1]

return """vec4 %s%s = zoomBlurFunc(%s, %s.xy, int(%s), %s.xy, %s, %s);
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[4], input_vars[3], input_vars[5], input_vars[2],
output_vars[0], output_vars[1], texture, uv, input_vars[4], input_vars[3], input_vars[5], input_vars[2],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
10 changes: 9 additions & 1 deletion addons/shaderV/rgba/chromaticAberration.gd
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,17 @@ vec4 chr0maticAberrati0nFunc(sampler2D _texture_chr_aberrat1on, vec2 _uv_chr_abe
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var texture = "TEXTURE"
var uv = "UV"

if input_vars[0]:
texture = input_vars[0]
if input_vars[1]:
uv = input_vars[1]

return """vec4 %s%s = chr0maticAberrati0nFunc(%s, %s.xy, vec3(%s, %s, %s));
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[3], input_vars[4], input_vars[2],
output_vars[0], output_vars[1], texture, uv, input_vars[3], input_vars[4], input_vars[2],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
8 changes: 7 additions & 1 deletion addons/shaderV/rgba/clamp.gd
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,10 @@ float clampAlphaBorderFunc(float _color_alpha_clamp, vec2 _uv_clamp){
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
return output_vars[0] + " = clampAlphaBorderFunc(%s, (%s).xy);" % [input_vars[0], input_vars[1]]
var texture = "TEXTURE"
var uv = "UV"

if input_vars[1]:
uv = input_vars[1]

return output_vars[0] + " = clampAlphaBorderFunc(%s, (%s).xy);" % [input_vars[0], uv]
10 changes: 9 additions & 1 deletion addons/shaderV/rgba/emboss.gd
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,17 @@ vec4 emb0ssFunc(sampler2D _tex_emb0ss, vec2 _uv_emb0ss, float _lod_emb0ss, vec2
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var texture = "TEXTURE"
var uv = "UV"

if input_vars[0]:
texture = input_vars[0]
if input_vars[1]:
uv = input_vars[1]

return """vec4 %s%s = emb0ssFunc(%s, %s.xy, %s, vec2(%s), %s);
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3], input_vars[4],
output_vars[0], output_vars[1], texture, uv, input_vars[2], input_vars[3], input_vars[4],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
7 changes: 6 additions & 1 deletion addons/shaderV/rgba/fireFX.gd
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,15 @@ vec4 fireFXFunc(vec2 _uv_fire, vec2 _dir_fire, float _speed_fire, float _time_fi
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """vec4 %s%s = fireFXFunc(%s.xy, %s.xy, %s, %s, vec4(%s, %s), vec4(%s, %s), vec4(%s, %s), %s, %s, %s);
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[12], input_vars[3], input_vars[4],
output_vars[0], output_vars[1], uv, input_vars[1], input_vars[2], input_vars[12], input_vars[3], input_vars[4],
input_vars[5], input_vars[6], input_vars[7], input_vars[8], input_vars[9], input_vars[10], input_vars[11],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
7 changes: 6 additions & 1 deletion addons/shaderV/rgba/generate_shapes/chekerboardPattern.gd
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,12 @@ float checkerb0ardPatternFunc(vec2 uv, vec2 _checker_size){
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """%s = %s;
%s = checkerb0ardPatternFunc(%s.xy, %s.xy) * %s;""" % [
output_vars[0], input_vars[2],
output_vars[1], input_vars[0], input_vars[1], input_vars[3]]
output_vars[1], uv, input_vars[1], input_vars[3]]
7 changes: 6 additions & 1 deletion addons/shaderV/rgba/generate_shapes/generateCircle.gd
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ vec4 generateCirc1eFunc(vec2 _uv_circ1e, vec2 _center_circ1e, vec2 _scale_factor
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """%s = %s;
%s = generateCirc1eFunc(%s.xy, %s.xy, %s.xy, %s, %s, %s).a * %s;""" % [output_vars[0],
input_vars[6], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3], input_vars[4], input_vars[5], input_vars[7]]
input_vars[6], output_vars[1], uv, input_vars[1], input_vars[2], input_vars[3], input_vars[4], input_vars[5], input_vars[7]]
7 changes: 6 additions & 1 deletion addons/shaderV/rgba/generate_shapes/generateCircle2.gd
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,15 @@ vec4 generateCircle2Func(vec2 _uv_gc2, vec2 _p0s_gc2, vec2 _sca1e_gc2, float _ra
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """vec4 %s%s = generateCircle2Func(%s.xy, %s.xy, %s.xy, %s, %s, %s, vec4(%s, %s));
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3],
output_vars[0], output_vars[1], uv, input_vars[1], input_vars[2], input_vars[3],
input_vars[4], input_vars[5], input_vars[6], input_vars[7],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
87 changes: 0 additions & 87 deletions addons/shaderV/rgba/generate_shapes/generateRect.gd

This file was deleted.

7 changes: 6 additions & 1 deletion addons/shaderV/rgba/generate_shapes/generateRegularNgon.gd
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,12 @@ float p0lyg0nFunc(vec2 _uv_p0lyg0n, vec2 _pos_p0lyg0n, vec2 _size_p0lyg0n, float
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """%s = %s;
%s = p0lyg0nFunc(%s.xy, %s.xy, %s.xy, %s, %s, %s) * %s;""" % [
output_vars[0], input_vars[6],
output_vars[1], input_vars[0], input_vars[1], input_vars[3], input_vars[2], input_vars[4], input_vars[5], input_vars[7]]
output_vars[1], uv, input_vars[1], input_vars[3], input_vars[2], input_vars[4], input_vars[5], input_vars[7]]
7 changes: 6 additions & 1 deletion addons/shaderV/rgba/generate_shapes/generateSpiral.gd
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,15 @@ vec4 generateSp1ralFunc(vec2 _uv_genSp1r, vec2 _p1v0t_genSp1r, float _s1ze_genSp
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """vec4 %s%s = generateSp1ralFunc(%s.xy, %s.xy, %s, %s, %s, %s, %s, vec4(%s, %s));
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3], input_vars[5],
output_vars[0], output_vars[1], uv, input_vars[1], input_vars[2], input_vars[3], input_vars[5],
input_vars[4], input_vars[6], input_vars[7], input_vars[8],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
7 changes: 6 additions & 1 deletion addons/shaderV/rgba/generate_shapes/gridShape.gd
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,15 @@ vec4 gridFunc(vec2 _grid_uv, vec2 _gridline_thickness, vec2 _gridline_smooth, ve
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """vec4 %s%s = gridFunc(%s.xy, %s.xy, %s.xy, %s.xy, vec4(%s, %s), vec4(%s, %s));
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[2], input_vars[3], input_vars[1],
output_vars[0], output_vars[1], uv, input_vars[2], input_vars[3], input_vars[1],
input_vars[4], input_vars[5], input_vars[6], input_vars[7],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
7 changes: 6 additions & 1 deletion addons/shaderV/rgba/generate_shapes/scanLinesSharp.gd
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,12 @@ float scanL1nesSharpFunc(vec2 _uv_scL1Shrp, float _am0nt_scL1Shrp, float _f1ll_s
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """%s = %s;
%s = scanL1nesSharpFunc(%s.xy, %s, %s, %s, %s) * %s;""" % [
output_vars[0], input_vars[5],
output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3], input_vars[4], input_vars[6]]
output_vars[1], uv, input_vars[1], input_vars[2], input_vars[3], input_vars[4], input_vars[6]]
7 changes: 6 additions & 1 deletion addons/shaderV/rgba/generate_shapes/stripesRandom.gd
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ float generateRand0mStripesFunc(vec2 _uv_stripes, float _fill_stripes, float _am
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var uv = "UV"

if input_vars[0]:
uv = input_vars[0]

return """%s = %s;
%s = generateRand0mStripesFunc(%s.xy, %s, %s) * %s;""" % [output_vars[0], input_vars[3],
output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[4]]
output_vars[1], uv, input_vars[1], input_vars[2], input_vars[4]]
10 changes: 9 additions & 1 deletion addons/shaderV/rgba/glow/glowEmpty.gd
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,18 @@ float _rad_in0ut_Empty, float _intens_inner_gl0wEmpt, float _intens_outer_gl0wEm
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var texture = "TEXTURE"
var uv = "UV"

if input_vars[0]:
texture = input_vars[0]
if input_vars[1]:
uv = input_vars[1]

return """vec4 %s%s = inoutGl0wEmptyFunc(%s, %s.xy, %s, %s, %s, %s, vec4(%s, %s));
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3],
output_vars[0], output_vars[1], texture, uv, input_vars[2], input_vars[3],
input_vars[4], input_vars[5], input_vars[6], input_vars[7],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
10 changes: 9 additions & 1 deletion addons/shaderV/rgba/glow/innerGlow.gd
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,17 @@ vec4 innerGl0wFunc(sampler2D _samp_1ngl0w, vec2 _uv_1ngl0w, float _l0d_1ngl0w, f
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var texture = "TEXTURE"
var uv = "UV"

if input_vars[0]:
texture = input_vars[0]
if input_vars[1]:
uv = input_vars[1]

return """vec4 %s%s = innerGl0wFunc(%s, %s.xy, %s, %s, %s, vec4(%s, %s));
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3], input_vars[4], input_vars[5], input_vars[6],
output_vars[0], output_vars[1], texture, uv, input_vars[2], input_vars[3], input_vars[4], input_vars[5], input_vars[6],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
10 changes: 9 additions & 1 deletion addons/shaderV/rgba/glow/innerGlowEmpty.gd
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,17 @@ vec4 innerGl0wEmptyFunc(sampler2D _samp_1ngl0wEmpt, vec2 _uv_1ngl0wEmpt, float _
"""

func _get_code(input_vars: Array, output_vars: Array, mode: int, type: int) -> String:
var texture = "TEXTURE"
var uv = "UV"

if input_vars[0]:
texture = input_vars[0]
if input_vars[1]:
uv = input_vars[1]

return """vec4 %s%s = innerGl0wEmptyFunc(%s, %s.xy, %s, %s, %s, vec4(%s, %s));
%s = %s%s.rgb;
%s = %s%s.a;""" % [
output_vars[0], output_vars[1], input_vars[0], input_vars[1], input_vars[2], input_vars[3], input_vars[4], input_vars[5], input_vars[6],
output_vars[0], output_vars[1], texture, uv, input_vars[2], input_vars[3], input_vars[4], input_vars[5], input_vars[6],
output_vars[0], output_vars[0], output_vars[1],
output_vars[1], output_vars[0], output_vars[1]]
Loading

0 comments on commit cb544af

Please sign in to comment.