diff options
Diffstat (limited to 'source/blender/compositor/operations/COM_ConvertOperation.cc')
-rw-r--r-- | source/blender/compositor/operations/COM_ConvertOperation.cc | 127 |
1 files changed, 58 insertions, 69 deletions
diff --git a/source/blender/compositor/operations/COM_ConvertOperation.cc b/source/blender/compositor/operations/COM_ConvertOperation.cc index 1cef0490ff5..88de54e8c41 100644 --- a/source/blender/compositor/operations/COM_ConvertOperation.cc +++ b/source/blender/compositor/operations/COM_ConvertOperation.cc @@ -26,18 +26,18 @@ namespace blender::compositor { ConvertBaseOperation::ConvertBaseOperation() { - m_inputOperation = nullptr; + inputOperation_ = nullptr; this->flags.can_be_constant = true; } void ConvertBaseOperation::initExecution() { - m_inputOperation = this->getInputSocketReader(0); + inputOperation_ = this->getInputSocketReader(0); } void ConvertBaseOperation::deinitExecution() { - m_inputOperation = nullptr; + inputOperation_ = nullptr; } void ConvertBaseOperation::hash_output_params() @@ -66,7 +66,7 @@ void ConvertValueToColorOperation::executePixelSampled(float output[4], PixelSampler sampler) { float value; - m_inputOperation->readSampled(&value, x, y, sampler); + inputOperation_->readSampled(&value, x, y, sampler); output[0] = output[1] = output[2] = value; output[3] = 1.0f; } @@ -93,7 +93,7 @@ void ConvertColorToValueOperation::executePixelSampled(float output[4], PixelSampler sampler) { float inputColor[4]; - m_inputOperation->readSampled(inputColor, x, y, sampler); + inputOperation_->readSampled(inputColor, x, y, sampler); output[0] = (inputColor[0] + inputColor[1] + inputColor[2]) / 3.0f; } @@ -119,7 +119,7 @@ void ConvertColorToBWOperation::executePixelSampled(float output[4], PixelSampler sampler) { float inputColor[4]; - m_inputOperation->readSampled(inputColor, x, y, sampler); + inputOperation_->readSampled(inputColor, x, y, sampler); output[0] = IMB_colormanagement_get_luminance(inputColor); } @@ -144,7 +144,7 @@ void ConvertColorToVectorOperation::executePixelSampled(float output[4], PixelSampler sampler) { float color[4]; - m_inputOperation->readSampled(color, x, y, sampler); + inputOperation_->readSampled(color, x, y, sampler); copy_v3_v3(output, color); } @@ -169,7 +169,7 @@ void ConvertValueToVectorOperation::executePixelSampled(float output[4], PixelSampler sampler) { float value; - m_inputOperation->readSampled(&value, x, y, sampler); + inputOperation_->readSampled(&value, x, y, sampler); output[0] = output[1] = output[2] = value; } @@ -193,7 +193,7 @@ void ConvertVectorToColorOperation::executePixelSampled(float output[4], float y, PixelSampler sampler) { - m_inputOperation->readSampled(output, x, y, sampler); + inputOperation_->readSampled(output, x, y, sampler); output[3] = 1.0f; } @@ -219,7 +219,7 @@ void ConvertVectorToValueOperation::executePixelSampled(float output[4], PixelSampler sampler) { float input[4]; - m_inputOperation->readSampled(input, x, y, sampler); + inputOperation_->readSampled(input, x, y, sampler); output[0] = (input[0] + input[1] + input[2]) / 3.0f; } @@ -243,14 +243,14 @@ void ConvertRGBToYCCOperation::setMode(int mode) { switch (mode) { case 0: - m_mode = BLI_YCC_ITU_BT601; + mode_ = BLI_YCC_ITU_BT601; break; case 2: - m_mode = BLI_YCC_JFIF_0_255; + mode_ = BLI_YCC_JFIF_0_255; break; case 1: default: - m_mode = BLI_YCC_ITU_BT709; + mode_ = BLI_YCC_ITU_BT709; break; } } @@ -263,9 +263,8 @@ void ConvertRGBToYCCOperation::executePixelSampled(float output[4], float inputColor[4]; float color[3]; - m_inputOperation->readSampled(inputColor, x, y, sampler); - rgb_to_ycc( - inputColor[0], inputColor[1], inputColor[2], &color[0], &color[1], &color[2], m_mode); + inputOperation_->readSampled(inputColor, x, y, sampler); + rgb_to_ycc(inputColor[0], inputColor[1], inputColor[2], &color[0], &color[1], &color[2], mode_); /* divided by 255 to normalize for viewing in */ /* R,G,B --> Y,Cb,Cr */ @@ -276,14 +275,14 @@ void ConvertRGBToYCCOperation::executePixelSampled(float output[4], void ConvertRGBToYCCOperation::hash_output_params() { ConvertBaseOperation::hash_output_params(); - hash_param(m_mode); + hash_param(mode_); } void ConvertRGBToYCCOperation::update_memory_buffer_partial(BuffersIterator<float> &it) { for (; !it.is_end(); ++it) { const float *in = it.in(0); - rgb_to_ycc(in[0], in[1], in[2], &it.out[0], &it.out[1], &it.out[2], m_mode); + rgb_to_ycc(in[0], in[1], in[2], &it.out[0], &it.out[1], &it.out[2], mode_); /* Normalize for viewing (#rgb_to_ycc returns 0-255 values). */ mul_v3_fl(it.out, 1.0f / 255.0f); @@ -303,14 +302,14 @@ void ConvertYCCToRGBOperation::setMode(int mode) { switch (mode) { case 0: - m_mode = BLI_YCC_ITU_BT601; + mode_ = BLI_YCC_ITU_BT601; break; case 2: - m_mode = BLI_YCC_JFIF_0_255; + mode_ = BLI_YCC_JFIF_0_255; break; case 1: default: - m_mode = BLI_YCC_ITU_BT709; + mode_ = BLI_YCC_ITU_BT709; break; } } @@ -321,26 +320,21 @@ void ConvertYCCToRGBOperation::executePixelSampled(float output[4], PixelSampler sampler) { float inputColor[4]; - m_inputOperation->readSampled(inputColor, x, y, sampler); + inputOperation_->readSampled(inputColor, x, y, sampler); /* need to un-normalize the data */ /* R,G,B --> Y,Cb,Cr */ mul_v3_fl(inputColor, 255.0f); - ycc_to_rgb(inputColor[0], - inputColor[1], - inputColor[2], - &output[0], - &output[1], - &output[2], - m_mode); + ycc_to_rgb( + inputColor[0], inputColor[1], inputColor[2], &output[0], &output[1], &output[2], mode_); output[3] = inputColor[3]; } void ConvertYCCToRGBOperation::hash_output_params() { ConvertBaseOperation::hash_output_params(); - hash_param(m_mode); + hash_param(mode_); } void ConvertYCCToRGBOperation::update_memory_buffer_partial(BuffersIterator<float> &it) @@ -348,13 +342,8 @@ void ConvertYCCToRGBOperation::update_memory_buffer_partial(BuffersIterator<floa for (; !it.is_end(); ++it) { const float *in = it.in(0); /* Multiply by 255 to un-normalize (#ycc_to_rgb needs input values in 0-255 range). */ - ycc_to_rgb(in[0] * 255.0f, - in[1] * 255.0f, - in[2] * 255.0f, - &it.out[0], - &it.out[1], - &it.out[2], - m_mode); + ycc_to_rgb( + in[0] * 255.0f, in[1] * 255.0f, in[2] * 255.0f, &it.out[0], &it.out[1], &it.out[2], mode_); it.out[3] = in[3]; } } @@ -373,7 +362,7 @@ void ConvertRGBToYUVOperation::executePixelSampled(float output[4], PixelSampler sampler) { float inputColor[4]; - m_inputOperation->readSampled(inputColor, x, y, sampler); + inputOperation_->readSampled(inputColor, x, y, sampler); rgb_to_yuv(inputColor[0], inputColor[1], inputColor[2], @@ -407,7 +396,7 @@ void ConvertYUVToRGBOperation::executePixelSampled(float output[4], PixelSampler sampler) { float inputColor[4]; - m_inputOperation->readSampled(inputColor, x, y, sampler); + inputOperation_->readSampled(inputColor, x, y, sampler); yuv_to_rgb(inputColor[0], inputColor[1], inputColor[2], @@ -441,7 +430,7 @@ void ConvertRGBToHSVOperation::executePixelSampled(float output[4], PixelSampler sampler) { float inputColor[4]; - m_inputOperation->readSampled(inputColor, x, y, sampler); + inputOperation_->readSampled(inputColor, x, y, sampler); rgb_to_hsv_v(inputColor, output); output[3] = inputColor[3]; } @@ -469,7 +458,7 @@ void ConvertHSVToRGBOperation::executePixelSampled(float output[4], PixelSampler sampler) { float inputColor[4]; - m_inputOperation->readSampled(inputColor, x, y, sampler); + inputOperation_->readSampled(inputColor, x, y, sampler); hsv_to_rgb_v(inputColor, output); output[0] = max_ff(output[0], 0.0f); output[1] = max_ff(output[1], 0.0f); @@ -503,7 +492,7 @@ void ConvertPremulToStraightOperation::executePixelSampled(float output[4], PixelSampler sampler) { ColorSceneLinear4f<eAlpha::Premultiplied> input; - m_inputOperation->readSampled(input, x, y, sampler); + inputOperation_->readSampled(input, x, y, sampler); ColorSceneLinear4f<eAlpha::Straight> converted = input.unpremultiply_alpha(); copy_v4_v4(output, converted); } @@ -529,7 +518,7 @@ void ConvertStraightToPremulOperation::executePixelSampled(float output[4], PixelSampler sampler) { ColorSceneLinear4f<eAlpha::Straight> input; - m_inputOperation->readSampled(input, x, y, sampler); + inputOperation_->readSampled(input, x, y, sampler); ColorSceneLinear4f<eAlpha::Premultiplied> converted = input.premultiply_alpha(); copy_v4_v4(output, converted); } @@ -547,16 +536,16 @@ SeparateChannelOperation::SeparateChannelOperation() { this->addInputSocket(DataType::Color); this->addOutputSocket(DataType::Value); - m_inputOperation = nullptr; + inputOperation_ = nullptr; } void SeparateChannelOperation::initExecution() { - m_inputOperation = this->getInputSocketReader(0); + inputOperation_ = this->getInputSocketReader(0); } void SeparateChannelOperation::deinitExecution() { - m_inputOperation = nullptr; + inputOperation_ = nullptr; } void SeparateChannelOperation::executePixelSampled(float output[4], @@ -565,8 +554,8 @@ void SeparateChannelOperation::executePixelSampled(float output[4], PixelSampler sampler) { float input[4]; - m_inputOperation->readSampled(input, x, y, sampler); - output[0] = input[m_channel]; + inputOperation_->readSampled(input, x, y, sampler); + output[0] = input[channel_]; } void SeparateChannelOperation::update_memory_buffer_partial(MemoryBuffer *output, @@ -574,7 +563,7 @@ void SeparateChannelOperation::update_memory_buffer_partial(MemoryBuffer *output Span<MemoryBuffer *> inputs) { for (BuffersIterator<float> it = output->iterate_with(inputs, area); !it.is_end(); ++it) { - it.out[0] = it.in(0)[m_channel]; + it.out[0] = it.in(0)[channel_]; } } @@ -588,26 +577,26 @@ CombineChannelsOperation::CombineChannelsOperation() this->addInputSocket(DataType::Value); this->addOutputSocket(DataType::Color); this->set_canvas_input_index(0); - m_inputChannel1Operation = nullptr; - m_inputChannel2Operation = nullptr; - m_inputChannel3Operation = nullptr; - m_inputChannel4Operation = nullptr; + inputChannel1Operation_ = nullptr; + inputChannel2Operation_ = nullptr; + inputChannel3Operation_ = nullptr; + inputChannel4Operation_ = nullptr; } void CombineChannelsOperation::initExecution() { - m_inputChannel1Operation = this->getInputSocketReader(0); - m_inputChannel2Operation = this->getInputSocketReader(1); - m_inputChannel3Operation = this->getInputSocketReader(2); - m_inputChannel4Operation = this->getInputSocketReader(3); + inputChannel1Operation_ = this->getInputSocketReader(0); + inputChannel2Operation_ = this->getInputSocketReader(1); + inputChannel3Operation_ = this->getInputSocketReader(2); + inputChannel4Operation_ = this->getInputSocketReader(3); } void CombineChannelsOperation::deinitExecution() { - m_inputChannel1Operation = nullptr; - m_inputChannel2Operation = nullptr; - m_inputChannel3Operation = nullptr; - m_inputChannel4Operation = nullptr; + inputChannel1Operation_ = nullptr; + inputChannel2Operation_ = nullptr; + inputChannel3Operation_ = nullptr; + inputChannel4Operation_ = nullptr; } void CombineChannelsOperation::executePixelSampled(float output[4], @@ -616,20 +605,20 @@ void CombineChannelsOperation::executePixelSampled(float output[4], PixelSampler sampler) { float input[4]; - if (m_inputChannel1Operation) { - m_inputChannel1Operation->readSampled(input, x, y, sampler); + if (inputChannel1Operation_) { + inputChannel1Operation_->readSampled(input, x, y, sampler); output[0] = input[0]; } - if (m_inputChannel2Operation) { - m_inputChannel2Operation->readSampled(input, x, y, sampler); + if (inputChannel2Operation_) { + inputChannel2Operation_->readSampled(input, x, y, sampler); output[1] = input[0]; } - if (m_inputChannel3Operation) { - m_inputChannel3Operation->readSampled(input, x, y, sampler); + if (inputChannel3Operation_) { + inputChannel3Operation_->readSampled(input, x, y, sampler); output[2] = input[0]; } - if (m_inputChannel4Operation) { - m_inputChannel4Operation->readSampled(input, x, y, sampler); + if (inputChannel4Operation_) { + inputChannel4Operation_->readSampled(input, x, y, sampler); output[3] = input[0]; } } |