Enabled the fill nodes and disabled tonality.

This commit is contained in:
Relintai 2022-06-19 18:10:55 +02:00
parent f1226b3519
commit 08529315ca
2 changed files with 59 additions and 54 deletions

View File

@ -136,20 +136,20 @@ sources = [
"nodes/gradient/gradient.cpp", "nodes/gradient/gradient.cpp",
"nodes/gradient/circular_gradient.cpp", "nodes/gradient/circular_gradient.cpp",
"nodes/filter/tonality.cpp", #"nodes/filter/tonality.cpp",
#"nodes/filter/swap_channels.cpp", #"nodes/filter/swap_channels.cpp",
#"nodes/filter/quantize.cpp", #"nodes/filter/quantize.cpp",
#"nodes/filter/math.cpp", #"nodes/filter/math.cpp",
#"nodes/filter/make_tileable.cpp", #"nodes/filter/make_tileable.cpp",
#"nodes/filter/invert.cpp", #"nodes/filter/invert.cpp",
#"nodes/filter/greyscale.cpp", #"nodes/filter/greyscale.cpp",
#"nodes/filter/fill_to_uv.cpp", "nodes/filter/fill_to_uv.cpp",
#"nodes/filter/fill_to_size.cpp", "nodes/filter/fill_to_size.cpp",
#"nodes/filter/fill_to_random_grey.cpp", "nodes/filter/fill_to_random_grey.cpp",
#"nodes/filter/fill_to_random_color.cpp", "nodes/filter/fill_to_random_color.cpp",
#"nodes/filter/fill_to_position.cpp", "nodes/filter/fill_to_position.cpp",
#"nodes/filter/fill_to_color.cpp", "nodes/filter/fill_to_color.cpp",
#"nodes/filter/fill_channel.cpp", "nodes/filter/fill_channel.cpp",
#"nodes/filter/emboss.cpp", #"nodes/filter/emboss.cpp",
#"nodes/filter/decompose.cpp", #"nodes/filter/decompose.cpp",
#"nodes/filter/combine.cpp", #"nodes/filter/combine.cpp",

View File

@ -139,6 +139,7 @@ SOFTWARE.
#include "nodes/filter/combine.h" #include "nodes/filter/combine.h"
#include "nodes/filter/decompose.h" #include "nodes/filter/decompose.h"
#include "nodes/filter/emboss.h" #include "nodes/filter/emboss.h"
*/
#include "nodes/filter/fill_channel.h" #include "nodes/filter/fill_channel.h"
#include "nodes/filter/fill_to_color.h" #include "nodes/filter/fill_to_color.h"
#include "nodes/filter/fill_to_position.h" #include "nodes/filter/fill_to_position.h"
@ -146,14 +147,15 @@ SOFTWARE.
#include "nodes/filter/fill_to_random_grey.h" #include "nodes/filter/fill_to_random_grey.h"
#include "nodes/filter/fill_to_size.h" #include "nodes/filter/fill_to_size.h"
#include "nodes/filter/fill_to_uv.h" #include "nodes/filter/fill_to_uv.h"
/*
#include "nodes/filter/greyscale.h" #include "nodes/filter/greyscale.h"
#include "nodes/filter/invert.h" #include "nodes/filter/invert.h"
#include "nodes/filter/make_tileable.h" #include "nodes/filter/make_tileable.h"
#include "nodes/filter/math.h" #include "nodes/filter/math.h"
#include "nodes/filter/quantize.h" #include "nodes/filter/quantize.h"
#include "nodes/filter/swap_channels.h" #include "nodes/filter/swap_channels.h"
*/
#include "nodes/filter/tonality.h" #include "nodes/filter/tonality.h"
*/
static _MMAlgos *_mm_algos_singleton = nullptr; static _MMAlgos *_mm_algos_singleton = nullptr;
@ -328,52 +330,55 @@ void register_material_maker_types() {
ClassDB::register_class<MMCircularGradient>(); ClassDB::register_class<MMCircularGradient>();
MMAlgos::register_node_class("Gradient", "MMCircularGradient"); MMAlgos::register_node_class("Gradient", "MMCircularGradient");
ClassDB::register_class<MMTonality>();
MMAlgos::register_node_class("Filter", "MMTonality");
/* /*
ClassDB::register_class<MMSwapChannels>(); ClassDB::register_class<MMTonality>();
MMAlgos::register_node_class("Filter", "MMSwapChannels"); MMAlgos::register_node_class("Filter", "MMTonality");
ClassDB::register_class<MMQuantize>();
MMAlgos::register_node_class("Filter", "MMQuantize"); ClassDB::register_class<MMSwapChannels>();
ClassDB::register_class<MMMath>(); MMAlgos::register_node_class("Filter", "MMSwapChannels");
MMAlgos::register_node_class("Filter", "MMMath"); ClassDB::register_class<MMQuantize>();
ClassDB::register_class<MMMakeTileable>(); MMAlgos::register_node_class("Filter", "MMQuantize");
MMAlgos::register_node_class("Filter", "MMMakeTileable"); ClassDB::register_class<MMMath>();
ClassDB::register_class<MMInvert>(); MMAlgos::register_node_class("Filter", "MMMath");
MMAlgos::register_node_class("Filter", "MMInvert"); ClassDB::register_class<MMMakeTileable>();
ClassDB::register_class<MMGreyscale>(); MMAlgos::register_node_class("Filter", "MMMakeTileable");
MMAlgos::register_node_class("Filter", "MMGreyscale"); ClassDB::register_class<MMInvert>();
ClassDB::register_class<MMFillToUv>(); MMAlgos::register_node_class("Filter", "MMInvert");
MMAlgos::register_node_class("Filter", "MMFillToUv"); ClassDB::register_class<MMGreyscale>();
ClassDB::register_class<MMFillToSize>(); MMAlgos::register_node_class("Filter", "MMGreyscale");
MMAlgos::register_node_class("Filter", "MMFillToSize"); ClassDB::register_class<MMFillToUv>();
ClassDB::register_class<MMFillToRandomGrey>(); */
MMAlgos::register_node_class("Filter", "MMFillToRandomGrey"); MMAlgos::register_node_class("Filter", "MMFillToUv");
ClassDB::register_class<MMFillToRandomColor>(); ClassDB::register_class<MMFillToSize>();
MMAlgos::register_node_class("Filter", "MMFillToRandomColor"); MMAlgos::register_node_class("Filter", "MMFillToSize");
ClassDB::register_class<MMFillToPosition>(); ClassDB::register_class<MMFillToRandomGrey>();
MMAlgos::register_node_class("Filter", "MMFillToPosition"); MMAlgos::register_node_class("Filter", "MMFillToRandomGrey");
ClassDB::register_class<MMFillToColor>(); ClassDB::register_class<MMFillToRandomColor>();
MMAlgos::register_node_class("Filter", "MMFillToColor"); MMAlgos::register_node_class("Filter", "MMFillToRandomColor");
ClassDB::register_class<MMFillChannel>(); ClassDB::register_class<MMFillToPosition>();
MMAlgos::register_node_class("Filter", "MMFillChannel"); MMAlgos::register_node_class("Filter", "MMFillToPosition");
ClassDB::register_class<MMEmboss>(); ClassDB::register_class<MMFillToColor>();
MMAlgos::register_node_class("Filter", "MMEmboss"); MMAlgos::register_node_class("Filter", "MMFillToColor");
ClassDB::register_class<MMDecompose>(); ClassDB::register_class<MMFillChannel>();
MMAlgos::register_node_class("Filter", "MMDecompose"); MMAlgos::register_node_class("Filter", "MMFillChannel");
ClassDB::register_class<MMCombine>(); /*
MMAlgos::register_node_class("Filter", "MMCombine"); ClassDB::register_class<MMEmboss>();
ClassDB::register_class<MMColorize>(); MMAlgos::register_node_class("Filter", "MMEmboss");
MMAlgos::register_node_class("Filter", "MMColorize"); ClassDB::register_class<MMDecompose>();
ClassDB::register_class<MMBrightnessContrast>(); MMAlgos::register_node_class("Filter", "MMDecompose");
MMAlgos::register_node_class("Filter", "MMBrightnessContrast"); ClassDB::register_class<MMCombine>();
ClassDB::register_class<MMBlurGaussian>(); MMAlgos::register_node_class("Filter", "MMCombine");
MMAlgos::register_node_class("Filter", "MMBlurGaussian"); ClassDB::register_class<MMColorize>();
ClassDB::register_class<MMBlend>(); MMAlgos::register_node_class("Filter", "MMColorize");
MMAlgos::register_node_class("Filter", "MMBlend"); ClassDB::register_class<MMBrightnessContrast>();
ClassDB::register_class<MMAdjustHsv>(); MMAlgos::register_node_class("Filter", "MMBrightnessContrast");
MMAlgos::register_node_class("Filter", "MMAdjustHsv"); ClassDB::register_class<MMBlurGaussian>();
*/ MMAlgos::register_node_class("Filter", "MMBlurGaussian");
ClassDB::register_class<MMBlend>();
MMAlgos::register_node_class("Filter", "MMBlend");
ClassDB::register_class<MMAdjustHsv>();
MMAlgos::register_node_class("Filter", "MMAdjustHsv");
*/
_mm_algos_singleton = memnew(_MMAlgos); _mm_algos_singleton = memnew(_MMAlgos);
Engine::get_singleton()->add_singleton(Engine::Singleton("MMAlgos", _MMAlgos::get_singleton())); Engine::get_singleton()->add_singleton(Engine::Singleton("MMAlgos", _MMAlgos::get_singleton()));