From 12a5a605572d742335a4978966444d393792cd28 Mon Sep 17 00:00:00 2001 From: Manuel Castilla Date: Thu, 7 Oct 2021 21:36:35 +0200 Subject: Cleanup: Use `_` suffix for non-public members in Compositor To follow the style guide. --- .../compositor/operations/COM_FlipOperation.cc | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'source/blender/compositor/operations/COM_FlipOperation.cc') diff --git a/source/blender/compositor/operations/COM_FlipOperation.cc b/source/blender/compositor/operations/COM_FlipOperation.cc index c08dce2fc01..ae2aa21131a 100644 --- a/source/blender/compositor/operations/COM_FlipOperation.cc +++ b/source/blender/compositor/operations/COM_FlipOperation.cc @@ -25,26 +25,26 @@ FlipOperation::FlipOperation() this->addInputSocket(DataType::Color, ResizeMode::None); this->addOutputSocket(DataType::Color); this->set_canvas_input_index(0); - m_inputOperation = nullptr; - m_flipX = true; - m_flipY = false; + inputOperation_ = nullptr; + flipX_ = true; + flipY_ = false; } void FlipOperation::initExecution() { - m_inputOperation = this->getInputSocketReader(0); + inputOperation_ = this->getInputSocketReader(0); } void FlipOperation::deinitExecution() { - m_inputOperation = nullptr; + inputOperation_ = nullptr; } void FlipOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler) { - float nx = m_flipX ? ((int)this->getWidth() - 1) - x : x; - float ny = m_flipY ? ((int)this->getHeight() - 1) - y : y; + float nx = flipX_ ? ((int)this->getWidth() - 1) - x : x; + float ny = flipY_ ? ((int)this->getHeight() - 1) - y : y; - m_inputOperation->readSampled(output, nx, ny, sampler); + inputOperation_->readSampled(output, nx, ny, sampler); } bool FlipOperation::determineDependingAreaOfInterest(rcti *input, @@ -53,7 +53,7 @@ bool FlipOperation::determineDependingAreaOfInterest(rcti *input, { rcti newInput; - if (m_flipX) { + if (flipX_) { const int w = (int)this->getWidth() - 1; newInput.xmax = (w - input->xmin) + 1; newInput.xmin = (w - input->xmax) - 1; @@ -62,7 +62,7 @@ bool FlipOperation::determineDependingAreaOfInterest(rcti *input, newInput.xmin = input->xmin; newInput.xmax = input->xmax; } - if (m_flipY) { + if (flipY_) { const int h = (int)this->getHeight() - 1; newInput.ymax = (h - input->ymin) + 1; newInput.ymin = (h - input->ymax) - 1; @@ -80,12 +80,12 @@ void FlipOperation::determine_canvas(const rcti &preferred_area, rcti &r_area) NodeOperation::determine_canvas(preferred_area, r_area); if (execution_model_ == eExecutionModel::FullFrame) { rcti input_area = r_area; - if (m_flipX) { + if (flipX_) { const int width = BLI_rcti_size_x(&input_area) - 1; r_area.xmax = (width - input_area.xmin) + 1; r_area.xmin = (width - input_area.xmax) + 1; } - if (m_flipY) { + if (flipY_) { const int height = BLI_rcti_size_y(&input_area) - 1; r_area.ymax = (height - input_area.ymin) + 1; r_area.ymin = (height - input_area.ymax) + 1; @@ -99,7 +99,7 @@ void FlipOperation::get_area_of_interest(const int input_idx, { BLI_assert(input_idx == 0); UNUSED_VARS_NDEBUG(input_idx); - if (m_flipX) { + if (flipX_) { const int w = (int)this->getWidth() - 1; r_input_area.xmax = (w - output_area.xmin) + 1; r_input_area.xmin = (w - output_area.xmax) + 1; @@ -108,7 +108,7 @@ void FlipOperation::get_area_of_interest(const int input_idx, r_input_area.xmin = output_area.xmin; r_input_area.xmax = output_area.xmax; } - if (m_flipY) { + if (flipY_) { const int h = (int)this->getHeight() - 1; r_input_area.ymax = (h - output_area.ymin) + 1; r_input_area.ymin = (h - output_area.ymax) + 1; @@ -127,8 +127,8 @@ void FlipOperation::update_memory_buffer_partial(MemoryBuffer *output, const int input_offset_x = input_img->get_rect().xmin; const int input_offset_y = input_img->get_rect().ymin; for (BuffersIterator it = output->iterate_with({}, area); !it.is_end(); ++it) { - const int nx = m_flipX ? ((int)this->getWidth() - 1) - it.x : it.x; - const int ny = m_flipY ? ((int)this->getHeight() - 1) - it.y : it.y; + const int nx = flipX_ ? ((int)this->getWidth() - 1) - it.x : it.x; + const int ny = flipY_ ? ((int)this->getHeight() - 1) - it.y : it.y; input_img->read_elem(input_offset_x + nx, input_offset_y + ny, it.out); } } -- cgit v1.2.3