From 9375356924ec63decfac170e67feace33cca5ae6 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 19 Jun 2022 17:28:38 +0200 Subject: [PATCH] Temporarily disabled filter nodes to try to debug an issue with github actions. --- modules/material_maker/SCsub | 44 ++++----- .../material_maker/nodes/filter/tonality.h | 2 - modules/material_maker/register_types.cpp | 94 ++++++++++--------- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/modules/material_maker/SCsub b/modules/material_maker/SCsub index c64e4de75..d4dda17de 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/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/nodes/filter/tonality.h b/modules/material_maker/nodes/filter/tonality.h index 262fc42ba..a59bbc2e3 100644 --- a/modules/material_maker/nodes/filter/tonality.h +++ b/modules/material_maker/nodes/filter/tonality.h @@ -1,8 +1,6 @@ #ifndef MM_TONALITY_H #define MM_TONALITY_H -#include "core/math/vector2.h" - #include "../bases/curve_base.h" #include "../mm_node_universal_property.h" diff --git a/modules/material_maker/register_types.cpp b/modules/material_maker/register_types.cpp index eab49e649..fc5ac10b9 100644 --- a/modules/material_maker/register_types.cpp +++ b/modules/material_maker/register_types.cpp @@ -130,6 +130,7 @@ 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" @@ -152,6 +153,7 @@ SOFTWARE. #include "nodes/filter/quantize.h" #include "nodes/filter/swap_channels.h" #include "nodes/filter/tonality.h" +*/ static _MMAlgos *_mm_algos_singleton = nullptr; @@ -325,52 +327,52 @@ void register_material_maker_types() { MMAlgos::register_node_class("Gradient", "MMGradient"); 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()));