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.

5 files changed, 173 insertions, 1 deletions

diff --git a/source/blender/compositor/CMakeLists.txt b/source/blender/compositor/CMakeLists.txt
index fcd710b9b13..b3e76a287ea 100644
--- a/source/blender/compositor/CMakeLists.txt
+++ b/source/blender/compositor/CMakeLists.txt
@@ -271,6 +271,11 @@ set(SRC
 	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 @@ list(APPEND INC
 	${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}")
diff --git a/source/blender/compositor/nodes/COM_PixelateNode.cpp b/source/blender/compositor/nodes/COM_PixelateNode.cpp
new file mode 100644
index 00000000000..12494b6a2c3
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_PixelateNode.cpp
@@ -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);
+}
diff --git a/source/blender/compositor/nodes/COM_PixelateNode.h b/source/blender/compositor/nodes/COM_PixelateNode.h
new file mode 100644
index 00000000000..c142d2d7a5b
--- /dev/null
+++ b/source/blender/compositor/nodes/COM_PixelateNode.h
@@ -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
diff --git a/source/blender/compositor/operations/COM_PixelateOperation.cpp b/source/blender/compositor/operations/COM_PixelateOperation.cpp
new file mode 100644
index 00000000000..cff4eff0d87
--- /dev/null
+++ b/source/blender/compositor/operations/COM_PixelateOperation.cpp
@@ -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);
+}
+
diff --git a/source/blender/compositor/operations/COM_PixelateOperation.h b/source/blender/compositor/operations/COM_PixelateOperation.h
new file mode 100644
index 00000000000..8da65bdcc70
--- /dev/null
+++ b/source/blender/compositor/operations/COM_PixelateOperation.h
@@ -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