From 2e6ae113263d429ca3c933a5e869a48c81994867 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Mon, 27 Dec 2021 18:29:21 -0500 Subject: Nodes: Add bf_nodes_composite module In the future this will be used to support unity builds for composite nodes Differential Revision: https://developer.blender.org/D13678 --- source/blender/nodes/CMakeLists.txt | 102 +----------------- source/blender/nodes/composite/CMakeLists.txt | 150 ++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 100 deletions(-) create mode 100644 source/blender/nodes/composite/CMakeLists.txt (limited to 'source') diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt index 2e2ff874f20..b3318685e4c 100644 --- a/source/blender/nodes/CMakeLists.txt +++ b/source/blender/nodes/CMakeLists.txt @@ -18,6 +18,7 @@ # All rights reserved. # ***** END GPL LICENSE BLOCK ***** +add_subdirectory(composite) add_subdirectory(geometry) add_subdirectory(shader) @@ -49,94 +50,6 @@ set(INC set(SRC - composite/nodes/node_composite_alphaOver.cc - composite/nodes/node_composite_antialiasing.cc - composite/nodes/node_composite_bilateralblur.cc - composite/nodes/node_composite_blur.cc - composite/nodes/node_composite_bokehblur.cc - composite/nodes/node_composite_bokehimage.cc - composite/nodes/node_composite_boxmask.cc - composite/nodes/node_composite_brightness.cc - composite/nodes/node_composite_channelMatte.cc - composite/nodes/node_composite_chromaMatte.cc - composite/nodes/node_composite_colorMatte.cc - composite/nodes/node_composite_colorSpill.cc - composite/nodes/node_composite_colorbalance.cc - composite/nodes/node_composite_colorcorrection.cc - composite/nodes/node_composite_common.cc - composite/nodes/node_composite_composite.cc - composite/nodes/node_composite_cornerpin.cc - composite/nodes/node_composite_crop.cc - composite/nodes/node_composite_cryptomatte.cc - composite/nodes/node_composite_curves.cc - composite/nodes/node_composite_defocus.cc - composite/nodes/node_composite_denoise.cc - composite/nodes/node_composite_despeckle.cc - composite/nodes/node_composite_diffMatte.cc - composite/nodes/node_composite_dilate.cc - composite/nodes/node_composite_directionalblur.cc - composite/nodes/node_composite_displace.cc - composite/nodes/node_composite_distanceMatte.cc - composite/nodes/node_composite_doubleEdgeMask.cc - composite/nodes/node_composite_ellipsemask.cc - composite/nodes/node_composite_exposure.cc - composite/nodes/node_composite_filter.cc - composite/nodes/node_composite_flip.cc - composite/nodes/node_composite_gamma.cc - composite/nodes/node_composite_glare.cc - composite/nodes/node_composite_hueSatVal.cc - composite/nodes/node_composite_huecorrect.cc - composite/nodes/node_composite_idMask.cc - composite/nodes/node_composite_image.cc - composite/nodes/node_composite_inpaint.cc - composite/nodes/node_composite_invert.cc - composite/nodes/node_composite_keying.cc - composite/nodes/node_composite_keyingscreen.cc - composite/nodes/node_composite_lensdist.cc - composite/nodes/node_composite_levels.cc - composite/nodes/node_composite_lummaMatte.cc - composite/nodes/node_composite_mapRange.cc - composite/nodes/node_composite_mapUV.cc - composite/nodes/node_composite_mapValue.cc - composite/nodes/node_composite_mask.cc - composite/nodes/node_composite_math.cc - composite/nodes/node_composite_mixrgb.cc - composite/nodes/node_composite_movieclip.cc - composite/nodes/node_composite_moviedistortion.cc - composite/nodes/node_composite_normal.cc - composite/nodes/node_composite_normalize.cc - composite/nodes/node_composite_outputFile.cc - composite/nodes/node_composite_pixelate.cc - composite/nodes/node_composite_planetrackdeform.cc - composite/nodes/node_composite_posterize.cc - composite/nodes/node_composite_premulkey.cc - composite/nodes/node_composite_rgb.cc - composite/nodes/node_composite_rotate.cc - composite/nodes/node_composite_scale.cc - composite/nodes/node_composite_sepcombHSVA.cc - composite/nodes/node_composite_sepcombRGBA.cc - composite/nodes/node_composite_sepcombYCCA.cc - composite/nodes/node_composite_sepcombYUVA.cc - composite/nodes/node_composite_setalpha.cc - composite/nodes/node_composite_splitViewer.cc - composite/nodes/node_composite_stabilize2d.cc - composite/nodes/node_composite_sunbeams.cc - composite/nodes/node_composite_switch.cc - composite/nodes/node_composite_switchview.cc - composite/nodes/node_composite_texture.cc - composite/nodes/node_composite_tonemap.cc - composite/nodes/node_composite_trackpos.cc - composite/nodes/node_composite_transform.cc - composite/nodes/node_composite_translate.cc - composite/nodes/node_composite_valToRgb.cc - composite/nodes/node_composite_value.cc - composite/nodes/node_composite_vecBlur.cc - composite/nodes/node_composite_viewer.cc - composite/nodes/node_composite_zcombine.cc - - composite/node_composite_tree.cc - composite/node_composite_util.cc - function/nodes/legacy/node_fn_random_float.cc function/nodes/node_fn_align_euler_to_vector.cc @@ -197,7 +110,6 @@ set(SRC intern/node_tree_ref.cc intern/node_util.c - composite/node_composite_util.hh function/node_function_util.hh texture/node_texture_util.h @@ -227,6 +139,7 @@ set(SRC set(LIB bf_bmesh bf_functions + bf_nodes_composite bf_nodes_geometry bf_nodes_shader ) @@ -282,13 +195,6 @@ if(WITH_IMAGE_OPENEXR) add_definitions(-DWITH_OPENEXR) endif() -if(WITH_COMPOSITOR) - list(APPEND INC - ../compositor - ) - add_definitions(-DWITH_COMPOSITOR) -endif() - if(WITH_FREESTYLE) add_definitions(-DWITH_FREESTYLE) endif() @@ -316,8 +222,4 @@ if(WITH_OPENVDB) add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS}) endif() -if(WITH_OPENIMAGEDENOISE) - add_definitions(-DWITH_OPENIMAGEDENOISE) -endif() - blender_add_lib(bf_nodes "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") diff --git a/source/blender/nodes/composite/CMakeLists.txt b/source/blender/nodes/composite/CMakeLists.txt new file mode 100644 index 00000000000..e9fc24bbbee --- /dev/null +++ b/source/blender/nodes/composite/CMakeLists.txt @@ -0,0 +1,150 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2021, Blender Foundation +# All rights reserved. +# ***** END GPL LICENSE BLOCK ***** + +set(INC + . + ../ + ../intern + ../../editors/include + ../../blenkernel + ../../blenlib + ../../blentranslation + ../../depsgraph + ../../imbuf + ../../makesdna + ../../makesrna + ../../render + ../../windowmanager + ../../../../intern/guardedalloc +) + + +set(SRC + nodes/node_composite_alphaOver.cc + nodes/node_composite_antialiasing.cc + nodes/node_composite_bilateralblur.cc + nodes/node_composite_blur.cc + nodes/node_composite_bokehblur.cc + nodes/node_composite_bokehimage.cc + nodes/node_composite_boxmask.cc + nodes/node_composite_brightness.cc + nodes/node_composite_channelMatte.cc + nodes/node_composite_chromaMatte.cc + nodes/node_composite_colorMatte.cc + nodes/node_composite_colorSpill.cc + nodes/node_composite_colorbalance.cc + nodes/node_composite_colorcorrection.cc + nodes/node_composite_common.cc + nodes/node_composite_composite.cc + nodes/node_composite_cornerpin.cc + nodes/node_composite_crop.cc + nodes/node_composite_cryptomatte.cc + nodes/node_composite_curves.cc + nodes/node_composite_defocus.cc + nodes/node_composite_denoise.cc + nodes/node_composite_despeckle.cc + nodes/node_composite_diffMatte.cc + nodes/node_composite_dilate.cc + nodes/node_composite_directionalblur.cc + nodes/node_composite_displace.cc + nodes/node_composite_distanceMatte.cc + nodes/node_composite_doubleEdgeMask.cc + nodes/node_composite_ellipsemask.cc + nodes/node_composite_exposure.cc + nodes/node_composite_filter.cc + nodes/node_composite_flip.cc + nodes/node_composite_gamma.cc + nodes/node_composite_glare.cc + nodes/node_composite_hueSatVal.cc + nodes/node_composite_huecorrect.cc + nodes/node_composite_idMask.cc + nodes/node_composite_image.cc + nodes/node_composite_inpaint.cc + nodes/node_composite_invert.cc + nodes/node_composite_keying.cc + nodes/node_composite_keyingscreen.cc + nodes/node_composite_lensdist.cc + nodes/node_composite_levels.cc + nodes/node_composite_lummaMatte.cc + nodes/node_composite_mapRange.cc + nodes/node_composite_mapUV.cc + nodes/node_composite_mapValue.cc + nodes/node_composite_mask.cc + nodes/node_composite_math.cc + nodes/node_composite_mixrgb.cc + nodes/node_composite_movieclip.cc + nodes/node_composite_moviedistortion.cc + nodes/node_composite_normal.cc + nodes/node_composite_normalize.cc + nodes/node_composite_outputFile.cc + nodes/node_composite_pixelate.cc + nodes/node_composite_planetrackdeform.cc + nodes/node_composite_posterize.cc + nodes/node_composite_premulkey.cc + nodes/node_composite_rgb.cc + nodes/node_composite_rotate.cc + nodes/node_composite_scale.cc + nodes/node_composite_sepcombHSVA.cc + nodes/node_composite_sepcombRGBA.cc + nodes/node_composite_sepcombYCCA.cc + nodes/node_composite_sepcombYUVA.cc + nodes/node_composite_setalpha.cc + nodes/node_composite_splitViewer.cc + nodes/node_composite_stabilize2d.cc + nodes/node_composite_sunbeams.cc + nodes/node_composite_switch.cc + nodes/node_composite_switchview.cc + nodes/node_composite_texture.cc + nodes/node_composite_tonemap.cc + nodes/node_composite_trackpos.cc + nodes/node_composite_transform.cc + nodes/node_composite_translate.cc + nodes/node_composite_valToRgb.cc + nodes/node_composite_value.cc + nodes/node_composite_vecBlur.cc + nodes/node_composite_viewer.cc + nodes/node_composite_zcombine.cc + + node_composite_tree.cc + node_composite_util.cc + + node_composite_util.hh +) + +if(WITH_INTERNATIONAL) + add_definitions(-DWITH_INTERNATIONAL) +endif() + +if(WITH_IMAGE_OPENEXR) + add_definitions(-DWITH_OPENEXR) +endif() + +if(WITH_COMPOSITOR) + list(APPEND INC + ../../compositor + ) + add_definitions(-DWITH_COMPOSITOR) +endif() + +if(WITH_OPENIMAGEDENOISE) + add_definitions(-DWITH_OPENIMAGEDENOISE) +endif() + +blender_add_lib(bf_nodes_composite "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") -- cgit v1.2.3