Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp155
1 files changed, 78 insertions, 77 deletions
diff --git a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
index bc1ecf2bd80..3f47bfda618 100644
--- a/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
+++ b/source/blender/compositor/operations/COM_ConvolutionFilterOperation.cpp
@@ -24,102 +24,103 @@
ConvolutionFilterOperation::ConvolutionFilterOperation() : NodeOperation()
{
- this->addInputSocket(COM_DT_COLOR);
- this->addInputSocket(COM_DT_VALUE);
- this->addOutputSocket(COM_DT_COLOR);
- this->setResolutionInputSocketIndex(0);
- this->m_inputOperation = NULL;
- this->setComplex(true);
+ this->addInputSocket(COM_DT_COLOR);
+ this->addInputSocket(COM_DT_VALUE);
+ this->addOutputSocket(COM_DT_COLOR);
+ this->setResolutionInputSocketIndex(0);
+ this->m_inputOperation = NULL;
+ this->setComplex(true);
}
void ConvolutionFilterOperation::initExecution()
{
- this->m_inputOperation = this->getInputSocketReader(0);
- this->m_inputValueOperation = this->getInputSocketReader(1);
+ this->m_inputOperation = this->getInputSocketReader(0);
+ this->m_inputValueOperation = this->getInputSocketReader(1);
}
-void ConvolutionFilterOperation::set3x3Filter(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9)
+void ConvolutionFilterOperation::set3x3Filter(
+ float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9)
{
- this->m_filter[0] = f1;
- this->m_filter[1] = f2;
- this->m_filter[2] = f3;
- this->m_filter[3] = f4;
- this->m_filter[4] = f5;
- this->m_filter[5] = f6;
- this->m_filter[6] = f7;
- this->m_filter[7] = f8;
- this->m_filter[8] = f9;
- this->m_filterHeight = 3;
- this->m_filterWidth = 3;
+ this->m_filter[0] = f1;
+ this->m_filter[1] = f2;
+ this->m_filter[2] = f3;
+ this->m_filter[3] = f4;
+ this->m_filter[4] = f5;
+ this->m_filter[5] = f6;
+ this->m_filter[6] = f7;
+ this->m_filter[7] = f8;
+ this->m_filter[8] = f9;
+ this->m_filterHeight = 3;
+ this->m_filterWidth = 3;
}
void ConvolutionFilterOperation::deinitExecution()
{
- this->m_inputOperation = NULL;
- this->m_inputValueOperation = NULL;
+ this->m_inputOperation = NULL;
+ this->m_inputValueOperation = NULL;
}
-
void ConvolutionFilterOperation::executePixel(float output[4], int x, int y, void * /*data*/)
{
- float in1[4];
- float in2[4];
- int x1 = x - 1;
- int x2 = x;
- int x3 = x + 1;
- int y1 = y - 1;
- int y2 = y;
- int y3 = y + 1;
- CLAMP(x1, 0, getWidth() - 1);
- CLAMP(x2, 0, getWidth() - 1);
- CLAMP(x3, 0, getWidth() - 1);
- CLAMP(y1, 0, getHeight() - 1);
- CLAMP(y2, 0, getHeight() - 1);
- CLAMP(y3, 0, getHeight() - 1);
- float value[4];
- this->m_inputValueOperation->read(value, x2, y2, NULL);
- const float mval = 1.0f - value[0];
+ float in1[4];
+ float in2[4];
+ int x1 = x - 1;
+ int x2 = x;
+ int x3 = x + 1;
+ int y1 = y - 1;
+ int y2 = y;
+ int y3 = y + 1;
+ CLAMP(x1, 0, getWidth() - 1);
+ CLAMP(x2, 0, getWidth() - 1);
+ CLAMP(x3, 0, getWidth() - 1);
+ CLAMP(y1, 0, getHeight() - 1);
+ CLAMP(y2, 0, getHeight() - 1);
+ CLAMP(y3, 0, getHeight() - 1);
+ float value[4];
+ this->m_inputValueOperation->read(value, x2, y2, NULL);
+ const float mval = 1.0f - value[0];
- zero_v4(output);
- this->m_inputOperation->read(in1, x1, y1, NULL);
- madd_v4_v4fl(output, in1, this->m_filter[0]);
- this->m_inputOperation->read(in1, x2, y1, NULL);
- madd_v4_v4fl(output, in1, this->m_filter[1]);
- this->m_inputOperation->read(in1, x3, y1, NULL);
- madd_v4_v4fl(output, in1, this->m_filter[2]);
- this->m_inputOperation->read(in1, x1, y2, NULL);
- madd_v4_v4fl(output, in1, this->m_filter[3]);
- this->m_inputOperation->read(in2, x2, y2, NULL);
- madd_v4_v4fl(output, in2, this->m_filter[4]);
- this->m_inputOperation->read(in1, x3, y2, NULL);
- madd_v4_v4fl(output, in1, this->m_filter[5]);
- this->m_inputOperation->read(in1, x1, y3, NULL);
- madd_v4_v4fl(output, in1, this->m_filter[6]);
- this->m_inputOperation->read(in1, x2, y3, NULL);
- madd_v4_v4fl(output, in1, this->m_filter[7]);
- this->m_inputOperation->read(in1, x3, y3, NULL);
- madd_v4_v4fl(output, in1, this->m_filter[8]);
+ zero_v4(output);
+ this->m_inputOperation->read(in1, x1, y1, NULL);
+ madd_v4_v4fl(output, in1, this->m_filter[0]);
+ this->m_inputOperation->read(in1, x2, y1, NULL);
+ madd_v4_v4fl(output, in1, this->m_filter[1]);
+ this->m_inputOperation->read(in1, x3, y1, NULL);
+ madd_v4_v4fl(output, in1, this->m_filter[2]);
+ this->m_inputOperation->read(in1, x1, y2, NULL);
+ madd_v4_v4fl(output, in1, this->m_filter[3]);
+ this->m_inputOperation->read(in2, x2, y2, NULL);
+ madd_v4_v4fl(output, in2, this->m_filter[4]);
+ this->m_inputOperation->read(in1, x3, y2, NULL);
+ madd_v4_v4fl(output, in1, this->m_filter[5]);
+ this->m_inputOperation->read(in1, x1, y3, NULL);
+ madd_v4_v4fl(output, in1, this->m_filter[6]);
+ this->m_inputOperation->read(in1, x2, y3, NULL);
+ madd_v4_v4fl(output, in1, this->m_filter[7]);
+ this->m_inputOperation->read(in1, x3, y3, NULL);
+ madd_v4_v4fl(output, in1, this->m_filter[8]);
- output[0] = output[0] * value[0] + in2[0] * mval;
- output[1] = output[1] * value[0] + in2[1] * mval;
- output[2] = output[2] * value[0] + in2[2] * mval;
- output[3] = output[3] * value[0] + in2[3] * mval;
+ output[0] = output[0] * value[0] + in2[0] * mval;
+ output[1] = output[1] * value[0] + in2[1] * mval;
+ output[2] = output[2] * value[0] + in2[2] * mval;
+ output[3] = output[3] * value[0] + in2[3] * mval;
- /* Make sure we don't return negative color. */
- output[0] = max(output[0], 0.0f);
- output[1] = max(output[1], 0.0f);
- output[2] = max(output[2], 0.0f);
- output[3] = max(output[3], 0.0f);
+ /* Make sure we don't return negative color. */
+ output[0] = max(output[0], 0.0f);
+ output[1] = max(output[1], 0.0f);
+ output[2] = max(output[2], 0.0f);
+ output[3] = max(output[3], 0.0f);
}
-bool ConvolutionFilterOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
+bool ConvolutionFilterOperation::determineDependingAreaOfInterest(
+ rcti *input, ReadBufferOperation *readOperation, rcti *output)
{
- rcti newInput;
- int addx = (this->m_filterWidth - 1) / 2 + 1;
- int addy = (this->m_filterHeight - 1) / 2 + 1;
- newInput.xmax = input->xmax + addx;
- newInput.xmin = input->xmin - addx;
- newInput.ymax = input->ymax + addy;
- newInput.ymin = input->ymin - addy;
+ rcti newInput;
+ int addx = (this->m_filterWidth - 1) / 2 + 1;
+ int addy = (this->m_filterHeight - 1) / 2 + 1;
+ newInput.xmax = input->xmax + addx;
+ newInput.xmin = input->xmin - addx;
+ newInput.ymax = input->ymax + addy;
+ newInput.ymin = input->ymin - addy;
- return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
+ return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
}