diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 05:22:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-26 05:22:05 +0400 |
commit | 6a1d82490e49d1f5d73b5082516b087d44010fb8 (patch) | |
tree | 0650cce3c1d47db6c5de1f4f2ba05b619c412f09 /source/blender/compositor/operations/COM_ColorCurveOperation.cpp | |
parent | 7a0ab62d3f65f3b28da2a6ba9916c21132f8ea0d (diff) |
use m_ prefix for compositor class members (all compositor operations).
Diffstat (limited to 'source/blender/compositor/operations/COM_ColorCurveOperation.cpp')
-rw-r--r-- | source/blender/compositor/operations/COM_ColorCurveOperation.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp index 4feac3e7273..9848d191c04 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.cpp +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cpp @@ -39,28 +39,28 @@ ColorCurveOperation::ColorCurveOperation() : CurveBaseOperation() this->addInputSocket(COM_DT_COLOR); this->addOutputSocket(COM_DT_COLOR); - this->inputFacProgram = NULL; - this->inputImageProgram = NULL; - this->inputBlackProgram = NULL; - this->inputWhiteProgram = NULL; + 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->inputFacProgram = this->getInputSocketReader(0); - this->inputImageProgram = this->getInputSocketReader(1); - this->inputBlackProgram = this->getInputSocketReader(2); - this->inputWhiteProgram = this->getInputSocketReader(3); + 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->curveMapping, 0); + curvemapping_premultiply(this->m_curveMapping, 0); } void ColorCurveOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) { - CurveMapping *cumap = this->curveMapping; + CurveMapping *cumap = this->m_curveMapping; CurveMapping *workingCopy = (CurveMapping *)MEM_dupallocN(cumap); float black[4]; @@ -68,13 +68,13 @@ void ColorCurveOperation::executePixel(float *color, float x, float y, PixelSamp float fac[4]; float image[4]; - this->inputBlackProgram->read(black, x, y, sampler, inputBuffers); - this->inputWhiteProgram->read(white, x, y, sampler, inputBuffers); + this->m_inputBlackProgram->read(black, x, y, sampler, inputBuffers); + this->m_inputWhiteProgram->read(white, x, y, sampler, inputBuffers); curvemapping_set_black_white(workingCopy, black, white); - this->inputFacProgram->read(fac, x, y, sampler, inputBuffers); - this->inputImageProgram->read(image, x, y, sampler, inputBuffers); + this->m_inputFacProgram->read(fac, x, y, sampler, inputBuffers); + this->m_inputImageProgram->read(image, x, y, sampler, inputBuffers); if (*fac >= 1.0f) curvemapping_evaluate_premulRGBF(workingCopy, color, image); @@ -94,11 +94,11 @@ void ColorCurveOperation::executePixel(float *color, float x, float y, PixelSamp void ColorCurveOperation::deinitExecution() { - this->inputFacProgram = NULL; - this->inputImageProgram = NULL; - this->inputBlackProgram = NULL; - this->inputWhiteProgram = NULL; - curvemapping_premultiply(this->curveMapping, 1); + this->m_inputFacProgram = NULL; + this->m_inputImageProgram = NULL; + this->m_inputBlackProgram = NULL; + this->m_inputWhiteProgram = NULL; + curvemapping_premultiply(this->m_curveMapping, 1); } @@ -110,20 +110,20 @@ ConstantLevelColorCurveOperation::ConstantLevelColorCurveOperation() : CurveBase this->addInputSocket(COM_DT_COLOR); this->addOutputSocket(COM_DT_COLOR); - this->inputFacProgram = NULL; - this->inputImageProgram = NULL; + this->m_inputFacProgram = NULL; + this->m_inputImageProgram = NULL; this->setResolutionInputSocketIndex(1); } void ConstantLevelColorCurveOperation::initExecution() { CurveBaseOperation::initExecution(); - this->inputFacProgram = this->getInputSocketReader(0); - this->inputImageProgram = this->getInputSocketReader(1); + this->m_inputFacProgram = this->getInputSocketReader(0); + this->m_inputImageProgram = this->getInputSocketReader(1); - curvemapping_premultiply(this->curveMapping, 0); + curvemapping_premultiply(this->m_curveMapping, 0); - curvemapping_set_black_white(this->curveMapping, this->black, this->white); + curvemapping_set_black_white(this->m_curveMapping, this->m_black, this->m_white); } void ConstantLevelColorCurveOperation::executePixel(float *color, float x, float y, PixelSampler sampler, MemoryBuffer *inputBuffers[]) @@ -132,17 +132,17 @@ void ConstantLevelColorCurveOperation::executePixel(float *color, float x, float float image[4]; - this->inputFacProgram->read(fac, x, y, sampler, inputBuffers); - this->inputImageProgram->read(image, x, y, sampler, inputBuffers); + this->m_inputFacProgram->read(fac, x, y, sampler, inputBuffers); + this->m_inputImageProgram->read(image, x, y, sampler, inputBuffers); if (*fac >= 1.0f) - curvemapping_evaluate_premulRGBF(this->curveMapping, color, image); + curvemapping_evaluate_premulRGBF(this->m_curveMapping, color, image); else if (*fac <= 0.0f) { copy_v3_v3(color, image); } else { float col[4], mfac = 1.0f - *fac; - curvemapping_evaluate_premulRGBF(this->curveMapping, col, image); + curvemapping_evaluate_premulRGBF(this->m_curveMapping, col, image); color[0] = mfac * image[0] + *fac * col[0]; color[1] = mfac * image[1] + *fac * col[1]; color[2] = mfac * image[2] + *fac * col[2]; @@ -152,7 +152,7 @@ void ConstantLevelColorCurveOperation::executePixel(float *color, float x, float void ConstantLevelColorCurveOperation::deinitExecution() { - this->inputFacProgram = NULL; - this->inputImageProgram = NULL; - curvemapping_premultiply(this->curveMapping, 1); + this->m_inputFacProgram = NULL; + this->m_inputImageProgram = NULL; + curvemapping_premultiply(this->m_curveMapping, 1); } |