From 3283f1d6491e2c66aef45188badad5aca33fbcc1 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 19 Jun 2022 18:38:35 +0200 Subject: [PATCH] Re-enabled all filter nodes. --- modules/material_maker/SCsub | 44 +++++++-------- modules/material_maker/register_types.cpp | 67 +++++++++++------------ 2 files changed, 54 insertions(+), 57 deletions(-) diff --git a/modules/material_maker/SCsub b/modules/material_maker/SCsub index d4dda17de..998cdba5e 100644 --- a/modules/material_maker/SCsub +++ b/modules/material_maker/SCsub @@ -136,28 +136,28 @@ sources = [ "nodes/gradient/gradient.cpp", "nodes/gradient/circular_gradient.cpp", - #"nodes/filter/tonality.cpp", - #"nodes/filter/swap_channels.cpp", - #"nodes/filter/quantize.cpp", - #"nodes/filter/math.cpp", - #"nodes/filter/make_tileable.cpp", - #"nodes/filter/invert.cpp", - #"nodes/filter/greyscale.cpp", - #"nodes/filter/fill_to_uv.cpp", - #"nodes/filter/fill_to_size.cpp", - #"nodes/filter/fill_to_random_grey.cpp", - #"nodes/filter/fill_to_random_color.cpp", - #"nodes/filter/fill_to_position.cpp", - #"nodes/filter/fill_to_color.cpp", - #"nodes/filter/fill_channel.cpp", - #"nodes/filter/emboss.cpp", - #"nodes/filter/decompose.cpp", - #"nodes/filter/combine.cpp", - #"nodes/filter/colorize.cpp", - #"nodes/filter/brightness_contrast.cpp", - #"nodes/filter/blur_gaussian.cpp", - #"nodes/filter/blend.cpp", - #"nodes/filter/adjust_hsv.cpp", + "nodes/filter/tonality.cpp", + "nodes/filter/swap_channels.cpp", + "nodes/filter/quantize.cpp", + "nodes/filter/mm_math.cpp", + "nodes/filter/make_tileable.cpp", + "nodes/filter/invert.cpp", + "nodes/filter/greyscale.cpp", + "nodes/filter/fill_to_uv.cpp", + "nodes/filter/fill_to_size.cpp", + "nodes/filter/fill_to_random_grey.cpp", + "nodes/filter/fill_to_random_color.cpp", + "nodes/filter/fill_to_position.cpp", + "nodes/filter/fill_to_color.cpp", + "nodes/filter/fill_channel.cpp", + "nodes/filter/emboss.cpp", + "nodes/filter/decompose.cpp", + "nodes/filter/combine.cpp", + "nodes/filter/colorize.cpp", + "nodes/filter/brightness_contrast.cpp", + "nodes/filter/blur_gaussian.cpp", + "nodes/filter/blend.cpp", + "nodes/filter/adjust_hsv.cpp", ] if env["tools"]: diff --git a/modules/material_maker/register_types.cpp b/modules/material_maker/register_types.cpp index 948e94c98..4a974fc25 100644 --- a/modules/material_maker/register_types.cpp +++ b/modules/material_maker/register_types.cpp @@ -130,7 +130,6 @@ SOFTWARE. #include "nodes/gradient/gradient.h" #include "nodes/gradient/radial_gradient.h" -/* #include "nodes/filter/adjust_hsv.h" #include "nodes/filter/blend.h" #include "nodes/filter/blur_gaussian.h" @@ -149,11 +148,10 @@ SOFTWARE. #include "nodes/filter/greyscale.h" #include "nodes/filter/invert.h" #include "nodes/filter/make_tileable.h" -#include "nodes/filter/math.h" +#include "nodes/filter/mm_math.h" #include "nodes/filter/quantize.h" #include "nodes/filter/swap_channels.h" #include "nodes/filter/tonality.h" -*/ static _MMAlgos *_mm_algos_singleton = nullptr; @@ -328,22 +326,21 @@ void register_material_maker_types() { ClassDB::register_class(); MMAlgos::register_node_class("Gradient", "MMCircularGradient"); - /* - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMTonality"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMSwapChannels"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMQuantize"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMMath"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMMakeTileable"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMInvert"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMGreyscale"); - ClassDB::register_class(); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMTonality"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMSwapChannels"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMQuantize"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMMath"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMMakeTileable"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMInvert"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMGreyscale"); + ClassDB::register_class(); MMAlgos::register_node_class("Filter", "MMFillToUv"); ClassDB::register_class(); MMAlgos::register_node_class("Filter", "MMFillToSize"); @@ -358,22 +355,22 @@ void register_material_maker_types() { ClassDB::register_class(); MMAlgos::register_node_class("Filter", "MMFillChannel"); ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMEmboss"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMDecompose"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMCombine"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMColorize"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMBrightnessContrast"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMBlurGaussian"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMBlend"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMAdjustHsv"); - */ + MMAlgos::register_node_class("Filter", "MMEmboss"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMDecompose"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMCombine"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMColorize"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMBrightnessContrast"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMBlurGaussian"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMBlend"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMAdjustHsv"); + _mm_algos_singleton = memnew(_MMAlgos); Engine::get_singleton()->add_singleton(Engine::Singleton("MMAlgos", _MMAlgos::get_singleton()));