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
This commit is contained in:
parent
b7718bbdf5
commit
d10ea97053
|
@ -333,6 +333,7 @@ compositor_node_categories = [
|
|||
NodeItem("CompositorNodeGamma"),
|
||||
NodeItem("CompositorNodeExposure"),
|
||||
NodeItem("CompositorNodeColorCorrection"),
|
||||
NodeItem("CompositorNodePosterize"),
|
||||
NodeItem("CompositorNodeTonemap"),
|
||||
NodeItem("CompositorNodeZcombine"),
|
||||
]),
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
|
@ -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 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_MultiThreadedOperation.h"
|
||||
|
||||
namespace blender::compositor {
|
||||
|
||||
class PosterizeOperation : public MultiThreadedOperation {
|
||||
private:
|
||||
/**
|
||||
* Cached reference to the inputProgram
|
||||
*/
|
||||
SocketReader *m_inputProgram;
|
||||
SocketReader *m_inputStepsProgram;
|
||||
|
||||
public:
|
||||
PosterizeOperation();
|
||||
|
||||
/**
|
||||
* The inner loop of this operation.
|
||||
*/
|
||||
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler) override;
|
||||
|
||||
/**
|
||||
* Initialize the execution
|
||||
*/
|
||||
void initExecution() override;
|
||||
|
||||
/**
|
||||
* Deinitialize the execution
|
||||
*/
|
||||
void deinitExecution() override;
|
||||
|
||||
void update_memory_buffer_partial(MemoryBuffer *output,
|
||||
const rcti &area,
|
||||
Span<MemoryBuffer *> inputs) override;
|
||||
};
|
||||
|
||||
} // namespace blender::compositor
|
|
@ -177,6 +177,7 @@ extern StructRNA RNA_CompositorNodeMixRGB;
|
|||
extern StructRNA RNA_CompositorNodeNormal;
|
||||
extern StructRNA RNA_CompositorNodeNormalize;
|
||||
extern StructRNA RNA_CompositorNodeOutputFile;
|
||||
extern StructRNA RNA_CompositorNodePosterize;
|
||||
extern StructRNA RNA_CompositorNodePremulKey;
|
||||
extern StructRNA RNA_CompositorNodeRGB;
|
||||
extern StructRNA RNA_CompositorNodeRGBToBW;
|
||||
|
|
|
@ -104,6 +104,7 @@ set(SRC
|
|||
composite/nodes/node_composite_outputFile.c
|
||||
composite/nodes/node_composite_pixelate.c
|
||||
composite/nodes/node_composite_planetrackdeform.c
|
||||
composite/nodes/node_composite_posterize.c
|
||||
composite/nodes/node_composite_premulkey.c
|
||||
composite/nodes/node_composite_rgb.c
|
||||
composite/nodes/node_composite_rotate.c
|
||||
|
|
|
@ -80,6 +80,7 @@ void register_node_type_cmp_despeckle(void);
|
|||
void register_node_type_cmp_defocus(void);
|
||||
void register_node_type_cmp_denoise(void);
|
||||
void register_node_type_cmp_antialiasing(void);
|
||||
void register_node_type_cmp_posterize(void);
|
||||
|
||||
void register_node_type_cmp_valtorgb(void);
|
||||
void register_node_type_cmp_rgbtobw(void);
|
||||
|
|
|
@ -225,6 +225,7 @@ DefNode(CompositorNode, CMP_NODE_CRYPTOMATTE_LEGACY, def_cmp_cryptomatte_legacy,
|
|||
DefNode(CompositorNode, CMP_NODE_DENOISE, def_cmp_denoise, "DENOISE", Denoise, "Denoise", "" )
|
||||
DefNode(CompositorNode, CMP_NODE_EXPOSURE, 0, "EXPOSURE", Exposure, "Exposure", "" )
|
||||
DefNode(CompositorNode, CMP_NODE_ANTIALIASING, def_cmp_antialiasing, "ANTIALIASING", AntiAliasing, "Anti-Aliasing", "" )
|
||||
DefNode(CompositorNode, CMP_NODE_POSTERIZE, 0, "POSTERIZE", Posterize, "Posterize", "" )
|
||||
|
||||
DefNode(TextureNode, TEX_NODE_OUTPUT, def_tex_output, "OUTPUT", Output, "Output", "" )
|
||||
DefNode(TextureNode, TEX_NODE_CHECKER, 0, "CHECKER", Checker, "Checker", "" )
|
||||
|
|
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/** \file
|
||||
* \ingroup cmpnodes
|
||||
*/
|
||||
|
||||
#include "node_composite_util.h"
|
||||
|
||||
/* **************** Posterize ******************** */
|
||||
|
||||
static bNodeSocketTemplate cmp_node_posterize_in[] = {
|
||||
{SOCK_RGBA, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f},
|
||||
{SOCK_FLOAT, N_("Steps"), 8.0f, 8.0f, 8.0f, 8.0f, 2.0f, 1024.0f, PROP_NONE},
|
||||
{-1, ""},
|
||||
};
|
||||
static bNodeSocketTemplate cmp_node_posterize_out[] = {
|
||||
{SOCK_RGBA, N_("Image")},
|
||||
{-1, ""},
|
||||
};
|
||||
|
||||
void register_node_type_cmp_posterize(void)
|
||||
{
|
||||
static bNodeType ntype;
|
||||
|
||||
cmp_node_type_base(&ntype, CMP_NODE_POSTERIZE, "Posterize", NODE_CLASS_OP_COLOR, 0);
|
||||
node_type_socket_templates(&ntype, cmp_node_posterize_in, cmp_node_posterize_out);
|
||||
|
||||
nodeRegisterType(&ntype);
|
||||
}
|
Loading…
Reference in New Issue