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_SplitOperation.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_SplitOperation.cpp')
-rw-r--r--source/blender/compositor/operations/COM_SplitOperation.cpp62
1 files changed, 33 insertions, 29 deletions
diff --git a/source/blender/compositor/operations/COM_SplitOperation.cpp b/source/blender/compositor/operations/COM_SplitOperation.cpp
index aebae3c3f19..24978acc8f3 100644
--- a/source/blender/compositor/operations/COM_SplitOperation.cpp
+++ b/source/blender/compositor/operations/COM_SplitOperation.cpp
@@ -24,53 +24,57 @@
#include "BLI_math_vector.h"
extern "C" {
-# include "MEM_guardedalloc.h"
-# include "IMB_imbuf.h"
-# include "IMB_imbuf_types.h"
+#include "MEM_guardedalloc.h"
+#include "IMB_imbuf.h"
+#include "IMB_imbuf_types.h"
}
-
SplitOperation::SplitOperation() : NodeOperation()
{
- this->addInputSocket(COM_DT_COLOR);
- this->addInputSocket(COM_DT_COLOR);
- this->addOutputSocket(COM_DT_COLOR);
- this->m_image1Input = NULL;
- this->m_image2Input = NULL;
+ this->addInputSocket(COM_DT_COLOR);
+ this->addInputSocket(COM_DT_COLOR);
+ this->addOutputSocket(COM_DT_COLOR);
+ this->m_image1Input = NULL;
+ this->m_image2Input = NULL;
}
void SplitOperation::initExecution()
{
- // When initializing the tree during initial load the width and height can be zero.
- this->m_image1Input = getInputSocketReader(0);
- this->m_image2Input = getInputSocketReader(1);
+ // When initializing the tree during initial load the width and height can be zero.
+ this->m_image1Input = getInputSocketReader(0);
+ this->m_image2Input = getInputSocketReader(1);
}
void SplitOperation::deinitExecution()
{
- this->m_image1Input = NULL;
- this->m_image2Input = NULL;
+ this->m_image1Input = NULL;
+ this->m_image2Input = NULL;
}
-void SplitOperation::executePixelSampled(float output[4], float x, float y, PixelSampler /*sampler*/)
+void SplitOperation::executePixelSampled(float output[4],
+ float x,
+ float y,
+ PixelSampler /*sampler*/)
{
- int perc = this->m_xSplit ? this->m_splitPercentage * this->getWidth() / 100.0f : this->m_splitPercentage * this->getHeight() / 100.0f;
- bool image1 = this->m_xSplit ? x > perc : y > perc;
- if (image1) {
- this->m_image1Input->readSampled(output, x, y, COM_PS_NEAREST);
- }
- else {
- this->m_image2Input->readSampled(output, x, y, COM_PS_NEAREST);
- }
+ int perc = this->m_xSplit ? this->m_splitPercentage * this->getWidth() / 100.0f :
+ this->m_splitPercentage * this->getHeight() / 100.0f;
+ bool image1 = this->m_xSplit ? x > perc : y > perc;
+ if (image1) {
+ this->m_image1Input->readSampled(output, x, y, COM_PS_NEAREST);
+ }
+ else {
+ this->m_image2Input->readSampled(output, x, y, COM_PS_NEAREST);
+ }
}
-void SplitOperation::determineResolution(unsigned int resolution[2], unsigned int preferredResolution[2])
+void SplitOperation::determineResolution(unsigned int resolution[2],
+ unsigned int preferredResolution[2])
{
- unsigned int tempPreferredResolution[2] = {0, 0};
- unsigned int tempResolution[2];
+ unsigned int tempPreferredResolution[2] = {0, 0};
+ unsigned int tempResolution[2];
- this->getInputSocket(0)->determineResolution(tempResolution, tempPreferredResolution);
- this->setResolutionInputSocketIndex((tempResolution[0] && tempResolution[1]) ? 0 : 1);
+ this->getInputSocket(0)->determineResolution(tempResolution, tempPreferredResolution);
+ this->setResolutionInputSocketIndex((tempResolution[0] && tempResolution[1]) ? 0 : 1);
- NodeOperation::determineResolution(resolution, preferredResolution);
+ NodeOperation::determineResolution(resolution, preferredResolution);
}