[Bf-blender-cvs] [d10ea97053c] master: Compositor: New Posterize Node
Aaron Carlisle
noreply at git.blender.org
Sun Sep 5 21:24:50 CEST 2021
Commit: d10ea97053c5bca605d94ddb09dd2c5934fcccfb
Author: Aaron Carlisle
Date: Sun Sep 5 15:22:30 2021 -0400
Branches: master
https://developer.blender.org/rBd10ea97053c5bca605d94ddb09dd2c5934fcccfb
Compositor: New Posterize Node
The posterize node limits the number of colors per channel.
This is useful to generate masks or to generate stylized images
Both the tiled and full-frame implementation are included in this patch
{F10314012}
Reviewed By: manzanilla, jbakker
Differential Revision: https://developer.blender.org/D12304
===================================================================
M release/scripts/startup/nodeitems_builtins.py
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/intern/node.cc
M source/blender/compositor/CMakeLists.txt
M source/blender/compositor/intern/COM_Converter.cc
A source/blender/compositor/nodes/COM_PosterizeNode.cc
A source/blender/compositor/nodes/COM_PosterizeNode.h
A source/blender/compositor/operations/COM_PosterizeOperation.cc
A source/blender/compositor/operations/COM_PosterizeOperation.h
M source/blender/makesrna/RNA_access.h
M source/blender/nodes/CMakeLists.txt
M source/blender/nodes/NOD_composite.h
M source/blender/nodes/NOD_static_types.h
A source/blender/nodes/composite/nodes/node_composite_posterize.c
===================================================================
diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py
index d78023b4e0e..668ea4bfae5 100644
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@ -333,6 +333,7 @@ compositor_node_categories = [
NodeItem("CompositorNodeGamma"),
NodeItem("CompositorNodeExposure"),
NodeItem("CompositorNodeColorCorrection"),
+ NodeItem("CompositorNodePosterize"),
NodeItem("CompositorNodeTonemap"),
NodeItem("CompositorNodeZcombine"),
]),
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 5e0526ab262..b41fbae6075 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1255,6 +1255,7 @@ void ntreeGPUMaterialNodes(struct bNodeTree *localtree,
#define CMP_NODE_DENOISE 324
#define CMP_NODE_EXPOSURE 325
#define CMP_NODE_CRYPTOMATTE 326
+#define CMP_NODE_POSTERIZE 327
/* channel toggles */
#define CMP_CHAN_RGB 1
diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc
index 48d747e2bf3..be4fd7aac4f 100644
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@ -4919,6 +4919,7 @@ static void registerCompositNodes()
register_node_type_cmp_inpaint();
register_node_type_cmp_despeckle();
register_node_type_cmp_defocus();
+ register_node_type_cmp_posterize();
register_node_type_cmp_sunbeams();
register_node_type_cmp_denoise();
register_node_type_cmp_antialiasing();
diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index 4f78d82f486..10e385e0187 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -317,6 +317,8 @@ set(SRC
nodes/COM_FilterNode.h
nodes/COM_InpaintNode.cc
nodes/COM_InpaintNode.h
+ nodes/COM_PosterizeNode.cc
+ nodes/COM_PosterizeNode.h
operations/COM_BlurBaseOperation.cc
operations/COM_BlurBaseOperation.h
@@ -346,6 +348,8 @@ set(SRC
operations/COM_MovieClipAttributeOperation.h
operations/COM_MovieDistortionOperation.cc
operations/COM_MovieDistortionOperation.h
+ operations/COM_PosterizeOperation.cc
+ operations/COM_PosterizeOperation.h
operations/COM_SMAAOperation.cc
operations/COM_SMAAOperation.h
operations/COM_VariableSizeBokehBlurOperation.cc
diff --git a/source/blender/compositor/intern/COM_Converter.cc b/source/blender/compositor/intern/COM_Converter.cc
index 1983eb190e2..6049f14ecdf 100644
--- a/source/blender/compositor/intern/COM_Converter.cc
+++ b/source/blender/compositor/intern/COM_Converter.cc
@@ -41,6 +41,7 @@
#include "COM_ColorExposureNode.h"
#include "COM_ColorMatteNode.h"
#include "COM_ColorNode.h"
+#include "COM_PosterizeNode.h"
#include "COM_ColorRampNode.h"
#include "COM_ColorSpillNode.h"
#include "COM_ColorToBWNode.h"
@@ -424,6 +425,9 @@ Node *COM_convert_bnode(bNode *b_node)
case CMP_NODE_ANTIALIASING:
node = new AntiAliasingNode(b_node);
break;
+ case CMP_NODE_POSTERIZE:
+ node = new PosterizeNode(b_node);
+ break;
}
return node;
}
diff --git a/source/blender/compositor/nodes/COM_PosterizeNode.cc b/source/blender/compositor/nodes/COM_PosterizeNode.cc
new file mode 100644
index 00000000000..8de42cc4ac4
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_PosterizeNode.cc
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ *
+ * Copyright 2020, Blender Foundation.
+ */
+
+#include "COM_PosterizeNode.h"
+#include "COM_PosterizeOperation.h"
+#include "COM_ExecutionSystem.h"
+
+namespace blender::compositor {
+
+PosterizeNode::PosterizeNode(bNode *editorNode) : Node(editorNode)
+{
+ /* pass */
+}
+
+void PosterizeNode::convertToOperations(NodeConverter &converter,
+ const CompositorContext & /*context*/) const
+{
+ PosterizeOperation *operation = new PosterizeOperation();
+ converter.addOperation(operation);
+
+ converter.mapInputSocket(getInputSocket(0), operation->getInputSocket(0));
+ converter.mapInputSocket(getInputSocket(1), operation->getInputSocket(1));
+ converter.mapOutputSocket(getOutputSocket(0), operation->getOutputSocket(0));
+}
+
+} // namespace blender::compositor
diff --git a/source/blender/compositor/nodes/COM_PosterizeNode.h b/source/blender/compositor/nodes/COM_PosterizeNode.h
new file mode 100644
index 00000000000..bb9bef2bdd0
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_PosterizeNode.h
@@ -0,0 +1,36 @@
+/*
+ * 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.
+ *
+ * Copyright 2021, Blender Foundation.
+ */
+
+#pragma once
+
+#include "COM_Node.h"
+
+namespace blender::compositor {
+
+/**
+ * \brief PosterizeNode
+ * \ingroup Node
+ */
+class PosterizeNode : public Node {
+ public:
+ PosterizeNode(bNode *editorNode);
+ void convertToOperations(NodeConverter &converter,
+ const CompositorContext &context) const override;
+};
+
+} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_PosterizeOperation.cc b/source/blender/compositor/operations/COM_PosterizeOperation.cc
new file mode 100644
index 00000000000..db5860f48f8
--- /dev/null
+++ b/source/blender/compositor/operations/COM_PosterizeOperation.cc
@@ -0,0 +1,82 @@
+/*
+ * 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.
+ *
+ * Copyright 2021, Blender Foundation.
+ */
+
+#include "COM_PosterizeOperation.h"
+
+namespace blender::compositor {
+
+PosterizeOperation::PosterizeOperation()
+{
+ this->addInputSocket(DataType::Color);
+ this->addInputSocket(DataType::Value);
+ this->addOutputSocket(DataType::Color);
+ this->m_inputProgram = nullptr;
+ this->m_inputStepsProgram = nullptr;
+ flags.can_be_constant = true;
+}
+
+void PosterizeOperation::initExecution()
+{
+ this->m_inputProgram = this->getInputSocketReader(0);
+ this->m_inputStepsProgram = this->getInputSocketReader(1);
+}
+
+void PosterizeOperation::executePixelSampled(float output[4],
+ float x,
+ float y,
+ PixelSampler sampler)
+{
+ float inputValue[4];
+ float inputSteps[4];
+
+ this->m_inputProgram->readSampled(inputValue, x, y, sampler);
+ this->m_inputStepsProgram->readSampled(inputSteps, x, y, sampler);
+ CLAMP(inputSteps[0], 2.0f, 1024.0f);
+ const float steps_inv = 1.0f / inputSteps[0];
+
+ output[0] = floor(inputValue[0] / steps_inv) * steps_inv;
+ output[1] = floor(inputValue[1] / steps_inv) * steps_inv;
+ output[2] = floor(inputValue[2] / steps_inv) * steps_inv;
+ output[3] = inputValue[3];
+}
+
+void PosterizeOperation::update_memory_buffer_partial(MemoryBuffer *output,
+ const rcti &area,
+ Span<MemoryBuffer *> inputs)
+{
+ for (BuffersIterator<float> it = output->iterate_with(inputs, area); !it.is_end(); ++it) {
+ const float *in_value = it.in(0);
+ const float *in_steps = it.in(1);
+ float steps = in_steps[0];
+ CLAMP(steps, 2.0f, 1024.0f);
+ const float steps_inv = 1.0f / steps;
+
+ it.out[0] = floor(in_value[0] / steps_inv) * steps_inv;
+ it.out[1] = floor(in_value[1] / steps_inv) * steps_inv;
+ it.out[2] = floor(in_value[2] / steps_inv) * steps_inv;
+ it.out[3] = in_value[3];
+ }
+}
+
+void PosterizeOperation::deinitExecution()
+{
+ this->m_inputProgram = nullptr;
+ this->m_inputStepsProgram = nullptr;
+}
+
+} // namespace blender::compositor
diff --git a/source/blender/compositor/operations/COM_PosterizeOperation.h b/source/blender/compositor/operations/COM_PosterizeOperation.h
new file mode 100644
index 00000000000..c625cbb83c6
--- /dev/null
+++ b/source/blender/compositor/operations/COM_PosterizeOperation.h
@@ -0,0 +1,56 @@
+/*
+ * 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
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list