diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/compositor/operations/COM_ColorCurveOperation.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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_ColorCurveOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_ColorCurveOperation.cpp | 192 |
1 files changed, 97 insertions, 95 deletions
diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp index 51fbb4ebde4..e25ef49cf28 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp @@ -21,136 +21,138 @@ #ifdef __cplusplus extern "C" { #endif -# include "BKE_colortools.h" +#include "BKE_colortools.h" #ifdef __cplusplus } -#include "MEM_guardedalloc.h" +# include "MEM_guardedalloc.h" #endif ColorCurveOperation::ColorCurveOperation() : CurveBaseOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); - - this->m_inputFacProgram = NULL; - this->m_inputImageProgram = NULL; - this->m_inputBlackProgram = NULL; - this->m_inputWhiteProgram = NULL; - - this->setResolutionInputSocketIndex(1); + this->addInputSocket(COM_DT_VALUE); + this->addInputSocket(COM_DT_COLOR); + this->addInputSocket(COM_DT_COLOR); + this->addInputSocket(COM_DT_COLOR); + this->addOutputSocket(COM_DT_COLOR); + + this->m_inputFacProgram = NULL; + this->m_inputImageProgram = NULL; + this->m_inputBlackProgram = NULL; + this->m_inputWhiteProgram = NULL; + + this->setResolutionInputSocketIndex(1); } void ColorCurveOperation::initExecution() { - CurveBaseOperation::initExecution(); - this->m_inputFacProgram = this->getInputSocketReader(0); - this->m_inputImageProgram = this->getInputSocketReader(1); - this->m_inputBlackProgram = this->getInputSocketReader(2); - this->m_inputWhiteProgram = this->getInputSocketReader(3); - - curvemapping_premultiply(this->m_curveMapping, 0); + CurveBaseOperation::initExecution(); + this->m_inputFacProgram = this->getInputSocketReader(0); + this->m_inputImageProgram = this->getInputSocketReader(1); + this->m_inputBlackProgram = this->getInputSocketReader(2); + this->m_inputWhiteProgram = this->getInputSocketReader(3); + curvemapping_premultiply(this->m_curveMapping, 0); } -void ColorCurveOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) +void ColorCurveOperation::executePixelSampled(float output[4], + float x, + float y, + PixelSampler sampler) { - CurveMapping *cumap = this->m_curveMapping; - - float fac[4]; - float image[4]; - - /* local versions of cumap->black, cumap->white, cumap->bwmul */ - float black[4]; - float white[4]; - float bwmul[3]; - - this->m_inputBlackProgram->readSampled(black, x, y, sampler); - this->m_inputWhiteProgram->readSampled(white, x, y, sampler); - - /* get our own local bwmul value, - * since we can't be threadsafe and use cumap->bwmul & friends */ - curvemapping_set_black_white_ex(black, white, bwmul); - - this->m_inputFacProgram->readSampled(fac, x, y, sampler); - this->m_inputImageProgram->readSampled(image, x, y, sampler); - - if (*fac >= 1.0f) { - curvemapping_evaluate_premulRGBF_ex(cumap, output, image, - black, bwmul); - } - else if (*fac <= 0.0f) { - copy_v3_v3(output, image); - } - else { - float col[4]; - curvemapping_evaluate_premulRGBF_ex(cumap, col, image, - black, bwmul); - interp_v3_v3v3(output, image, col, *fac); - } - output[3] = image[3]; + CurveMapping *cumap = this->m_curveMapping; + + float fac[4]; + float image[4]; + + /* local versions of cumap->black, cumap->white, cumap->bwmul */ + float black[4]; + float white[4]; + float bwmul[3]; + + this->m_inputBlackProgram->readSampled(black, x, y, sampler); + this->m_inputWhiteProgram->readSampled(white, x, y, sampler); + + /* get our own local bwmul value, + * since we can't be threadsafe and use cumap->bwmul & friends */ + curvemapping_set_black_white_ex(black, white, bwmul); + + this->m_inputFacProgram->readSampled(fac, x, y, sampler); + this->m_inputImageProgram->readSampled(image, x, y, sampler); + + if (*fac >= 1.0f) { + curvemapping_evaluate_premulRGBF_ex(cumap, output, image, black, bwmul); + } + else if (*fac <= 0.0f) { + copy_v3_v3(output, image); + } + else { + float col[4]; + curvemapping_evaluate_premulRGBF_ex(cumap, col, image, black, bwmul); + interp_v3_v3v3(output, image, col, *fac); + } + output[3] = image[3]; } void ColorCurveOperation::deinitExecution() { - CurveBaseOperation::deinitExecution(); - this->m_inputFacProgram = NULL; - this->m_inputImageProgram = NULL; - this->m_inputBlackProgram = NULL; - this->m_inputWhiteProgram = NULL; + CurveBaseOperation::deinitExecution(); + this->m_inputFacProgram = NULL; + this->m_inputImageProgram = NULL; + this->m_inputBlackProgram = NULL; + this->m_inputWhiteProgram = NULL; } - // Constant level curve mapping ConstantLevelColorCurveOperation::ConstantLevelColorCurveOperation() : CurveBaseOperation() { - this->addInputSocket(COM_DT_VALUE); - this->addInputSocket(COM_DT_COLOR); - this->addOutputSocket(COM_DT_COLOR); + this->addInputSocket(COM_DT_VALUE); + this->addInputSocket(COM_DT_COLOR); + this->addOutputSocket(COM_DT_COLOR); - this->m_inputFacProgram = NULL; - this->m_inputImageProgram = NULL; + this->m_inputFacProgram = NULL; + this->m_inputImageProgram = NULL; - this->setResolutionInputSocketIndex(1); + this->setResolutionInputSocketIndex(1); } void ConstantLevelColorCurveOperation::initExecution() { - CurveBaseOperation::initExecution(); - this->m_inputFacProgram = this->getInputSocketReader(0); - this->m_inputImageProgram = this->getInputSocketReader(1); + CurveBaseOperation::initExecution(); + this->m_inputFacProgram = this->getInputSocketReader(0); + this->m_inputImageProgram = this->getInputSocketReader(1); - curvemapping_premultiply(this->m_curveMapping, 0); + curvemapping_premultiply(this->m_curveMapping, 0); - curvemapping_set_black_white(this->m_curveMapping, this->m_black, this->m_white); + curvemapping_set_black_white(this->m_curveMapping, this->m_black, this->m_white); } -void ConstantLevelColorCurveOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) +void ConstantLevelColorCurveOperation::executePixelSampled(float output[4], + float x, + float y, + PixelSampler sampler) { - float fac[4]; - float image[4]; - - this->m_inputFacProgram->readSampled(fac, x, y, sampler); - this->m_inputImageProgram->readSampled(image, x, y, sampler); - - if (*fac >= 1.0f) { - curvemapping_evaluate_premulRGBF(this->m_curveMapping, output, image); - } - else if (*fac <= 0.0f) { - copy_v3_v3(output, image); - } - else { - float col[4]; - curvemapping_evaluate_premulRGBF(this->m_curveMapping, col, image); - interp_v3_v3v3(output, image, col, *fac); - } - output[3] = image[3]; + float fac[4]; + float image[4]; + + this->m_inputFacProgram->readSampled(fac, x, y, sampler); + this->m_inputImageProgram->readSampled(image, x, y, sampler); + + if (*fac >= 1.0f) { + curvemapping_evaluate_premulRGBF(this->m_curveMapping, output, image); + } + else if (*fac <= 0.0f) { + copy_v3_v3(output, image); + } + else { + float col[4]; + curvemapping_evaluate_premulRGBF(this->m_curveMapping, col, image); + interp_v3_v3v3(output, image, col, *fac); + } + output[3] = image[3]; } void ConstantLevelColorCurveOperation::deinitExecution() { - CurveBaseOperation::deinitExecution(); - this->m_inputFacProgram = NULL; - this->m_inputImageProgram = NULL; + CurveBaseOperation::deinitExecution(); + this->m_inputFacProgram = NULL; + this->m_inputImageProgram = NULL; } |