diff --git a/modules/material_maker/SCsub b/modules/material_maker/SCsub index e95df6224..fa8dd65bb 100644 --- a/modules/material_maker/SCsub +++ b/modules/material_maker/SCsub @@ -136,20 +136,20 @@ sources = [ "nodes/gradient/gradient.cpp", "nodes/gradient/circular_gradient.cpp", - "nodes/filter/tonality.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/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", diff --git a/modules/material_maker/register_types.cpp b/modules/material_maker/register_types.cpp index 4565bc211..ece514c2a 100644 --- a/modules/material_maker/register_types.cpp +++ b/modules/material_maker/register_types.cpp @@ -139,6 +139,7 @@ SOFTWARE. #include "nodes/filter/combine.h" #include "nodes/filter/decompose.h" #include "nodes/filter/emboss.h" +*/ #include "nodes/filter/fill_channel.h" #include "nodes/filter/fill_to_color.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_size.h" #include "nodes/filter/fill_to_uv.h" +/* #include "nodes/filter/greyscale.h" #include "nodes/filter/invert.h" #include "nodes/filter/make_tileable.h" #include "nodes/filter/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,52 +330,55 @@ 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(); - MMAlgos::register_node_class("Filter", "MMFillToUv"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMFillToSize"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMFillToRandomGrey"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMFillToRandomColor"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMFillToPosition"); - ClassDB::register_class(); - MMAlgos::register_node_class("Filter", "MMFillToColor"); - 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"); - */ + 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"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMFillToRandomGrey"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMFillToRandomColor"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMFillToPosition"); + ClassDB::register_class(); + MMAlgos::register_node_class("Filter", "MMFillToColor"); + 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"); + */ _mm_algos_singleton = memnew(_MMAlgos); Engine::get_singleton()->add_singleton(Engine::Singleton("MMAlgos", _MMAlgos::get_singleton()));