[Bf-blender-cvs] [5ef5a9fc246] master: Compositor: Migrate most nodes to new socket builder API
Aaron Carlisle
noreply at git.blender.org
Sat Dec 4 02:26:47 CET 2021
Commit: 5ef5a9fc24668aa264fe0558db9c0fb1246aa37f
Author: Aaron Carlisle
Date: Fri Dec 3 20:26:10 2021 -0500
Branches: master
https://developer.blender.org/rB5ef5a9fc24668aa264fe0558db9c0fb1246aa37f
Compositor: Migrate most nodes to new socket builder API
This patch leaves a out a few nodes:
- Group Nodes
- Image input node
- File output node
- Switch View
- Cryptomatte
These nodes above are a bit more complicated and should be worked on individually.
Differential Revision: https://developer.blender.org/D13266
===================================================================
M source/blender/nodes/composite/nodes/node_composite_alphaOver.cc
M source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
M source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
M source/blender/nodes/composite/nodes/node_composite_blur.cc
M source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
M source/blender/nodes/composite/nodes/node_composite_boxmask.cc
M source/blender/nodes/composite/nodes/node_composite_channelMatte.cc
M source/blender/nodes/composite/nodes/node_composite_chromaMatte.cc
M source/blender/nodes/composite/nodes/node_composite_colorMatte.cc
M source/blender/nodes/composite/nodes/node_composite_colorSpill.cc
M source/blender/nodes/composite/nodes/node_composite_cornerpin.cc
M source/blender/nodes/composite/nodes/node_composite_crop.cc
M source/blender/nodes/composite/nodes/node_composite_curves.cc
M source/blender/nodes/composite/nodes/node_composite_defocus.cc
M source/blender/nodes/composite/nodes/node_composite_denoise.cc
M source/blender/nodes/composite/nodes/node_composite_despeckle.cc
M source/blender/nodes/composite/nodes/node_composite_diffMatte.cc
M source/blender/nodes/composite/nodes/node_composite_dilate.cc
M source/blender/nodes/composite/nodes/node_composite_directionalblur.cc
M source/blender/nodes/composite/nodes/node_composite_displace.cc
M source/blender/nodes/composite/nodes/node_composite_distanceMatte.cc
M source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.cc
M source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
M source/blender/nodes/composite/nodes/node_composite_filter.cc
M source/blender/nodes/composite/nodes/node_composite_flip.cc
M source/blender/nodes/composite/nodes/node_composite_glare.cc
M source/blender/nodes/composite/nodes/node_composite_inpaint.cc
M source/blender/nodes/composite/nodes/node_composite_keying.cc
M source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc
M source/blender/nodes/composite/nodes/node_composite_lensdist.cc
M source/blender/nodes/composite/nodes/node_composite_lummaMatte.cc
M source/blender/nodes/composite/nodes/node_composite_mapRange.cc
M source/blender/nodes/composite/nodes/node_composite_mapUV.cc
M source/blender/nodes/composite/nodes/node_composite_mapValue.cc
M source/blender/nodes/composite/nodes/node_composite_math.cc
M source/blender/nodes/composite/nodes/node_composite_mixrgb.cc
M source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc
M source/blender/nodes/composite/nodes/node_composite_normal.cc
M source/blender/nodes/composite/nodes/node_composite_normalize.cc
M source/blender/nodes/composite/nodes/node_composite_pixelate.cc
M source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc
M source/blender/nodes/composite/nodes/node_composite_posterize.cc
M source/blender/nodes/composite/nodes/node_composite_rotate.cc
M source/blender/nodes/composite/nodes/node_composite_scale.cc
M source/blender/nodes/composite/nodes/node_composite_splitViewer.cc
M source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc
M source/blender/nodes/composite/nodes/node_composite_sunbeams.cc
M source/blender/nodes/composite/nodes/node_composite_switch.cc
M source/blender/nodes/composite/nodes/node_composite_transform.cc
M source/blender/nodes/composite/nodes/node_composite_translate.cc
M source/blender/nodes/composite/nodes/node_composite_vecBlur.cc
M source/blender/nodes/composite/nodes/node_composite_zcombine.cc
===================================================================
diff --git a/source/blender/nodes/composite/nodes/node_composite_alphaOver.cc b/source/blender/nodes/composite/nodes/node_composite_alphaOver.cc
index b6f64ed00c7..262333055d7 100644
--- a/source/blender/nodes/composite/nodes/node_composite_alphaOver.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_alphaOver.cc
@@ -25,16 +25,17 @@
/* **************** ALPHAOVER ******************** */
-static bNodeSocketTemplate cmp_node_alphaover_in[] = {
- {SOCK_FLOAT, N_("Fac"), 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, PROP_FACTOR},
- {SOCK_RGBA, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
- {SOCK_RGBA, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
- {-1, ""},
-};
-static bNodeSocketTemplate cmp_node_alphaover_out[] = {
- {SOCK_RGBA, N_("Image")},
- {-1, ""},
-};
+namespace blender::nodes {
+
+static void cmp_node_alphaover_declare(NodeDeclarationBuilder &b)
+{
+ b.add_input<decl::Float>(N_("Fac")).default_value(1.0f).min(0.0f).max(1.0f).subtype(PROP_FACTOR);
+ b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
+ b.add_input<decl::Color>(N_("Image"), "Image_001").default_value({1.0f, 1.0f, 1.0f, 1.0f});
+ b.add_output<decl::Color>(N_("Image"));
+}
+
+} // namespace blender::nodes
static void node_alphaover_init(bNodeTree *UNUSED(ntree), bNode *node)
{
@@ -46,7 +47,7 @@ void register_node_type_cmp_alphaover(void)
static bNodeType ntype;
cmp_node_type_base(&ntype, CMP_NODE_ALPHAOVER, "Alpha Over", NODE_CLASS_OP_COLOR, 0);
- node_type_socket_templates(&ntype, cmp_node_alphaover_in, cmp_node_alphaover_out);
+ ntype.declare = blender::nodes::cmp_node_alphaover_declare;
node_type_init(&ntype, node_alphaover_init);
node_type_storage(
&ntype, "NodeTwoFloats", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
index 23e63b9a53b..6adba7ee3bf 100644
--- a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc
@@ -27,10 +27,15 @@
/* **************** Anti-Aliasing (SMAA 1x) ******************** */
-static bNodeSocketTemplate cmp_node_antialiasing_in[] = {
- {SOCK_RGBA, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, {-1, ""}};
+namespace blender::nodes {
-static bNodeSocketTemplate cmp_node_antialiasing_out[] = {{SOCK_RGBA, N_("Image")}, {-1, ""}};
+static void cmp_node_antialiasing_declare(NodeDeclarationBuilder &b)
+{
+ b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
+ b.add_output<decl::Color>(N_("Image"));
+}
+
+} // namespace blender::nodes
static void node_composit_init_antialiasing(bNodeTree *UNUSED(ntree), bNode *node)
{
@@ -50,7 +55,7 @@ void register_node_type_cmp_antialiasing(void)
cmp_node_type_base(
&ntype, CMP_NODE_ANTIALIASING, "Anti-Aliasing", NODE_CLASS_OP_FILTER, NODE_PREVIEW);
- node_type_socket_templates(&ntype, cmp_node_antialiasing_in, cmp_node_antialiasing_out);
+ ntype.declare = blender::nodes::cmp_node_antialiasing_declare;
node_type_size(&ntype, 170, 140, 200);
node_type_init(&ntype, node_composit_init_antialiasing);
node_type_storage(
diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
index 3e724d17a10..3b1171ea11d 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc
@@ -24,15 +24,17 @@
#include "node_composite_util.hh"
/* **************** BILATERALBLUR ******************** */
-static bNodeSocketTemplate cmp_node_bilateralblur_in[] = {
- {SOCK_RGBA, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
- {SOCK_RGBA, N_("Determinator"), 1.0f, 1.0f, 1.0f, 1.0f},
- {-1, ""}};
-static bNodeSocketTemplate cmp_node_bilateralblur_out[] = {
- {SOCK_RGBA, N_("Image")},
- {-1, ""},
-};
+namespace blender::nodes {
+
+static void cmp_node_bilateralblur_declare(NodeDeclarationBuilder &b)
+{
+ b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
+ b.add_input<decl::Color>(N_("Determinator")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
+ b.add_output<decl::Color>(N_("Image"));
+}
+
+} // namespace blender::nodes
static void node_composit_init_bilateralblur(bNodeTree *UNUSED(ntree), bNode *node)
{
@@ -49,7 +51,7 @@ void register_node_type_cmp_bilateralblur(void)
static bNodeType ntype;
cmp_node_type_base(&ntype, CMP_NODE_BILATERALBLUR, "Bilateral Blur", NODE_CLASS_OP_FILTER, 0);
- node_type_socket_templates(&ntype, cmp_node_bilateralblur_in, cmp_node_bilateralblur_out);
+ ntype.declare = blender::nodes::cmp_node_bilateralblur_declare;
node_type_init(&ntype, node_composit_init_bilateralblur);
node_type_storage(
&ntype, "NodeBilateralBlurData", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc
index c5c0c21929e..5cc19416471 100644
--- a/source/blender/nodes/composite/nodes/node_composite_blur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc
@@ -25,11 +25,17 @@
#include "node_composite_util.hh"
/* **************** BLUR ******************** */
-static bNodeSocketTemplate cmp_node_blur_in[] = {
- {SOCK_RGBA, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
- {SOCK_FLOAT, N_("Size"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, PROP_NONE},
- {-1, ""}};
-static bNodeSocketTemplate cmp_node_blur_out[] = {{SOCK_RGBA, N_("Image")}, {-1, ""}};
+
+namespace blender::nodes {
+
+static void cmp_node_blur_declare(NodeDeclarationBuilder &b)
+{
+ b.add_input<decl::Color>(N_("Image")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
+ b.add_input<decl::Float>(N_("Size")).default_value(1.0f).min(0.0f).max(1.0f);
+ b.add_output<decl::Color>(N_("Image"));
+}
+
+} // namespace blender::nodes
static void node_composit_init_blur(bNodeTree *UNUSED(ntree), bNode *node)
{
@@ -43,7 +49,7 @@ void register_node_type_cmp_blur(void)
static bNodeType ntype;
cmp_node_type_base(&ntype, CMP_NODE_BLUR, "Blur", NODE_CLASS_OP_FILTER, NODE_PREVIEW);
- node_type_socket_templates(&ntype, cmp_node_blur_in, cmp_node_blur_out);
+ ntype.declare = blender::nodes::cmp_node_blur_declare;
node_type_init(&ntype, node_composit_init_blur);
node_type_storage(
&ntype, "NodeBlurData", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
index f130a642e20..9099cae37f1 100644
--- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc
@@ -25,15 +25,19 @@
#include "../node_composite_util.hh"
/* **************** BLUR ******************** */
-static bNodeSocketTemplate cmp_node_bokehblur_in[] = {
- {SOCK_RGBA, N_("Image"), 0.8f, 0.8f, 0.8f, 1.0f, 0.0f, 1.0f},
- {SOCK_RGBA, N_("Bokeh"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
- {SOCK_FLOAT, N_("Size"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 10.0f},
- {SOCK_FLOAT, N_("Bounding box"), 1.0f, 1.0f, 1.0f, 1.0f, 0.0f, 1.0f},
- {-1, ""}};
-static bNodeSocketTemplate cmp_node_bokehblur_out[] = {
- {SOCK_RGBA, N_("Image"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, {-1, ""}};
+namespace blender::nodes {
+
+static void cmp_node_bokehblur_declare(NodeDeclarationBuilder &b)
+{
+ b.add_input<decl::Color>(N_("Image")).default_value({0.8f, 0.8f, 0.8f, 1.0f});
+ b.add_input<decl::Color>(N_("Bokeh")).default_value({1.0f, 1.0f, 1.0f, 1.0f});
+ b.add_input<decl::Float>(N_("Size")).default_value(1.0f).min(0.0f).max(10.0f);
+ b.add_input<decl::Float>(N_("Bounding box")).default_value(1.0f).min(0.0f).max(1.0f);
+ b.add_output<decl::Color>(N_("Image"));
+}
+
+} // namespace blender::nodes
static void node_composit_init_bokehblur(bNodeTree *UNUSED(ntree), bNode *node)
{
@@ -46,7 +50,7 @@ void register_node_type_cmp_bokehblur(void)
static bNodeType ntype;
cmp_node_type_base(&ntype, CMP_NODE_BOKEHBLUR, "Bokeh Blur", NODE_CLASS_OP_FILTER, 0);
- node_type_socket_templates(&ntype, cmp_node_bokehblur_in, cmp_node_bokehblur_out);
+ ntype.declare = blender::nodes::cmp_node_bokehblur_declare;
node_type_init(&ntype, node_composit_init_bokehblur);
nodeRegisterType(&ntype);
diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
index cdf96065f97..b4d2a4dba2a 100644
--- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc
@@ -24,13 +24,17 @@
#include "../node_composite_util.hh"
/* **************** SCALAR MATH ******************** */
-static bNodeSocketTemplate cmp_node_boxmask_in[] = {
- {SOCK_FLOAT, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
- {SOCK_FLOAT, N_("Value"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f},
- {-1, ""}};
-static bNodeSocketTemplate cmp_node_boxmask_out[] = {
- {SOCK_FLOAT, N_("Mask"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f}, {-1, ""}};
+namespace blender::nodes {
+
+static void cmp_node_boxmask_declare(NodeDeclarationBuilder &b)
+{
+ b.add_input<decl::Float>(N_("Mask")).default_value(0.0f).min(0.0f).max(1.0f);
+ b.add_input<decl::Float>(N_("Value")).default_value(1.0f).min(0.0f).max(1.0f);
+ b.add_output<decl::Float>(N_("Mask"));
+}
+
+} // namespace blender::nodes
static void node_composit_init_boxmask(bNodeTree *UNUSED(ntree), bNode *node)
{
@@ -48,7 +52,7 @@ void register_node_type_cmp_boxmask(void)
static bNodeType ntype;
cmp_node_type_base(&ntype, CMP_NODE_MASK_BOX, "Box Mask", NODE_CLASS_MATTE, 0);
- node_type_socket_templates(&ntype, cmp_node_boxmask_in, cmp_node_boxmask_out);
+ ntype.declare = blender::nodes::cmp_node_boxmask_declare;
node_type_init(&ntype, node_composit_init_boxmask);
node_type_storage(&ntype, "NodeBoxMask", node_free_standard_storage, node_copy_standard_storage);
diff --git a/source/blender
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list