[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51572] trunk/blender/source/blender: Adding a pixelate node.
Jeroen Bakker
j.bakker at atmind.nl
Wed Oct 24 10:36:13 CEST 2012
Revision: 51572
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51572
Author: jbakker
Date: 2012-10-24 08:36:10 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Adding a pixelate node.
This makes it possible to create pixelized scale in the Tile compositor.
Just append the node in front of a scale node or where you want the pixelization to take place.
There were some bugs on this subject, but they used the work around to add a blur size of 0 in the place where they need the pixelization.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_node.h
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/compositor/CMakeLists.txt
trunk/blender/source/blender/nodes/CMakeLists.txt
trunk/blender/source/blender/nodes/NOD_composite.h
Added Paths:
-----------
trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp
trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.h
trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.h
trunk/blender/source/blender/nodes/composite/nodes/node_composite_pixelate.c
Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h 2012-10-24 08:16:49 UTC (rev 51571)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h 2012-10-24 08:36:10 UTC (rev 51572)
@@ -699,6 +699,7 @@
#define CMP_NODE_BOKEHIMAGE 315
#define CMP_NODE_BOKEHBLUR 316
#define CMP_NODE_SWITCH 317
+#define CMP_NODE_PIXELATE 318
/* channel toggles */
#define CMP_CHAN_RGB 1
Modified: trunk/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/node.c 2012-10-24 08:16:49 UTC (rev 51571)
+++ trunk/blender/source/blender/blenkernel/intern/node.c 2012-10-24 08:36:10 UTC (rev 51572)
@@ -2198,6 +2198,7 @@
register_node_type_cmp_bokehimage(ttype);
register_node_type_cmp_bokehblur(ttype);
register_node_type_cmp_switch(ttype);
+ register_node_type_cmp_pixelate(ttype);
register_node_type_cmp_mask(ttype);
register_node_type_cmp_trackpos(ttype);
Modified: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/compositor/CMakeLists.txt 2012-10-24 08:16:49 UTC (rev 51571)
+++ trunk/blender/source/blender/compositor/CMakeLists.txt 2012-10-24 08:36:10 UTC (rev 51572)
@@ -271,6 +271,11 @@
operations/COM_NormalizeOperation.cpp
operations/COM_NormalizeOperation.h
+ nodes/COM_PixelateNode.cpp
+ nodes/COM_PixelateNode.h
+ operations/COM_PixelateOperation.cpp
+ operations/COM_PixelateOperation.h
+
# Filter nodes
nodes/COM_BilateralBlurNode.cpp
nodes/COM_BilateralBlurNode.h
@@ -649,6 +654,6 @@
${CMAKE_CURRENT_BINARY_DIR}/operations
)
data_to_c(${CMAKE_CURRENT_SOURCE_DIR}/operations/COM_OpenCLKernels.cl
- ${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h SRC)
+ ${CMAKE_CURRENT_BINARY_DIR}/operations/COM_OpenCLKernels.cl.h SRC)
blender_add_lib(bf_compositor "${SRC}" "${INC}" "${INC_SYS}")
Added: trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp (rev 0)
+++ trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.cpp 2012-10-24 08:36:10 UTC (rev 51572)
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * 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.
+ *
+ * Contributor:
+ * Jeroen Bakker
+ * Monique Dewanchand
+ */
+
+#include "COM_PixelateNode.h"
+
+#include "COM_PixelateOperation.h"
+#include "COM_ExecutionSystem.h"
+
+PixelateNode::PixelateNode(bNode *editorNode) : Node(editorNode)
+{
+ /* pass */
+}
+
+void PixelateNode::convertToOperations(ExecutionSystem *graph, CompositorContext *context)
+{
+ InputSocket *inputSocket = this->getInputSocket(0);
+ OutputSocket *outputSocket = this->getOutputSocket(0);
+
+ PixelateOperation *operation = new PixelateOperation(inputSocket->getDataType());
+ inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
+ outputSocket->relinkConnections(operation->getOutputSocket(0));
+ graph->addOperation(operation);
+}
Added: trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.h
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.h (rev 0)
+++ trunk/blender/source/blender/compositor/nodes/COM_PixelateNode.h 2012-10-24 08:36:10 UTC (rev 51572)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * 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.
+ *
+ * Contributor:
+ * Jeroen Bakker
+ * Monique Dewanchand
+ */
+
+#ifndef _COM_PixelateNode_h_
+#define _COM_PixelateNode_h_
+
+#include "COM_Node.h"
+
+/**
+ * @brief PixelateNode
+ * @ingroup Node
+ */
+class PixelateNode : public Node {
+public:
+ PixelateNode(bNode *editorNode);
+ void convertToOperations(ExecutionSystem *graph, CompositorContext *context);
+};
+
+#endif
Added: trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.cpp (rev 0)
+++ trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.cpp 2012-10-24 08:36:10 UTC (rev 51572)
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * 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.
+ *
+ * Contributor:
+ * Jeroen Bakker
+ * Monique Dewanchand
+ */
+
+#include "COM_PixelateOperation.h"
+
+PixelateOperation::PixelateOperation(DataType datatype) : NodeOperation()
+{
+ this->addInputSocket(datatype);
+ this->addOutputSocket(datatype);
+ this->setResolutionInputSocketIndex(0);
+ this->m_inputOperation = NULL;
+}
+void PixelateOperation::initExecution()
+{
+ this->m_inputOperation = this->getInputSocketReader(0);
+}
+
+void PixelateOperation::deinitExecution()
+{
+ this->m_inputOperation = NULL;
+}
+
+
+void PixelateOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
+{
+ float nx = round(x);
+ float ny = round(y);
+ this->m_inputOperation->read(output, nx, ny, sampler);
+}
+
Added: trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.h (rev 0)
+++ trunk/blender/source/blender/compositor/operations/COM_PixelateOperation.h 2012-10-24 08:36:10 UTC (rev 51572)
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * 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.
+ *
+ * Contributor:
+ * Jeroen Bakker
+ * Monique Dewanchand
+ */
+
+#ifndef _COM_PixelateOperation_h_
+#define _COM_PixelateOperation_h_
+
+#include "COM_NodeOperation.h"
+
+class PixelateOperation : public NodeOperation {
+private:
+ SocketReader *m_inputOperation;
+public:
+ PixelateOperation(DataType dataType);
+ void initExecution();
+ void deinitExecution();
+ void executePixel(float output[4], float x, float y, PixelSampler sampler);
+};
+
+#endif
Modified: trunk/blender/source/blender/nodes/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/nodes/CMakeLists.txt 2012-10-24 08:16:49 UTC (rev 51571)
+++ trunk/blender/source/blender/nodes/CMakeLists.txt 2012-10-24 08:36:10 UTC (rev 51572)
@@ -23,7 +23,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-set(INC
+set(INC
.
composite
intern
@@ -119,7 +119,8 @@
composite/nodes/node_composite_ellipsemask.c
composite/nodes/node_composite_switch.c
composite/nodes/node_composite_colorcorrection.c
-
+ composite/nodes/node_composite_pixelate.c
+
composite/node_composite_tree.c
composite/node_composite_util.c
Modified: trunk/blender/source/blender/nodes/NOD_composite.h
===================================================================
--- trunk/blender/source/blender/nodes/NOD_composite.h 2012-10-24 08:16:49 UTC (rev 51571)
+++ trunk/blender/source/blender/nodes/NOD_composite.h 2012-10-24 08:36:10 UTC (rev 51572)
@@ -96,7 +96,7 @@
void register_node_type_cmp_sepyuva(struct bNodeTreeType *ttype);
void register_node_type_cmp_combyuva(struct bNodeTreeType *ttype);
void register_node_type_cmp_sepycca(struct bNodeTreeType *ttype);
-void register_node_type_cmp_combycca(struct bNodeTreeType *ttype);
+void register_node_type_cmp_combycca(struct bNodeTreeType *ttype);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list