From b1791d1f1180b95bcc45fddb8b31a3e4b2a5803d Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 5 Jun 2022 02:12:01 +0200 Subject: [PATCH] Use the merged class wherever possible. --- .../mat_maker_gd/nodes/filter/adjust_hsv.gd | 5 ++--- game/addons/mat_maker_gd/nodes/filter/blend.gd | 2 +- .../mat_maker_gd/nodes/filter/blur_gaussian.gd | 2 +- .../nodes/filter/brightness_contrast.gd | 5 ++--- game/addons/mat_maker_gd/nodes/filter/colorize.gd | 2 +- game/addons/mat_maker_gd/nodes/filter/combine.gd | 3 +-- .../addons/mat_maker_gd/nodes/filter/decompose.gd | 3 +-- game/addons/mat_maker_gd/nodes/filter/emboss.gd | 2 +- .../mat_maker_gd/nodes/filter/fill_channel.gd | 3 +-- .../mat_maker_gd/nodes/filter/fill_to_color.gd | 3 +-- .../mat_maker_gd/nodes/filter/fill_to_position.gd | 3 +-- .../nodes/filter/fill_to_random_color.gd | 3 +-- .../nodes/filter/fill_to_random_grey.gd | 3 +-- .../mat_maker_gd/nodes/filter/fill_to_size.gd | 3 +-- .../mat_maker_gd/nodes/filter/fill_to_uv.gd | 7 +++---- .../addons/mat_maker_gd/nodes/filter/greyscale.gd | 13 ++++++------- game/addons/mat_maker_gd/nodes/filter/invert.gd | 5 ++--- .../mat_maker_gd/nodes/filter/make_tileable.gd | 3 +-- game/addons/mat_maker_gd/nodes/filter/math.gd | 3 +-- game/addons/mat_maker_gd/nodes/filter/quantize.gd | 3 +-- .../mat_maker_gd/nodes/filter/swap_channels.gd | 3 +-- game/addons/mat_maker_gd/nodes/filter/tonality.gd | 2 +- .../nodes/gradient/circular_gradient.gd | 2 +- .../mat_maker_gd/nodes/gradient/gradient.gd | 2 +- .../nodes/gradient/radial_gradient.gd | 2 +- .../mat_maker_gd/nodes/noise/anisotropic_noise.gd | 2 +- .../mat_maker_gd/nodes/noise/color_noise.gd | 2 +- .../mat_maker_gd/nodes/noise/color_value.gd | 2 +- game/addons/mat_maker_gd/nodes/noise/fbm_noise.gd | 2 +- game/addons/mat_maker_gd/nodes/noise/noise.gd | 2 +- game/addons/mat_maker_gd/nodes/noise/voronoi.gd | 5 ++--- game/addons/mat_maker_gd/nodes/pattern/beehive.gd | 7 +++---- game/addons/mat_maker_gd/nodes/pattern/bricks.gd | 2 +- game/addons/mat_maker_gd/nodes/pattern/iching.gd | 2 +- game/addons/mat_maker_gd/nodes/pattern/pattern.gd | 2 +- game/addons/mat_maker_gd/nodes/pattern/runes.gd | 2 +- .../mat_maker_gd/nodes/pattern/scratches.gd | 2 +- .../mat_maker_gd/nodes/pattern/sine_wave.gd | 2 +- game/addons/mat_maker_gd/nodes/pattern/truchet.gd | 2 +- game/addons/mat_maker_gd/nodes/pattern/weave.gd | 2 +- .../nodes/sdf2d/sd_op_annular_shape.gd | 2 +- .../addons/mat_maker_gd/nodes/sdf2d/sd_op_bool.gd | 9 ++++----- .../nodes/sdf2d/sd_op_circle_repeat.gd | 2 +- .../mat_maker_gd/nodes/sdf2d/sd_op_morph.gd | 5 ++--- .../mat_maker_gd/nodes/sdf2d/sd_op_repeat.gd | 2 +- .../nodes/sdf2d/sd_op_rounded_shape.gd | 2 +- .../mat_maker_gd/nodes/sdf2d/sd_op_smooth_bool.gd | 9 ++++----- .../mat_maker_gd/nodes/sdf2d/sd_shape_arc.gd | 5 ++--- .../mat_maker_gd/nodes/sdf2d/sd_shape_box.gd | 5 ++--- .../mat_maker_gd/nodes/sdf2d/sd_shape_circle.gd | 5 ++--- .../mat_maker_gd/nodes/sdf2d/sd_shape_line.gd | 8 +++----- .../mat_maker_gd/nodes/sdf2d/sd_shape_polygon.gd | 5 ++--- .../mat_maker_gd/nodes/sdf2d/sd_shape_rhombus.gd | 5 ++--- game/addons/mat_maker_gd/nodes/sdf2d/sd_show.gd | 3 +-- .../mat_maker_gd/nodes/sdf2d/sd_tf_rotate.gd | 2 +- .../mat_maker_gd/nodes/sdf2d/sd_tf_scale.gd | 2 +- .../mat_maker_gd/nodes/sdf3d/sdf3d_color.gd | 3 +-- .../mat_maker_gd/nodes/sdf3d/sdf3d_op_bool.gd | 9 ++++----- .../nodes/sdf3d/sdf3d_op_circle_repeat.gd | 5 ++--- .../nodes/sdf3d/sdf3d_op_elongation.gd | 3 +-- .../nodes/sdf3d/sdf3d_op_extrusion.gd | 3 +-- .../mat_maker_gd/nodes/sdf3d/sdf3d_op_morph.gd | 3 +-- .../mat_maker_gd/nodes/sdf3d/sdf3d_op_repeat.gd | 5 ++--- .../nodes/sdf3d/sdf3d_op_revolution.gd | 3 +-- .../mat_maker_gd/nodes/sdf3d/sdf3d_op_rounded.gd | 3 +-- .../nodes/sdf3d/sdf3d_op_smooth_bool.gd | 9 ++++----- .../mat_maker_gd/nodes/sdf3d/sdf3d_render.gd | 3 +-- .../mat_maker_gd/nodes/sdf3d/sdf3d_shape_box.gd | 5 ++--- .../nodes/sdf3d/sdf3d_shape_capsule.gd | 10 ++++------ .../mat_maker_gd/nodes/sdf3d/sdf3d_shape_cone.gd | 15 +++++++-------- .../nodes/sdf3d/sdf3d_shape_cylinder.gd | 9 ++++----- .../nodes/sdf3d/sdf3d_shape_sphere.gd | 5 ++--- .../mat_maker_gd/nodes/sdf3d/sdf3d_shape_torus.gd | 9 ++++----- .../mat_maker_gd/nodes/sdf3d/sdf3d_tf_rotate.gd | 5 ++--- .../mat_maker_gd/nodes/sdf3d/sdf3d_tf_scale.gd | 3 +-- .../nodes/sdf3d/sdf3d_tf_translate.gd | 3 +-- game/addons/mat_maker_gd/nodes/simple/curve.gd | 5 ++--- game/addons/mat_maker_gd/nodes/simple/shape.gd | 2 +- .../mat_maker_gd/nodes/transform/circle_map.gd | 3 +-- .../mat_maker_gd/nodes/transform/color_tiler.gd | 2 +- .../mat_maker_gd/nodes/transform/kaleidoscope.gd | 5 ++--- .../addons/mat_maker_gd/nodes/transform/mirror.gd | 7 +++---- .../addons/mat_maker_gd/nodes/transform/repeat.gd | 2 +- .../addons/mat_maker_gd/nodes/transform/rotate.gd | 5 ++--- game/addons/mat_maker_gd/nodes/transform/scale.gd | 5 ++--- game/addons/mat_maker_gd/nodes/transform/shear.gd | 2 +- game/addons/mat_maker_gd/nodes/transform/tiler.gd | 2 +- .../mat_maker_gd/nodes/transform/transform.gd | 7 +++---- .../mat_maker_gd/nodes/transform/translate.gd | 2 +- 89 files changed, 150 insertions(+), 208 deletions(-) diff --git a/game/addons/mat_maker_gd/nodes/filter/adjust_hsv.gd b/game/addons/mat_maker_gd/nodes/filter/adjust_hsv.gd index 664ff95a..90cfcf07 100644 --- a/game/addons/mat_maker_gd/nodes/filter/adjust_hsv.gd +++ b/game/addons/mat_maker_gd/nodes/filter/adjust_hsv.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -45,7 +44,7 @@ func _render(material) -> void: func get_value_for(uv : Vector2, pseed : int) -> Color: var c : Color = input.get_value(uv) - return Filter.adjust_hsv(c, hue, saturation, value) + return Commons.adjust_hsv(c, hue, saturation, value) #hue func get_hue() -> float: diff --git a/game/addons/mat_maker_gd/nodes/filter/blend.gd b/game/addons/mat_maker_gd/nodes/filter/blend.gd index ffeed8ae..2161e821 100644 --- a/game/addons/mat_maker_gd/nodes/filter/blend.gd +++ b/game/addons/mat_maker_gd/nodes/filter/blend.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Filter = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") enum BlendType { NORMAL = 0, diff --git a/game/addons/mat_maker_gd/nodes/filter/blur_gaussian.gd b/game/addons/mat_maker_gd/nodes/filter/blur_gaussian.gd index afcfcb23..b134c32d 100644 --- a/game/addons/mat_maker_gd/nodes/filter/blur_gaussian.gd +++ b/game/addons/mat_maker_gd/nodes/filter/blur_gaussian.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Filter = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/brightness_contrast.gd b/game/addons/mat_maker_gd/nodes/filter/brightness_contrast.gd index b22db913..b85f493f 100644 --- a/game/addons/mat_maker_gd/nodes/filter/brightness_contrast.gd +++ b/game/addons/mat_maker_gd/nodes/filter/brightness_contrast.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -43,7 +42,7 @@ func _render(material) -> void: func get_value_for(uv : Vector2, pseed : int) -> Color: var c : Color = input.get_value(uv) - return Filter.brightness_contrast(c, brightness, contrast) + return Commons.brightness_contrast(c, brightness, contrast) #brightness func get_brightness() -> float: diff --git a/game/addons/mat_maker_gd/nodes/filter/colorize.gd b/game/addons/mat_maker_gd/nodes/filter/colorize.gd index 52fdb811..0f7a95c1 100644 --- a/game/addons/mat_maker_gd/nodes/filter/colorize.gd +++ b/game/addons/mat_maker_gd/nodes/filter/colorize.gd @@ -1,7 +1,7 @@ tool extends "res://addons/mat_maker_gd/nodes/bases/gradient_base.gd" -var Gradients = preload("res://addons/mat_maker_gd/nodes/common/gradients.gd") +var Gradients = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/combine.gd b/game/addons/mat_maker_gd/nodes/filter/combine.gd index 326ea373..128276ff 100644 --- a/game/addons/mat_maker_gd/nodes/filter/combine.gd +++ b/game/addons/mat_maker_gd/nodes/filter/combine.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input_r : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/decompose.gd b/game/addons/mat_maker_gd/nodes/filter/decompose.gd index 5dd5be90..7fed3518 100644 --- a/game/addons/mat_maker_gd/nodes/filter/decompose.gd +++ b/game/addons/mat_maker_gd/nodes/filter/decompose.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var NoiseVoronoi = preload("res://addons/mat_maker_gd/nodes/common/noise_voronoi.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var out_r : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/emboss.gd b/game/addons/mat_maker_gd/nodes/filter/emboss.gd index 12693713..ca177e8c 100644 --- a/game/addons/mat_maker_gd/nodes/filter/emboss.gd +++ b/game/addons/mat_maker_gd/nodes/filter/emboss.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Filter = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/fill_channel.gd b/game/addons/mat_maker_gd/nodes/filter/fill_channel.gd index 53a51690..335c1bbb 100644 --- a/game/addons/mat_maker_gd/nodes/filter/fill_channel.gd +++ b/game/addons/mat_maker_gd/nodes/filter/fill_channel.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/fill_to_color.gd b/game/addons/mat_maker_gd/nodes/filter/fill_to_color.gd index 3f660f28..0dc96785 100644 --- a/game/addons/mat_maker_gd/nodes/filter/fill_to_color.gd +++ b/game/addons/mat_maker_gd/nodes/filter/fill_to_color.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Fills = preload("res://addons/mat_maker_gd/nodes/common/fills.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/fill_to_position.gd b/game/addons/mat_maker_gd/nodes/filter/fill_to_position.gd index 69eded48..1ec35bb8 100644 --- a/game/addons/mat_maker_gd/nodes/filter/fill_to_position.gd +++ b/game/addons/mat_maker_gd/nodes/filter/fill_to_position.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Transforms = preload("res://addons/mat_maker_gd/nodes/common/transforms.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/fill_to_random_color.gd b/game/addons/mat_maker_gd/nodes/filter/fill_to_random_color.gd index 3360a29e..62041f72 100644 --- a/game/addons/mat_maker_gd/nodes/filter/fill_to_random_color.gd +++ b/game/addons/mat_maker_gd/nodes/filter/fill_to_random_color.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Fills = preload("res://addons/mat_maker_gd/nodes/common/fills.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/fill_to_random_grey.gd b/game/addons/mat_maker_gd/nodes/filter/fill_to_random_grey.gd index 53e7c4da..8dee035b 100644 --- a/game/addons/mat_maker_gd/nodes/filter/fill_to_random_grey.gd +++ b/game/addons/mat_maker_gd/nodes/filter/fill_to_random_grey.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Fills = preload("res://addons/mat_maker_gd/nodes/common/fills.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/fill_to_size.gd b/game/addons/mat_maker_gd/nodes/filter/fill_to_size.gd index edfe95d3..86ea9c6d 100644 --- a/game/addons/mat_maker_gd/nodes/filter/fill_to_size.gd +++ b/game/addons/mat_maker_gd/nodes/filter/fill_to_size.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Fills = preload("res://addons/mat_maker_gd/nodes/common/fills.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/fill_to_uv.gd b/game/addons/mat_maker_gd/nodes/filter/fill_to_uv.gd index 63db5197..60b1f3ec 100644 --- a/game/addons/mat_maker_gd/nodes/filter/fill_to_uv.gd +++ b/game/addons/mat_maker_gd/nodes/filter/fill_to_uv.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Fills = preload("res://addons/mat_maker_gd/nodes/common/fills.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -46,9 +45,9 @@ func get_value_for(uv : Vector2, pseed : int) -> Color: var r : Vector3 = Vector3() if mode == 0: - r = Fills.fill_to_uv_stretch(uv, c, float(pseed)) + r = Commons.fill_to_uv_stretch(uv, c, float(pseed)) elif mode == 1: - r = Fills.fill_to_uv_square(uv, c, float(pseed)) + r = Commons.fill_to_uv_square(uv, c, float(pseed)) return Color(r.x, r.y, r.z, 1) diff --git a/game/addons/mat_maker_gd/nodes/filter/greyscale.gd b/game/addons/mat_maker_gd/nodes/filter/greyscale.gd index cc95b1e7..0e8487b9 100644 --- a/game/addons/mat_maker_gd/nodes/filter/greyscale.gd +++ b/game/addons/mat_maker_gd/nodes/filter/greyscale.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -44,15 +43,15 @@ func get_value_for(uv : Vector2, pseed : int) -> Color: var f : float = 0 if type == 0: - f = Filter.grayscale_lightness(Vector3(c.r, c.g, c.b)) + f = Commons.grayscale_lightness(Vector3(c.r, c.g, c.b)) elif type == 1: - f = Filter.grayscale_average(Vector3(c.r, c.g, c.b)) + f = Commons.grayscale_average(Vector3(c.r, c.g, c.b)) elif type == 2: - f = Filter.grayscale_luminosity(Vector3(c.r, c.g, c.b)) + f = Commons.grayscale_luminosity(Vector3(c.r, c.g, c.b)) elif type == 3: - f = Filter.grayscale_min(Vector3(c.r, c.g, c.b)) + f = Commons.grayscale_min(Vector3(c.r, c.g, c.b)) elif type == 4: - f = Filter.grayscale_max(Vector3(c.r, c.g, c.b)) + f = Commons.grayscale_max(Vector3(c.r, c.g, c.b)) return Color(f, f, f, c.a) diff --git a/game/addons/mat_maker_gd/nodes/filter/invert.gd b/game/addons/mat_maker_gd/nodes/filter/invert.gd index 994c7b76..2925e3f7 100644 --- a/game/addons/mat_maker_gd/nodes/filter/invert.gd +++ b/game/addons/mat_maker_gd/nodes/filter/invert.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -39,4 +38,4 @@ func _render(material) -> void: func get_value_for(uv : Vector2, pseed : int) -> Color: var c : Color = input.get_value(uv) - return Filter.invert(c) + return Commons.invert(c) diff --git a/game/addons/mat_maker_gd/nodes/filter/make_tileable.gd b/game/addons/mat_maker_gd/nodes/filter/make_tileable.gd index 1abeff8e..bb1f4bbc 100644 --- a/game/addons/mat_maker_gd/nodes/filter/make_tileable.gd +++ b/game/addons/mat_maker_gd/nodes/filter/make_tileable.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/math.gd b/game/addons/mat_maker_gd/nodes/filter/math.gd index 56defca9..0d3ef423 100644 --- a/game/addons/mat_maker_gd/nodes/filter/math.gd +++ b/game/addons/mat_maker_gd/nodes/filter/math.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Fills = preload("res://addons/mat_maker_gd/nodes/common/fills.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var a : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/quantize.gd b/game/addons/mat_maker_gd/nodes/filter/quantize.gd index a86b4c5f..8fc699c0 100644 --- a/game/addons/mat_maker_gd/nodes/filter/quantize.gd +++ b/game/addons/mat_maker_gd/nodes/filter/quantize.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/swap_channels.gd b/game/addons/mat_maker_gd/nodes/filter/swap_channels.gd index eca84d12..5c2708aa 100644 --- a/game/addons/mat_maker_gd/nodes/filter/swap_channels.gd +++ b/game/addons/mat_maker_gd/nodes/filter/swap_channels.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Filter = preload("res://addons/mat_maker_gd/nodes/common/filter.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/filter/tonality.gd b/game/addons/mat_maker_gd/nodes/filter/tonality.gd index 66f1aba2..c489cdf0 100644 --- a/game/addons/mat_maker_gd/nodes/filter/tonality.gd +++ b/game/addons/mat_maker_gd/nodes/filter/tonality.gd @@ -1,7 +1,7 @@ tool extends "res://addons/mat_maker_gd/nodes/bases/curve_base.gd" -var Curves = preload("res://addons/mat_maker_gd/nodes/common/curves.gd") +var Curves = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/gradient/circular_gradient.gd b/game/addons/mat_maker_gd/nodes/gradient/circular_gradient.gd index 1fc45b79..da7e615c 100644 --- a/game/addons/mat_maker_gd/nodes/gradient/circular_gradient.gd +++ b/game/addons/mat_maker_gd/nodes/gradient/circular_gradient.gd @@ -1,7 +1,7 @@ tool extends "res://addons/mat_maker_gd/nodes/bases/gradient_base.gd" -var Gradients = preload("res://addons/mat_maker_gd/nodes/common/gradients.gd") +var Gradients = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(float) var repeat : float = 1 diff --git a/game/addons/mat_maker_gd/nodes/gradient/gradient.gd b/game/addons/mat_maker_gd/nodes/gradient/gradient.gd index 6db5aff1..ca672942 100644 --- a/game/addons/mat_maker_gd/nodes/gradient/gradient.gd +++ b/game/addons/mat_maker_gd/nodes/gradient/gradient.gd @@ -1,7 +1,7 @@ tool extends "res://addons/mat_maker_gd/nodes/bases/gradient_base.gd" -var Gradients = preload("res://addons/mat_maker_gd/nodes/common/gradients.gd") +var Gradients = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(float) var repeat : float = 1 diff --git a/game/addons/mat_maker_gd/nodes/gradient/radial_gradient.gd b/game/addons/mat_maker_gd/nodes/gradient/radial_gradient.gd index 76e84c56..ca237810 100644 --- a/game/addons/mat_maker_gd/nodes/gradient/radial_gradient.gd +++ b/game/addons/mat_maker_gd/nodes/gradient/radial_gradient.gd @@ -1,7 +1,7 @@ tool extends "res://addons/mat_maker_gd/nodes/bases/gradient_base.gd" -var Gradients = preload("res://addons/mat_maker_gd/nodes/common/gradients.gd") +var Gradients = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(float) var repeat : float = 1 diff --git a/game/addons/mat_maker_gd/nodes/noise/anisotropic_noise.gd b/game/addons/mat_maker_gd/nodes/noise/anisotropic_noise.gd index 2b278498..6f329bd4 100644 --- a/game/addons/mat_maker_gd/nodes/noise/anisotropic_noise.gd +++ b/game/addons/mat_maker_gd/nodes/noise/anisotropic_noise.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Noises = preload("res://addons/mat_maker_gd/nodes/common/noises.gd") +var Noises = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource diff --git a/game/addons/mat_maker_gd/nodes/noise/color_noise.gd b/game/addons/mat_maker_gd/nodes/noise/color_noise.gd index d5dbdee3..64014a13 100644 --- a/game/addons/mat_maker_gd/nodes/noise/color_noise.gd +++ b/game/addons/mat_maker_gd/nodes/noise/color_noise.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Noises = preload("res://addons/mat_maker_gd/nodes/common/noises.gd") +var Noises = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource diff --git a/game/addons/mat_maker_gd/nodes/noise/color_value.gd b/game/addons/mat_maker_gd/nodes/noise/color_value.gd index 97fff541..84dcb38b 100644 --- a/game/addons/mat_maker_gd/nodes/noise/color_value.gd +++ b/game/addons/mat_maker_gd/nodes/noise/color_value.gd @@ -1,7 +1,7 @@ tool extends MMNode -var NoisePerlin = preload("res://addons/mat_maker_gd/nodes/common/noise_perlin.gd") +var NoisePerlin = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource diff --git a/game/addons/mat_maker_gd/nodes/noise/fbm_noise.gd b/game/addons/mat_maker_gd/nodes/noise/fbm_noise.gd index 036b9cb1..b2a456fe 100644 --- a/game/addons/mat_maker_gd/nodes/noise/fbm_noise.gd +++ b/game/addons/mat_maker_gd/nodes/noise/fbm_noise.gd @@ -1,7 +1,7 @@ tool extends MMNode -var NoiseFBM = preload("res://addons/mat_maker_gd/nodes/common/noise_fbm.gd") +var NoiseFBM = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource diff --git a/game/addons/mat_maker_gd/nodes/noise/noise.gd b/game/addons/mat_maker_gd/nodes/noise/noise.gd index 30e23eef..2dc70400 100644 --- a/game/addons/mat_maker_gd/nodes/noise/noise.gd +++ b/game/addons/mat_maker_gd/nodes/noise/noise.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Noises = preload("res://addons/mat_maker_gd/nodes/common/noises.gd") +var Noises = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource diff --git a/game/addons/mat_maker_gd/nodes/noise/voronoi.gd b/game/addons/mat_maker_gd/nodes/noise/voronoi.gd index 0c452391..a59ec47d 100644 --- a/game/addons/mat_maker_gd/nodes/noise/voronoi.gd +++ b/game/addons/mat_maker_gd/nodes/noise/voronoi.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var NoiseVoronoi = preload("res://addons/mat_maker_gd/nodes/common/noise_voronoi.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var out_nodes : Resource export(Resource) var out_borders : Resource @@ -87,7 +86,7 @@ func _render(material) -> void: var ps : float = 1.0 / float(pseed) #vec4 $(name_uv)_xyzw = voronoi($uv, vec2($scale_x, $scale_y), vec2($stretch_y, $stretch_x), $intensity, $randomness, $seed); - var voronoi : Color = NoiseVoronoi.voronoi(uv, scale, stretch, intensity, randomness, ps) + var voronoi : Color = Commons.voronoi(uv, scale, stretch, intensity, randomness, ps) #Nodes - float - A greyscale pattern based on the distance to cell centers #$(name_uv)_xyzw.z diff --git a/game/addons/mat_maker_gd/nodes/pattern/beehive.gd b/game/addons/mat_maker_gd/nodes/pattern/beehive.gd index b439ae38..730a6675 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/beehive.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/beehive.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var out_main : Resource export(Resource) var out_random_color : Resource @@ -69,11 +68,11 @@ func _render(material) -> void: #vec2 $(name_uv)_uv = $uv*vec2($sx, $sy*1.73205080757); #vec4 $(name_uv)_center = beehive_center($(name_uv)_uv); var beehive_uv : Vector2 = uv * size; - var beehive_uv_center : Color = Patterns.beehive_center(beehive_uv); + var beehive_uv_center : Color = Commons.beehive_center(beehive_uv); #Output (float) - Shows the greyscale pattern #1.0-2.0*beehive_dist($(name_uv)_center.xy) - var f : float = 1.0 - 2.0 * Patterns.beehive_dist(Vector2(beehive_uv_center.r, beehive_uv_center.g)) + var f : float = 1.0 - 2.0 * Commons.beehive_dist(Vector2(beehive_uv_center.r, beehive_uv_center.g)) var main_pattern_col : Color = Color(f, f, f, 1) #Random color (rgb) - Shows a random color for each hexagonal tile diff --git a/game/addons/mat_maker_gd/nodes/pattern/bricks.gd b/game/addons/mat_maker_gd/nodes/pattern/bricks.gd index 498460f0..7c4b4dcb 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/bricks.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/bricks.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Patterns = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var out_bricks_pattern : Resource export(Resource) var out_random_color : Resource diff --git a/game/addons/mat_maker_gd/nodes/pattern/iching.gd b/game/addons/mat_maker_gd/nodes/pattern/iching.gd index 5daceba0..058ea9af 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/iching.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/iching.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Patterns = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Vector2) var size : Vector2 = Vector2(4, 4) diff --git a/game/addons/mat_maker_gd/nodes/pattern/pattern.gd b/game/addons/mat_maker_gd/nodes/pattern/pattern.gd index 1bc9ac1c..a2fa2b29 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/pattern.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/pattern.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Patterns = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(int, "Multiply,Add,Max,Min,Xor,Pow") var combiner_type : int = 0 diff --git a/game/addons/mat_maker_gd/nodes/pattern/runes.gd b/game/addons/mat_maker_gd/nodes/pattern/runes.gd index fd7a9658..c36e9c45 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/runes.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/runes.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Patterns = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Vector2) var size : Vector2 = Vector2(4, 4) diff --git a/game/addons/mat_maker_gd/nodes/pattern/scratches.gd b/game/addons/mat_maker_gd/nodes/pattern/scratches.gd index f333b2d3..5e8ab6e5 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/scratches.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/scratches.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Patterns = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Vector2) var size : Vector2 = Vector2(0.25, 0.4) diff --git a/game/addons/mat_maker_gd/nodes/pattern/sine_wave.gd b/game/addons/mat_maker_gd/nodes/pattern/sine_wave.gd index d343bfca..dbf0819f 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/sine_wave.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/sine_wave.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Patterns = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(float) var amplitude : float = 0.5 diff --git a/game/addons/mat_maker_gd/nodes/pattern/truchet.gd b/game/addons/mat_maker_gd/nodes/pattern/truchet.gd index b07ec963..b822ace1 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/truchet.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/truchet.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Patterns = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(int, "Line,Circle") var shape : int = 0 diff --git a/game/addons/mat_maker_gd/nodes/pattern/weave.gd b/game/addons/mat_maker_gd/nodes/pattern/weave.gd index f846549e..8037c205 100644 --- a/game/addons/mat_maker_gd/nodes/pattern/weave.gd +++ b/game/addons/mat_maker_gd/nodes/pattern/weave.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Patterns = preload("res://addons/mat_maker_gd/nodes/common/patterns.gd") +var Patterns = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var out_main : Resource export(Resource) var out_horizontal_map : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_annular_shape.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_annular_shape.gd index c7e8829f..62b3a7fa 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_annular_shape.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_annular_shape.gd @@ -1,7 +1,7 @@ tool extends MMNode -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(float) var width : float = 0.1 diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_bool.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_bool.gd index 69ee787d..a037daf3 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_bool.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_bool.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input1 : Resource export(Resource) var input2 : Resource @@ -53,11 +52,11 @@ func _register_methods(mm_graph_node) -> void: func get_property_value(uv : Vector2) -> float: if operation == 0: - return SDF2D.sdf_boolean_union(input1.get_value(uv), input2.get_value(uv)) + return Commons.sdf_boolean_union(input1.get_value(uv), input2.get_value(uv)) elif operation == 1: - return SDF2D.sdf_boolean_substraction(input1.get_value(uv), input2.get_value(uv)) + return Commons.sdf_boolean_substraction(input1.get_value(uv), input2.get_value(uv)) elif operation == 2: - return SDF2D.sdf_boolean_intersection(input1.get_value(uv), input2.get_value(uv)) + return Commons.sdf_boolean_intersection(input1.get_value(uv), input2.get_value(uv)) return 0.0 diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_circle_repeat.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_circle_repeat.gd index f61f6dc2..bbf77a5c 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_circle_repeat.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_circle_repeat.gd @@ -1,7 +1,7 @@ tool extends MMNode -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(int) var count : int = 6 diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_morph.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_morph.gd index e5aee5bb..0559f408 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_morph.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_morph.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input1 : Resource export(Resource) var input2 : Resource @@ -52,7 +51,7 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_float("get_amount", "set_amount", "Amount", 0.01) func get_property_value(uv : Vector2) -> float: - return SDF2D.sdf_morph(input1.get_value(uv), input2.get_value(uv), amount) + return Commons.sdf_morph(input1.get_value(uv), input2.get_value(uv), amount) #amount func get_amount() -> float: diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_repeat.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_repeat.gd index f36ca996..ff836cb0 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_repeat.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_repeat.gd @@ -1,7 +1,7 @@ tool extends MMNode -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(int) var x : int = 3 diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_rounded_shape.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_rounded_shape.gd index ac71fd5b..13fc9bbe 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_rounded_shape.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_rounded_shape.gd @@ -1,7 +1,7 @@ tool extends MMNode -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(float) var radius : float = 0 diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_smooth_bool.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_smooth_bool.gd index 3b7a7681..d1b87fd7 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_smooth_bool.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_op_smooth_bool.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input1 : Resource export(Resource) var input2 : Resource @@ -55,11 +54,11 @@ func _register_methods(mm_graph_node) -> void: func get_property_value(uv : Vector2) -> float: if operation == 0: - return SDF2D.sdf_smooth_boolean_union(input1.get_value(uv), input2.get_value(uv), smoothness) + return Commons.sdf_smooth_boolean_union(input1.get_value(uv), input2.get_value(uv), smoothness) elif operation == 1: - return SDF2D.sdf_smooth_boolean_substraction(input1.get_value(uv), input2.get_value(uv), smoothness) + return Commons.sdf_smooth_boolean_substraction(input1.get_value(uv), input2.get_value(uv), smoothness) elif operation == 2: - return SDF2D.sdf_smooth_boolean_intersection(input1.get_value(uv), input2.get_value(uv), smoothness) + return Commons.sdf_smooth_boolean_intersection(input1.get_value(uv), input2.get_value(uv), smoothness) return 0.0 diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_arc.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_arc.gd index b5436041..385fb3a2 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_arc.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_arc.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(Vector2) var angle : Vector2 = Vector2(30, 150) @@ -28,7 +27,7 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_float("get_width", "set_width", "Width", 0.01) func get_property_value(uv : Vector2) -> float: - return SDF2D.sdf_arc(uv, angle, Vector2(radius, width)) + return Commons.sdf_arc(uv, angle, Vector2(radius, width)) #angle func get_angle() -> Vector2: diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_box.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_box.gd index 35c866ee..dd1b24fd 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_box.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_box.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(Vector2) var center : Vector2 = Vector2(0, 0) @@ -26,7 +25,7 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_vector2("get_size", "set_size", "Size", 0.01) func get_property_value(uv : Vector2) -> float: - return SDF2D.sdf_box(uv, center, size) + return Commons.sdf_box(uv, center, size) #center func get_center() -> Vector2: diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_circle.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_circle.gd index bc8488a4..e0301c28 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_circle.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_circle.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(Vector2) var center : Vector2 = Vector2(0, 0) @@ -26,7 +25,7 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_float("get_radius", "set_radius", "Radius", 0.01) func get_property_value(uv : Vector2) -> float: - return SDF2D.sdf_circle(uv, center, radius) + return Commons.sdf_circle(uv, center, radius) #center func get_center() -> Vector2: diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_line.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_line.gd index fa3a5e4a..90510f08 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_line.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_line.gd @@ -1,9 +1,7 @@ tool extends "res://addons/mat_maker_gd/nodes/bases/curve_base.gd" -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") -var Curves = preload("res://addons/mat_maker_gd/nodes/common/curves.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(Vector2) var A : Vector2 = Vector2(-0.3, -0.3) @@ -33,11 +31,11 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_curve() func get_property_value(uv : Vector2) -> float: - var line : Vector2 = SDF2D.sdf_line(uv, A, B, width) + var line : Vector2 = Commons.sdf_line(uv, A, B, width) #$(name_uv)_sdl.x - $r * $profile($(name_uv)_sdl.y) - return line.x - width * Curves.curve(line.y, points) + return line.x - width * Commons.curve(line.y, points) #a func get_a() -> Vector2: diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_polygon.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_polygon.gd index daecf362..c3bf208b 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_polygon.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_polygon.gd @@ -1,8 +1,7 @@ tool extends "res://addons/mat_maker_gd/nodes/bases/polygon_base.gd" -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource @@ -22,7 +21,7 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_polygon() func get_property_value(uv : Vector2) -> float: - return SDF2D.sdPolygon(uv, points) + return Commons.sdPolygon(uv, points) func _polygon_changed() -> void: emit_changed() diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_rhombus.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_rhombus.gd index 07b5ed48..8b328935 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_rhombus.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_shape_rhombus.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(Vector2) var center : Vector2 = Vector2(0, 0) @@ -26,7 +25,7 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_vector2("get_size", "set_size", "Size", 0.01) func get_property_value(uv : Vector2) -> float: - return SDF2D.sdf_rhombus(uv, center, size) + return Commons.sdf_rhombus(uv, center, size) #center func get_center() -> Vector2: diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_show.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_show.gd index 65697a74..4343e78e 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_show.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_show.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_tf_rotate.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_tf_rotate.gd index 9ec52f7e..f4439ae9 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_tf_rotate.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_tf_rotate.gd @@ -1,7 +1,7 @@ tool extends MMNode -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(float) var angle : float = 0 diff --git a/game/addons/mat_maker_gd/nodes/sdf2d/sd_tf_scale.gd b/game/addons/mat_maker_gd/nodes/sdf2d/sd_tf_scale.gd index f6302fa2..c76fcc73 100644 --- a/game/addons/mat_maker_gd/nodes/sdf2d/sd_tf_scale.gd +++ b/game/addons/mat_maker_gd/nodes/sdf2d/sd_tf_scale.gd @@ -1,7 +1,7 @@ tool extends MMNode -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(float) var scale : float = 1 diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_color.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_color.gd index 4c26ee4e..77ad3ef8 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_color.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_color.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_bool.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_bool.gd index bff35381..1808fc44 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_bool.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_bool.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input1 : Resource export(Resource) var input2 : Resource @@ -56,11 +55,11 @@ func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: var s2 : Vector2 = input2.get_value_sdf3d(uv3) if operation == 0: - return SDF3D.sdf3dc_union(s1, s2) + return Commons.sdf3dc_union(s1, s2) elif operation == 1: - return SDF3D.sdf3dc_sub(s1, s2) + return Commons.sdf3dc_sub(s1, s2) elif operation == 2: - return SDF3D.sdf3dc_inter(s1, s2) + return Commons.sdf3dc_inter(s1, s2) return Vector2() diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_circle_repeat.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_circle_repeat.gd index 9186c89f..d71207cc 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_circle_repeat.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_circle_repeat.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource @@ -40,7 +39,7 @@ func _register_methods(mm_graph_node) -> void: func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: #todo make seed a class variable probably into MMNode - var new_uv : Vector3 = SDF3D.circle_repeat_transform(uv3, count) + var new_uv : Vector3 = Commons.circle_repeat_transform(uv3, count) return input.get_value_sdf3d(new_uv) diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_elongation.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_elongation.gd index b0b52d29..23fed022 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_elongation.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_elongation.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_extrusion.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_extrusion.gd index 7f7613a4..f0a1d18a 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_extrusion.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_extrusion.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_morph.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_morph.gd index 67f70a61..09783b79 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_morph.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_morph.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input1 : Resource export(Resource) var input2 : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_repeat.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_repeat.gd index f428e96a..bcf55097 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_repeat.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_repeat.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource @@ -42,7 +41,7 @@ func _register_methods(mm_graph_node) -> void: func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: #todo make seed a class variable probably into MMNode - var new_uv : Vector3 = SDF3D.sdf3d_repeat(uv3, col_row, rotation, 1) + var new_uv : Vector3 = Commons.sdf3d_repeat(uv3, col_row, rotation, 1) return input.get_value_sdf3d(new_uv) diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_revolution.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_revolution.gd index 98df2ab5..a01b1e8c 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_revolution.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_revolution.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_rounded.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_rounded.gd index 338c510c..05659b02 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_rounded.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_rounded.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_smooth_bool.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_smooth_bool.gd index 01e03fec..2fef9fd6 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_smooth_bool.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_op_smooth_bool.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input1 : Resource export(Resource) var input2 : Resource @@ -58,11 +57,11 @@ func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: var s2 : Vector2 = input2.get_value_sdf3d(uv3) if operation == 0: - return SDF3D.sdf3d_smooth_union(s1, s2, smoothness) + return Commons.sdf3d_smooth_union(s1, s2, smoothness) elif operation == 1: - return SDF3D.sdf3d_smooth_subtraction(s1, s2, smoothness) + return Commons.sdf3d_smooth_subtraction(s1, s2, smoothness) elif operation == 2: - return SDF3D.sdf3d_smooth_intersection(s1, s2, smoothness) + return Commons.sdf3d_smooth_intersection(s1, s2, smoothness) return Vector2() diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_render.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_render.gd index 4bd29188..e8588301 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_render.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_render.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_box.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_box.gd index 3711c3c9..6ec7c040 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_box.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_box.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(Vector3) var size : Vector3 = Vector3(0.3, 0.25, 0.25) @@ -26,7 +25,7 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_float("get_radius", "set_radius", "Radius", 0.01) func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: - return SDF3D.sdf3d_box(uv3, size.x, size.y, size.z, radius) + return Commons.sdf3d_box(uv3, size.x, size.y, size.z, radius) #size func get_size() -> Vector3: diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_capsule.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_capsule.gd index 138f8818..fbaeb31e 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_capsule.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_capsule.gd @@ -1,9 +1,7 @@ tool extends "res://addons/mat_maker_gd/nodes/bases/curve_base.gd" -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") -var Curves = preload("res://addons/mat_maker_gd/nodes/common/curves.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(int, "X,Y,Z") var axis : int = 1 @@ -51,7 +49,7 @@ func sdf3d_capsule_y(p : Vector3, r : float, l : float) -> Vector2: v.y -= clamp(v.y, -l, l); var cx : float = clamp(0.5 + 0.5 * p.y / l, 0.0, 1.0) - var cp : float = Curves.curve(cx, points) + var cp : float = Commons.curve(cx, points) var f : float = v.length() - r * cp return Vector2(f, 0.0); @@ -61,7 +59,7 @@ func sdf3d_capsule_x(p : Vector3, r : float, l : float) -> Vector2: v.x -= clamp(v.x, -l, l); var cx : float = clamp(0.5 + 0.5 * p.x / l, 0.0, 1.0) - var cp : float = Curves.curve(cx, points) + var cp : float = Commons.curve(cx, points) var f : float = v.length() - r * cp return Vector2(f, 0.0); @@ -71,7 +69,7 @@ func sdf3d_capsule_z(p : Vector3, r : float, l : float) -> Vector2: v.z -= clamp(v.z, -l, l); var cx : float = clamp(0.5 + 0.5 * p.z / l, 0.0, 1.0) - var cp : float = Curves.curve(cx, points) + var cp : float = Commons.curve(cx, points) var f : float = v.length() - r * cp return Vector2(f, 0.0); diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_cone.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_cone.gd index 9151b46c..2ae71511 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_cone.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_cone.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(int, "+X,-X,+Y,-Y,+Z,-Z") var axis : int = 2 @@ -27,17 +26,17 @@ func _register_methods(mm_graph_node) -> void: func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: if axis == 0: - return SDF3D.sdf3d_cone_px(uv3, angle) + return Commons.sdf3d_cone_px(uv3, angle) elif axis == 1: - return SDF3D.sdf3d_cone_nx(uv3, angle) + return Commons.sdf3d_cone_nx(uv3, angle) elif axis == 2: - return SDF3D.sdf3d_cone_py(uv3, angle) + return Commons.sdf3d_cone_py(uv3, angle) elif axis == 3: - return SDF3D.sdf3d_cone_ny(uv3, angle) + return Commons.sdf3d_cone_ny(uv3, angle) elif axis == 4: - return SDF3D.sdf3d_cone_pz(uv3, angle) + return Commons.sdf3d_cone_pz(uv3, angle) elif axis == 5: - return SDF3D.sdf3d_cone_nz(uv3, angle) + return Commons.sdf3d_cone_nz(uv3, angle) return Vector2() diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_cylinder.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_cylinder.gd index f13c3c2f..8f8599c8 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_cylinder.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_cylinder.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(int, "X,Y,Z") var axis : int = 1 @@ -29,11 +28,11 @@ func _register_methods(mm_graph_node) -> void: func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: if axis == 0: - return SDF3D.sdf3d_cylinder_x(uv3, radius, length) + return Commons.sdf3d_cylinder_x(uv3, radius, length) elif axis == 1: - return SDF3D.sdf3d_cylinder_y(uv3, radius, length) + return Commons.sdf3d_cylinder_y(uv3, radius, length) elif axis == 2: - return SDF3D.sdf3d_cylinder_z(uv3, radius, length) + return Commons.sdf3d_cylinder_z(uv3, radius, length) return Vector2() diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_sphere.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_sphere.gd index 145206bc..884168ee 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_sphere.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_sphere.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(float) var radius : float = 0.5 @@ -24,7 +23,7 @@ func _register_methods(mm_graph_node) -> void: mm_graph_node.add_slot_float("get_radius", "set_radius", "Radius", 0.01) func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: - return SDF3D.sdf3d_sphere(uv3, radius) + return Commons.sdf3d_sphere(uv3, radius) #radius func get_radius() -> float: diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_torus.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_torus.gd index 682bba52..fcf24e53 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_torus.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_shape_torus.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var output : Resource export(int, "X,Y,Z") var axis : int = 2 @@ -29,11 +28,11 @@ func _register_methods(mm_graph_node) -> void: func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: if axis == 0: - return SDF3D.sdf3d_torus_x(uv3, major_radius, minor_radius) + return Commons.sdf3d_torus_x(uv3, major_radius, minor_radius) elif axis == 1: - return SDF3D.sdf3d_torus_y(uv3, major_radius, minor_radius) + return Commons.sdf3d_torus_y(uv3, major_radius, minor_radius) elif axis == 2: - return SDF3D.sdf3d_torus_z(uv3, major_radius, minor_radius) + return Commons.sdf3d_torus_z(uv3, major_radius, minor_radius) return Vector2() diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_rotate.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_rotate.gd index 114056c4..117db2d9 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_rotate.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_rotate.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource @@ -40,7 +39,7 @@ func _register_methods(mm_graph_node) -> void: func get_property_value_sdf3d(uv3 : Vector3) -> Vector2: #$in(rotate3d($uv, -vec3($ax, $ay, $az)*0.01745329251)) - return input.get_value_sdf3d(SDF3D.rotate3d(uv3, -rotation * 0.01745329251)) + return input.get_value_sdf3d(Commons.rotate3d(uv3, -rotation * 0.01745329251)) #rotation func get_rotation() -> Vector3: diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_scale.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_scale.gd index e29b633a..a84cab30 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_scale.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_scale.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource diff --git a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_translate.gd b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_translate.gd index b166af95..b37d7051 100644 --- a/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_translate.gd +++ b/game/addons/mat_maker_gd/nodes/sdf3d/sdf3d_tf_translate.gd @@ -1,8 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF3D = preload("res://addons/mat_maker_gd/nodes/common/sdf3d.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var output : Resource diff --git a/game/addons/mat_maker_gd/nodes/simple/curve.gd b/game/addons/mat_maker_gd/nodes/simple/curve.gd index c6ed8004..74769039 100644 --- a/game/addons/mat_maker_gd/nodes/simple/curve.gd +++ b/game/addons/mat_maker_gd/nodes/simple/curve.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var SDF2D = preload("res://addons/mat_maker_gd/nodes/common/sdf2d.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource @@ -58,7 +57,7 @@ func _render(material) -> void: func transform_uv(uv : Vector2) -> Vector2: #vec2 $(name_uv)_bezier = sdBezier($uv, vec2($ax+0.5, $ay+0.5), vec2($bx+0.5, $by+0.5), vec2($cx+0.5, $cy+0.5)); - var bezier : Vector2 = SDF2D.sdBezier(uv, Vector2(a.x + 0.5, a.y + 0.5), Vector2(b.x + 0.5, b.y + 0.5), Vector2(c.x + 0.5, c.y + 0.5)) + var bezier : Vector2 = Commons.sdBezier(uv, Vector2(a.x + 0.5, a.y + 0.5), Vector2(b.x + 0.5, b.y + 0.5), Vector2(c.x + 0.5, c.y + 0.5)) #vec2 $(name_uv)_uv = vec2($(name_uv)_bezier.x, $(name_uv)_bezier.y / $width+0.5); var new_uv : Vector2 = Vector2(bezier.x, bezier.y / width + 0.5) diff --git a/game/addons/mat_maker_gd/nodes/simple/shape.gd b/game/addons/mat_maker_gd/nodes/simple/shape.gd index 0104274c..4f45b5dc 100644 --- a/game/addons/mat_maker_gd/nodes/simple/shape.gd +++ b/game/addons/mat_maker_gd/nodes/simple/shape.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Shapes = preload("res://addons/mat_maker_gd/nodes/common/shapes.gd") +var Shapes = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") enum ShapeType { SHAPE_TYPE_CIRCLE = 0, diff --git a/game/addons/mat_maker_gd/nodes/transform/circle_map.gd b/game/addons/mat_maker_gd/nodes/transform/circle_map.gd index fb8e7103..d6fb35df 100644 --- a/game/addons/mat_maker_gd/nodes/transform/circle_map.gd +++ b/game/addons/mat_maker_gd/nodes/transform/circle_map.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Transforms = preload("res://addons/mat_maker_gd/nodes/common/transforms.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/transform/color_tiler.gd b/game/addons/mat_maker_gd/nodes/transform/color_tiler.gd index 79e4765a..03bebcce 100644 --- a/game/addons/mat_maker_gd/nodes/transform/color_tiler.gd +++ b/game/addons/mat_maker_gd/nodes/transform/color_tiler.gd @@ -1,7 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var in_mask : Resource diff --git a/game/addons/mat_maker_gd/nodes/transform/kaleidoscope.gd b/game/addons/mat_maker_gd/nodes/transform/kaleidoscope.gd index a784f9b7..b20e16f5 100644 --- a/game/addons/mat_maker_gd/nodes/transform/kaleidoscope.gd +++ b/game/addons/mat_maker_gd/nodes/transform/kaleidoscope.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Transforms = preload("res://addons/mat_maker_gd/nodes/common/transforms.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -42,7 +41,7 @@ func _render(material) -> void: func get_value_for(uv : Vector2, pseed : int) -> Color: #$i(kal_rotate($uv, $count, $offset)) - return input.get_value(Transforms.kal_rotate(uv, count, offset)) + return input.get_value(Commons.kal_rotate(uv, count, offset)) #count func get_count() -> int: diff --git a/game/addons/mat_maker_gd/nodes/transform/mirror.gd b/game/addons/mat_maker_gd/nodes/transform/mirror.gd index a0413e4f..bcb963e6 100644 --- a/game/addons/mat_maker_gd/nodes/transform/mirror.gd +++ b/game/addons/mat_maker_gd/nodes/transform/mirror.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Transforms = preload("res://addons/mat_maker_gd/nodes/common/transforms.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -44,9 +43,9 @@ func get_value_for(uv : Vector2, pseed : int) -> Color: #$i(uvmirror_$direction($uv, $offset)) if direction == 0: - return input.get_value(Transforms.uvmirror_h(uv, offset)) + return input.get_value(Commons.uvmirror_h(uv, offset)) elif direction == 1: - return input.get_value(Transforms.uvmirror_v(uv, offset)) + return input.get_value(Commons.uvmirror_v(uv, offset)) return Color(0, 0, 0, 1) diff --git a/game/addons/mat_maker_gd/nodes/transform/repeat.gd b/game/addons/mat_maker_gd/nodes/transform/repeat.gd index 5f0e3878..7621522d 100644 --- a/game/addons/mat_maker_gd/nodes/transform/repeat.gd +++ b/game/addons/mat_maker_gd/nodes/transform/repeat.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/transform/rotate.gd b/game/addons/mat_maker_gd/nodes/transform/rotate.gd index a2416a44..4fd41a8a 100644 --- a/game/addons/mat_maker_gd/nodes/transform/rotate.gd +++ b/game/addons/mat_maker_gd/nodes/transform/rotate.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Transforms = preload("res://addons/mat_maker_gd/nodes/common/transforms.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -42,7 +41,7 @@ func _render(material) -> void: func get_value_for(uv : Vector2, pseed : int) -> Color: #$i(rotate($uv, vec2(0.5+$cx, 0.5+$cy), $rotate*0.01745329251)) - return input.get_value(Transforms.rotate(uv, center + Vector2(0.5, 0.5), rotate*0.01745329251)) + return input.get_value(Commons.rotate(uv, center + Vector2(0.5, 0.5), rotate*0.01745329251)) #center func get_center() -> Vector2: diff --git a/game/addons/mat_maker_gd/nodes/transform/scale.gd b/game/addons/mat_maker_gd/nodes/transform/scale.gd index 8f8d1e4b..0e518b83 100644 --- a/game/addons/mat_maker_gd/nodes/transform/scale.gd +++ b/game/addons/mat_maker_gd/nodes/transform/scale.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Transforms = preload("res://addons/mat_maker_gd/nodes/common/transforms.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -42,7 +41,7 @@ func _render(material) -> void: func get_value_for(uv : Vector2, pseed : int) -> Color: #$i(scale($uv, vec2(0.5+$cx, 0.5+$cy), vec2($scale_x, $scale_y))) - return input.get_value(Transforms.scale(uv, center + Vector2(0.5, 0.5), scale)) + return input.get_value(Commons.scale(uv, center + Vector2(0.5, 0.5), scale)) #center func get_center() -> Vector2: diff --git a/game/addons/mat_maker_gd/nodes/transform/shear.gd b/game/addons/mat_maker_gd/nodes/transform/shear.gd index 98236eda..b2e979dc 100644 --- a/game/addons/mat_maker_gd/nodes/transform/shear.gd +++ b/game/addons/mat_maker_gd/nodes/transform/shear.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource diff --git a/game/addons/mat_maker_gd/nodes/transform/tiler.gd b/game/addons/mat_maker_gd/nodes/transform/tiler.gd index d6d75f3e..74ea7d89 100644 --- a/game/addons/mat_maker_gd/nodes/transform/tiler.gd +++ b/game/addons/mat_maker_gd/nodes/transform/tiler.gd @@ -1,7 +1,7 @@ tool extends MMNode -const Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") +const Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var input : Resource export(Resource) var in_mask : Resource diff --git a/game/addons/mat_maker_gd/nodes/transform/transform.gd b/game/addons/mat_maker_gd/nodes/transform/transform.gd index 94aab525..2d85106e 100644 --- a/game/addons/mat_maker_gd/nodes/transform/transform.gd +++ b/game/addons/mat_maker_gd/nodes/transform/transform.gd @@ -1,8 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") -var Transforms = preload("res://addons/mat_maker_gd/nodes/common/transforms.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource @@ -113,10 +112,10 @@ func get_value_for(uv : Vector2, pseed : int) -> Color: var rot : float = rotate.get_default_value() * 0.01745329251*(2.0 * rotate.get_value_or_zero(uv) - 1.0) var sc : Vector2 = Vector2(scale_x.get_default_value() *(2.0 * scale_x.get_value_or_zero(uv) - 1.0), scale_y.get_default_value() *(2.0 * scale_y.get_value_or_zero(uv) - 1.0)) - var nuv : Vector2 = Transforms.transform2(uv, tr, rot, sc) + var nuv : Vector2 = Commons.transform2(uv, tr, rot, sc) if mode == 0: - nuv = Transforms.transform2_clamp(nuv) + nuv = Commons.transform2_clamp(nuv) elif mode == 1: nuv = Commons.fractv2(nuv) diff --git a/game/addons/mat_maker_gd/nodes/transform/translate.gd b/game/addons/mat_maker_gd/nodes/transform/translate.gd index 8c03d04f..e0413b0c 100644 --- a/game/addons/mat_maker_gd/nodes/transform/translate.gd +++ b/game/addons/mat_maker_gd/nodes/transform/translate.gd @@ -1,7 +1,7 @@ tool extends MMNode -var Commons = preload("res://addons/mat_maker_gd/nodes/common/commons.gd") +var Commons = preload("res://addons/mat_maker_gd/nodes/common/m_m_algos.gd") export(Resource) var image : Resource export(Resource) var input : Resource