diff options
Diffstat (limited to 'source/blender/compositor/operations/COM_ColorCurveOperation.cc')
| -rw-r--r-- | source/blender/compositor/operations/COM_ColorCurveOperation.cc | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/source/blender/compositor/operations/COM_ColorCurveOperation.cc b/source/blender/compositor/operations/COM_ColorCurveOperation.cc index c103a3fc651..b88989ad224 100644 --- a/source/blender/compositor/operations/COM_ColorCurveOperation.cc +++ b/source/blender/compositor/operations/COM_ColorCurveOperation.cc @@ -30,22 +30,22 @@ ColorCurveOperation::ColorCurveOperation() this->addInputSocket(DataType::Color); this->addOutputSocket(DataType::Color); - m_inputFacProgram = nullptr; - m_inputImageProgram = nullptr; - m_inputBlackProgram = nullptr; - m_inputWhiteProgram = nullptr; + inputFacProgram_ = nullptr; + inputImageProgram_ = nullptr; + inputBlackProgram_ = nullptr; + inputWhiteProgram_ = nullptr; this->set_canvas_input_index(1); } void ColorCurveOperation::initExecution() { CurveBaseOperation::initExecution(); - m_inputFacProgram = this->getInputSocketReader(0); - m_inputImageProgram = this->getInputSocketReader(1); - m_inputBlackProgram = this->getInputSocketReader(2); - m_inputWhiteProgram = this->getInputSocketReader(3); + inputFacProgram_ = this->getInputSocketReader(0); + inputImageProgram_ = this->getInputSocketReader(1); + inputBlackProgram_ = this->getInputSocketReader(2); + inputWhiteProgram_ = this->getInputSocketReader(3); - BKE_curvemapping_premultiply(m_curveMapping, 0); + BKE_curvemapping_premultiply(curveMapping_, 0); } void ColorCurveOperation::executePixelSampled(float output[4], @@ -53,7 +53,7 @@ void ColorCurveOperation::executePixelSampled(float output[4], float y, PixelSampler sampler) { - CurveMapping *cumap = m_curveMapping; + CurveMapping *cumap = curveMapping_; float fac[4]; float image[4]; @@ -63,15 +63,15 @@ void ColorCurveOperation::executePixelSampled(float output[4], float white[4]; float bwmul[3]; - m_inputBlackProgram->readSampled(black, x, y, sampler); - m_inputWhiteProgram->readSampled(white, x, y, sampler); + inputBlackProgram_->readSampled(black, x, y, sampler); + inputWhiteProgram_->readSampled(white, x, y, sampler); /* get our own local bwmul value, * since we can't be threadsafe and use cumap->bwmul & friends */ BKE_curvemapping_set_black_white_ex(black, white, bwmul); - m_inputFacProgram->readSampled(fac, x, y, sampler); - m_inputImageProgram->readSampled(image, x, y, sampler); + inputFacProgram_->readSampled(fac, x, y, sampler); + inputImageProgram_->readSampled(image, x, y, sampler); if (*fac >= 1.0f) { BKE_curvemapping_evaluate_premulRGBF_ex(cumap, output, image, black, bwmul); @@ -90,17 +90,17 @@ void ColorCurveOperation::executePixelSampled(float output[4], void ColorCurveOperation::deinitExecution() { CurveBaseOperation::deinitExecution(); - m_inputFacProgram = nullptr; - m_inputImageProgram = nullptr; - m_inputBlackProgram = nullptr; - m_inputWhiteProgram = nullptr; + inputFacProgram_ = nullptr; + inputImageProgram_ = nullptr; + inputBlackProgram_ = nullptr; + inputWhiteProgram_ = nullptr; } void ColorCurveOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, Span<MemoryBuffer *> inputs) { - CurveMapping *cumap = m_curveMapping; + CurveMapping *cumap = curveMapping_; float bwmul[3]; for (BuffersIterator<float> it = output->iterate_with(inputs, area); !it.is_end(); ++it) { /* Local versions of `cumap->black` and `cumap->white`. */ @@ -134,20 +134,20 @@ ConstantLevelColorCurveOperation::ConstantLevelColorCurveOperation() this->addInputSocket(DataType::Color); this->addOutputSocket(DataType::Color); - m_inputFacProgram = nullptr; - m_inputImageProgram = nullptr; + inputFacProgram_ = nullptr; + inputImageProgram_ = nullptr; this->set_canvas_input_index(1); } void ConstantLevelColorCurveOperation::initExecution() { CurveBaseOperation::initExecution(); - m_inputFacProgram = this->getInputSocketReader(0); - m_inputImageProgram = this->getInputSocketReader(1); + inputFacProgram_ = this->getInputSocketReader(0); + inputImageProgram_ = this->getInputSocketReader(1); - BKE_curvemapping_premultiply(m_curveMapping, 0); + BKE_curvemapping_premultiply(curveMapping_, 0); - BKE_curvemapping_set_black_white(m_curveMapping, m_black, m_white); + BKE_curvemapping_set_black_white(curveMapping_, black_, white_); } void ConstantLevelColorCurveOperation::executePixelSampled(float output[4], @@ -158,18 +158,18 @@ void ConstantLevelColorCurveOperation::executePixelSampled(float output[4], float fac[4]; float image[4]; - m_inputFacProgram->readSampled(fac, x, y, sampler); - m_inputImageProgram->readSampled(image, x, y, sampler); + inputFacProgram_->readSampled(fac, x, y, sampler); + inputImageProgram_->readSampled(image, x, y, sampler); if (*fac >= 1.0f) { - BKE_curvemapping_evaluate_premulRGBF(m_curveMapping, output, image); + BKE_curvemapping_evaluate_premulRGBF(curveMapping_, output, image); } else if (*fac <= 0.0f) { copy_v3_v3(output, image); } else { float col[4]; - BKE_curvemapping_evaluate_premulRGBF(m_curveMapping, col, image); + BKE_curvemapping_evaluate_premulRGBF(curveMapping_, col, image); interp_v3_v3v3(output, image, col, *fac); } output[3] = image[3]; @@ -178,15 +178,15 @@ void ConstantLevelColorCurveOperation::executePixelSampled(float output[4], void ConstantLevelColorCurveOperation::deinitExecution() { CurveBaseOperation::deinitExecution(); - m_inputFacProgram = nullptr; - m_inputImageProgram = nullptr; + inputFacProgram_ = nullptr; + inputImageProgram_ = nullptr; } void ConstantLevelColorCurveOperation::update_memory_buffer_partial(MemoryBuffer *output, const rcti &area, Span<MemoryBuffer *> inputs) { - CurveMapping *cumap = m_curveMapping; + CurveMapping *cumap = curveMapping_; for (BuffersIterator<float> it = output->iterate_with(inputs, area); !it.is_end(); ++it) { const float fac = *it.in(0); const float *image = it.in(1); |