[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54349] trunk/blender/source/blender: Code clean up translate node
Monique Dewanchand
m.dewanchand at atmind.nl
Wed Feb 6 09:40:12 CET 2013
Revision: 54349
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54349
Author: mdewanchand
Date: 2013-02-06 08:40:12 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Code clean up translate node
added constants.
moved the code to a separate class. so it can be reused for other nodes
Modified Paths:
--------------
trunk/blender/source/blender/compositor/CMakeLists.txt
trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp
trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h
trunk/blender/source/blender/makesdna/DNA_node_types.h
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
Added Paths:
-----------
trunk/blender/source/blender/compositor/operations/COM_WrapOperation.cpp
trunk/blender/source/blender/compositor/operations/COM_WrapOperation.h
Modified: trunk/blender/source/blender/compositor/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/compositor/CMakeLists.txt 2013-02-06 04:16:28 UTC (rev 54348)
+++ trunk/blender/source/blender/compositor/CMakeLists.txt 2013-02-06 08:40:12 UTC (rev 54349)
@@ -580,6 +580,8 @@
# Distort operation
operations/COM_TranslateOperation.h
operations/COM_TranslateOperation.cpp
+ operations/COM_WrapOperation.h
+ operations/COM_WrapOperation.cpp
operations/COM_RotateOperation.h
operations/COM_RotateOperation.cpp
operations/COM_ScaleOperation.h
Modified: trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp
===================================================================
--- trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp 2013-02-06 04:16:28 UTC (rev 54348)
+++ trunk/blender/source/blender/compositor/nodes/COM_TranslateNode.cpp 2013-02-06 08:40:12 UTC (rev 54349)
@@ -23,6 +23,7 @@
#include "COM_TranslateNode.h"
#include "COM_TranslateOperation.h"
+#include "COM_WrapOperation.h"
#include "COM_ExecutionSystem.h"
TranslateNode::TranslateNode(bNode *editorNode) : Node(editorNode)
@@ -40,8 +41,17 @@
bNode *bnode = this->getbNode();
NodeTranslateData *data = (NodeTranslateData *)bnode->storage;
- operation->setWrapping(data->wrap_axis);
+ if (data->wrap_axis) {
+ WrapOperation *wrapOperation = new WrapOperation();
+ wrapOperation->setWrapping(data->wrap_axis);
+ inputSocket->relinkConnections(wrapOperation->getInputSocket(0), 0, graph);
+ addLink(graph, wrapOperation->getOutputSocket(), operation->getInputSocket(0));
+ graph->addOperation(wrapOperation);
+ } else {
+ inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
+ }
+
if (data->relative) {
const RenderData *rd = context->getRenderData();
float fx = rd->xsch * rd->size / 100.0f;
@@ -50,7 +60,6 @@
operation->setFactorXY(fx, fy);
}
- inputSocket->relinkConnections(operation->getInputSocket(0), 0, graph);
inputXSocket->relinkConnections(operation->getInputSocket(1), 1, graph);
inputYSocket->relinkConnections(operation->getInputSocket(2), 2, graph);
outputSocket->relinkConnections(operation->getOutputSocket(0));
Modified: trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.cpp 2013-02-06 04:16:28 UTC (rev 54348)
+++ trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.cpp 2013-02-06 08:40:12 UTC (rev 54349)
@@ -44,11 +44,6 @@
this->m_inputYOperation = this->getInputSocketReader(2);
ensureDelta();
-
- //Calculate the relative offset once per execution, no need to do this per pixel
- this->m_relativeOffsetX = fmodf(this->getDeltaX(), this->getWidth());
- this->m_relativeOffsetY = fmodf(this->getDeltaY(), this->getHeight());
-
}
void TranslateOperation::deinitExecution()
@@ -66,27 +61,7 @@
float originalXPos = x - this->getDeltaX();
float originalYPos = y - this->getDeltaY();
- switch (m_wrappingType) {
- case 0:
- //Intentionally empty, originalXPos and originalYPos have been set before
- break;
- case 1:
- // wrap only on the x-axis
- originalXPos = this->getWrappedOriginalXPos(x);
- break;
- case 2:
- // wrap only on the y-axis
- originalYPos = this->getWrappedOriginalYPos(y);
- break;
- case 3:
- // wrap on both
- originalXPos = this->getWrappedOriginalXPos(x);
- originalYPos = this->getWrappedOriginalYPos(y);
- break;
- }
-
this->m_inputOperation->read(output, originalXPos, originalYPos, sampler);
-
}
bool TranslateOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
@@ -100,89 +75,9 @@
newInput.ymin = input->ymin - this->getDeltaY();
newInput.ymax = input->ymax - this->getDeltaY();
- if (m_wrappingType == 1 || m_wrappingType == 3) {
- // wrap only on the x-axis if tile is wrapping
- newInput.xmin = getWrappedOriginalXPos(input->xmin);
- newInput.xmax = getWrappedOriginalXPos(input->xmax);
- if (newInput.xmin > newInput.xmax) {
- newInput.xmin = 0;
- newInput.xmax = this->getWidth();
- }
- }
- if (m_wrappingType == 2 || m_wrappingType == 3) {
- // wrap only on the y-axis if tile is wrapping
- newInput.ymin = getWrappedOriginalYPos(input->ymin);
- newInput.ymax = getWrappedOriginalYPos(input->ymax);
- if (newInput.ymin > newInput.ymax) {
- newInput.ymin = 0;
- newInput.ymax = this->getHeight();
- }
- }
-
-
return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
}
-void TranslateOperation::setWrapping(char wrapping_type)
-{
- m_wrappingType = wrapping_type;
-}
-
-float TranslateOperation::getWrappedOriginalXPos(float x)
-{
- float originalXPos = 0;
-
- // Positive offset: Append image data from the left
- if (this->m_relativeOffsetX > 0) {
- if (x < this->m_relativeOffsetX) {
- originalXPos = this->getWidth() - this->m_relativeOffsetX + x;
- }
- else {
- originalXPos = x - this->m_relativeOffsetX;
- }
- }
- else {
- // Negative offset: Append image data from the right
- if (x < (this->getWidth() + this->m_relativeOffsetX)) {
- originalXPos = x - this->m_relativeOffsetX;
- }
- else {
- originalXPos = x - (this->getWidth() + this->m_relativeOffsetX);
- }
- }
-
- while (originalXPos < 0) originalXPos += this->m_width;
- return fmodf(originalXPos, this->getWidth());
-}
-
-
-float TranslateOperation::getWrappedOriginalYPos(float y)
-{
- float originalYPos = 0;
-
- // Positive offset: Append image data from the bottom
- if (this->m_relativeOffsetY > 0) {
- if (y < this->m_relativeOffsetY) {
- originalYPos = this->getHeight() - this->m_relativeOffsetY + y;
- }
- else {
- originalYPos = y - this->m_relativeOffsetY;
- }
- }
- else {
- // Negative offset: Append image data from the top
- if (y < (this->getHeight() + this->m_relativeOffsetY)) {
- originalYPos = y - this->m_relativeOffsetY;
- }
- else {
- originalYPos = y - (this->getHeight() + this->m_relativeOffsetY);
- }
- }
-
- while (originalYPos < 0) originalYPos += this->m_height;
- return fmodf(originalYPos, this->getHeight());
-}
-
void TranslateOperation::setFactorXY(float factorX, float factorY)
{
m_factorX = factorX;
Modified: trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h 2013-02-06 04:16:28 UTC (rev 54348)
+++ trunk/blender/source/blender/compositor/operations/COM_TranslateOperation.h 2013-02-06 08:40:12 UTC (rev 54349)
@@ -37,7 +37,6 @@
float m_relativeOffsetY;
float m_factorX;
float m_factorY;
- char m_wrappingType;
public:
TranslateOperation();
bool determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output);
@@ -60,10 +59,6 @@
}
}
- void setWrapping(char wrapping_type);
- float getWrappedOriginalXPos(float x);
- float getWrappedOriginalYPos(float y);
-
void setFactorXY(float factorX, float factorY);
};
Added: trunk/blender/source/blender/compositor/operations/COM_WrapOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_WrapOperation.cpp (rev 0)
+++ trunk/blender/source/blender/compositor/operations/COM_WrapOperation.cpp 2013-02-06 08:40:12 UTC (rev 54349)
@@ -0,0 +1,117 @@
+/*
+ * 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
+ * Thomas Beck (plasmasolutions.de)
+ */
+
+#include "COM_WrapOperation.h"
+
+WrapOperation::WrapOperation() : NodeOperation()
+{
+ this->addInputSocket(COM_DT_COLOR);
+ this->addOutputSocket(COM_DT_COLOR);
+ this->setResolutionInputSocketIndex(0);
+ this->m_inputOperation = NULL;
+}
+void WrapOperation::initExecution()
+{
+ this->m_inputOperation = this->getInputSocketReader(0);
+}
+
+void WrapOperation::deinitExecution()
+{
+ this->m_inputOperation = NULL;
+}
+
+inline float WrapOperation::getWrappedOriginalXPos(float x)
+{
+ while (x < 0) x += this->m_width;
+ return fmodf(x, this->getWidth());
+}
+
+inline float WrapOperation::getWrappedOriginalYPos(float y)
+{
+ while (y < 0) y += this->m_height;
+ return fmodf(y, this->getHeight());
+}
+
+void WrapOperation::executePixel(float output[4], float x, float y, PixelSampler sampler)
+{
+ float nx, ny;
+ nx = x;
+ ny = y;
+ switch (m_wrappingType) {
+ case CMP_NODE_WRAP_NONE:
+ //Intentionally empty, originalXPos and originalYPos have been set before
+ break;
+ case CMP_NODE_WRAP_X:
+ // wrap only on the x-axis
+ nx = this->getWrappedOriginalXPos(x);
+ break;
+ case CMP_NODE_WRAP_Y:
+ // wrap only on the y-axis
+ ny = this->getWrappedOriginalYPos(y);
+ break;
+ case CMP_NODE_WRAP_XY:
+ // wrap on both
+ nx = this->getWrappedOriginalXPos(x);
+ ny = this->getWrappedOriginalYPos(y);
+ break;
+ }
+
+ this->m_inputOperation->read(output, nx, ny, sampler);
+
+}
+
+bool WrapOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+{
+ rcti newInput;
+
+ newInput.xmin = input->xmin;
+ newInput.xmax = input->xmax;
+ newInput.ymin = input->ymin;
+ newInput.ymax = input->ymax;
+
+ if (m_wrappingType == 1 || m_wrappingType == 3) {
+ // wrap only on the x-axis if tile is wrapping
+ newInput.xmin = getWrappedOriginalXPos(input->xmin);
+ newInput.xmax = getWrappedOriginalXPos(input->xmax);
+ if (newInput.xmin > newInput.xmax) {
+ newInput.xmin = 0;
+ newInput.xmax = this->getWidth();
+ }
+ }
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list