From 2356c3f4cd9a530f8812979f375166ea37d08f8a Mon Sep 17 00:00:00 2001 From: Omar Emara Date: Fri, 17 Jun 2022 10:34:57 +0200 Subject: Realtime Compositor: Use more consistent names --- .../nodes/node_composite_channel_matte.cc | 10 ++--- .../composite/nodes/node_composite_chroma_matte.cc | 8 ++-- .../composite/nodes/node_composite_color_matte.cc | 8 ++-- .../composite/nodes/node_composite_color_spill.cc | 16 ++++---- .../composite/nodes/node_composite_colorbalance.cc | 18 ++++---- .../nodes/node_composite_colorcorrection.cc | 48 +++++++++++----------- .../composite/nodes/node_composite_diff_matte.cc | 6 +-- .../nodes/node_composite_distance_matte.cc | 8 ++-- .../composite/nodes/node_composite_luma_matte.cc | 6 +-- .../composite/nodes/node_composite_setalpha.cc | 6 +-- 10 files changed, 66 insertions(+), 68 deletions(-) diff --git a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc index e17e85f8b87..2f37eba9f2c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc @@ -130,7 +130,7 @@ class ChannelMatteShaderNode : public ShaderNode { return bnode().custom2 - 1; } - NodeChroma *get_node_chroma() + NodeChroma *get_data() { return static_cast(bnode().storage); } @@ -138,7 +138,7 @@ class ChannelMatteShaderNode : public ShaderNode { /* Get the index of the channel used to compute the limit value. */ int get_limit_channel() { - return get_node_chroma()->channel - 1; + return get_data()->channel - 1; } /* Get the indices of the channels used to compute the limit value. We always assume the limit @@ -146,7 +146,7 @@ class ChannelMatteShaderNode : public ShaderNode { * the maximum of two identical values is is the same value. */ void get_limit_channels(float limit_channels[2]) { - if (get_node_chroma()->algorithm) { + if (get_data()->algorithm) { /* If the algorithm is Max, store the indices of the other two channels other than the matte * channel. */ limit_channels[0] = (get_matte_channel() + 1) % 3; @@ -161,12 +161,12 @@ class ChannelMatteShaderNode : public ShaderNode { float get_max_limit() { - return get_node_chroma()->t1; + return get_data()->t1; } float get_min_limit() { - return get_node_chroma()->t2; + return get_data()->t2; } }; diff --git a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc index 9dcd4213949..df74c069b5d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc @@ -84,24 +84,24 @@ class ChromaMatteShaderNode : public ShaderNode { GPU_uniform(&falloff)); } - NodeChroma *get_node_chroma() + NodeChroma *get_data() { return static_cast(bnode().storage); } float get_acceptance() { - return std::tan(get_node_chroma()->t1) / 2.0f; + return std::tan(get_data()->t1) / 2.0f; } float get_cutoff() { - return get_node_chroma()->t2; + return get_data()->t2; } float get_falloff() { - return get_node_chroma()->fstrength; + return get_data()->fstrength; } }; diff --git a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc index 5e3aaf512e6..9c20b41460b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc @@ -83,7 +83,7 @@ class ColorMatteShaderNode : public ShaderNode { GPU_uniform(&value_epsilon)); } - NodeChroma *get_node_chroma() + NodeChroma *get_data() { return static_cast(bnode().storage); } @@ -91,17 +91,17 @@ class ColorMatteShaderNode : public ShaderNode { float get_hue_epsilon() { /* Divide by 2 because the hue wraps around. */ - return get_node_chroma()->t1 / 2.0f; + return get_data()->t1 / 2.0f; } float get_saturation_epsilon() { - return get_node_chroma()->t2; + return get_data()->t2; } float get_value_epsilon() { - return get_node_chroma()->t3; + return get_data()->t3; } }; diff --git a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc index f2c066431b7..f84a6021cf0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc @@ -134,24 +134,24 @@ class ColorSpillShaderNode : public ShaderNode { return bnode().custom2; } - NodeColorspill *get_node_color_spill() + NodeColorspill *get_data() { return static_cast(bnode().storage); } void get_spill_scale(float spill_scale[3]) { - const NodeColorspill *node_color_spill = get_node_color_spill(); - if (node_color_spill->unspill == 0) { + const NodeColorspill *data = get_data(); + if (data->unspill == 0) { spill_scale[0] = 0.0f; spill_scale[1] = 0.0f; spill_scale[2] = 0.0f; spill_scale[get_spill_channel()] = -1.0f; } else { - spill_scale[0] = node_color_spill->uspillr; - spill_scale[1] = node_color_spill->uspillg; - spill_scale[2] = node_color_spill->uspillb; + spill_scale[0] = data->uspillr; + spill_scale[1] = data->uspillg; + spill_scale[2] = data->uspillb; spill_scale[get_spill_channel()] *= -1.0f; } } @@ -159,7 +159,7 @@ class ColorSpillShaderNode : public ShaderNode { /* Get the index of the channel used for limiting. */ int get_limit_channel() { - return get_node_color_spill()->limchan; + return get_data()->limchan; } /* Get the indices of the channels used to compute the limit value. We always assume the limit @@ -182,7 +182,7 @@ class ColorSpillShaderNode : public ShaderNode { float get_limit_scale() { - return get_node_color_spill()->limscale; + return get_data()->limscale; } }; diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc index 90c5f6b4748..acca02bd606 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc @@ -161,7 +161,7 @@ class ColorBalanceShaderNode : public ShaderNode { GPUNodeStack *inputs = get_inputs_array(); GPUNodeStack *outputs = get_outputs_array(); - const NodeColorBalance *node_color_balance = get_node_color_balance(); + const NodeColorBalance *data = get_data(); if (get_color_balance_method() == 0) { GPU_stack_link(material, @@ -169,9 +169,9 @@ class ColorBalanceShaderNode : public ShaderNode { "node_composite_color_balance_lgg", inputs, outputs, - GPU_uniform(node_color_balance->lift), - GPU_uniform(node_color_balance->gamma), - GPU_uniform(node_color_balance->gain)); + GPU_uniform(data->lift), + GPU_uniform(data->gamma), + GPU_uniform(data->gain)); return; } @@ -180,10 +180,10 @@ class ColorBalanceShaderNode : public ShaderNode { "node_composite_color_balance_asc_cdl", inputs, outputs, - GPU_uniform(node_color_balance->offset), - GPU_uniform(node_color_balance->power), - GPU_uniform(node_color_balance->slope), - GPU_uniform(&node_color_balance->offset_basis)); + GPU_uniform(data->offset), + GPU_uniform(data->power), + GPU_uniform(data->slope), + GPU_uniform(&data->offset_basis)); } /* Get color balance method. @@ -194,7 +194,7 @@ class ColorBalanceShaderNode : public ShaderNode { return bnode().custom1; } - NodeColorBalance *get_node_color_balance() + NodeColorBalance *get_data() { return static_cast(bnode().storage); } diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc index 36e6672ce1c..48d43ba3407 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc @@ -294,7 +294,7 @@ class ColorCorrectionShaderNode : public ShaderNode { float luminance_coefficients[3]; IMB_colormanagement_get_luminance_coefficients(luminance_coefficients); - const NodeColorCorrection *node_color_correction = get_node_color_correction(); + const NodeColorCorrection *data = get_data(); GPU_stack_link(material, &bnode(), @@ -302,28 +302,28 @@ class ColorCorrectionShaderNode : public ShaderNode { inputs, outputs, GPU_constant(enabled_channels), - GPU_uniform(&node_color_correction->startmidtones), - GPU_uniform(&node_color_correction->endmidtones), - GPU_uniform(&node_color_correction->master.saturation), - GPU_uniform(&node_color_correction->master.contrast), - GPU_uniform(&node_color_correction->master.gamma), - GPU_uniform(&node_color_correction->master.gain), - GPU_uniform(&node_color_correction->master.lift), - GPU_uniform(&node_color_correction->shadows.saturation), - GPU_uniform(&node_color_correction->shadows.contrast), - GPU_uniform(&node_color_correction->shadows.gamma), - GPU_uniform(&node_color_correction->shadows.gain), - GPU_uniform(&node_color_correction->shadows.lift), - GPU_uniform(&node_color_correction->midtones.saturation), - GPU_uniform(&node_color_correction->midtones.contrast), - GPU_uniform(&node_color_correction->midtones.gamma), - GPU_uniform(&node_color_correction->midtones.gain), - GPU_uniform(&node_color_correction->midtones.lift), - GPU_uniform(&node_color_correction->highlights.saturation), - GPU_uniform(&node_color_correction->highlights.contrast), - GPU_uniform(&node_color_correction->highlights.gamma), - GPU_uniform(&node_color_correction->highlights.gain), - GPU_uniform(&node_color_correction->highlights.lift), + GPU_uniform(&data->startmidtones), + GPU_uniform(&data->endmidtones), + GPU_uniform(&data->master.saturation), + GPU_uniform(&data->master.contrast), + GPU_uniform(&data->master.gamma), + GPU_uniform(&data->master.gain), + GPU_uniform(&data->master.lift), + GPU_uniform(&data->shadows.saturation), + GPU_uniform(&data->shadows.contrast), + GPU_uniform(&data->shadows.gamma), + GPU_uniform(&data->shadows.gain), + GPU_uniform(&data->shadows.lift), + GPU_uniform(&data->midtones.saturation), + GPU_uniform(&data->midtones.contrast), + GPU_uniform(&data->midtones.gamma), + GPU_uniform(&data->midtones.gain), + GPU_uniform(&data->midtones.lift), + GPU_uniform(&data->highlights.saturation), + GPU_uniform(&data->highlights.contrast), + GPU_uniform(&data->highlights.gamma), + GPU_uniform(&data->highlights.gain), + GPU_uniform(&data->highlights.lift), GPU_constant(luminance_coefficients)); } @@ -334,7 +334,7 @@ class ColorCorrectionShaderNode : public ShaderNode { } } - NodeColorCorrection *get_node_color_correction() + NodeColorCorrection *get_data() { return static_cast(bnode().storage); } diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc index 9241e0e37af..51a3e1ea7d7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc @@ -71,19 +71,19 @@ class DifferenceMatteShaderNode : public ShaderNode { GPU_uniform(&falloff)); } - NodeChroma *get_node_chroma() + NodeChroma *get_data() { return static_cast(bnode().storage); } float get_tolerance() { - return get_node_chroma()->t1; + return get_data()->t1; } float get_falloff() { - return get_node_chroma()->t2; + return get_data()->t2; } }; diff --git a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc index 3153cfa66c7..840460f07a7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc @@ -90,7 +90,7 @@ class DistanceMatteShaderNode : public ShaderNode { GPU_uniform(&falloff)); } - NodeChroma *get_node_chroma() + NodeChroma *get_data() { return static_cast(bnode().storage); } @@ -99,17 +99,17 @@ class DistanceMatteShaderNode : public ShaderNode { * 1 -> RGBA */ int get_color_space() { - return get_node_chroma()->channel; + return get_data()->channel; } float get_tolerance() { - return get_node_chroma()->t1; + return get_data()->t1; } float get_falloff() { - return get_node_chroma()->t2; + return get_data()->t2; } }; diff --git a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc index 092a12a7ea4..c4f4ee3ee5b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc @@ -74,19 +74,19 @@ class LuminanceMatteShaderNode : public ShaderNode { GPU_constant(luminance_coefficients)); } - NodeChroma *get_node_chroma() + NodeChroma *get_data() { return static_cast(bnode().storage); } float get_high() { - return get_node_chroma()->t1; + return get_data()->t1; } float get_low() { - return get_node_chroma()->t2; + return get_data()->t2; } }; diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc index b4e98186974..f6faa5c3ce8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc +++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc @@ -54,9 +54,7 @@ class SetAlphaShaderNode : public ShaderNode { GPUNodeStack *inputs = get_inputs_array(); GPUNodeStack *outputs = get_outputs_array(); - const NodeSetAlpha *node_set_alpha = get_node_set_alpha(); - - if (node_set_alpha->mode == CMP_NODE_SETALPHA_MODE_APPLY) { + if (get_data()->mode == CMP_NODE_SETALPHA_MODE_APPLY) { GPU_stack_link(material, &bnode(), "node_composite_set_alpha_apply", inputs, outputs); return; } @@ -64,7 +62,7 @@ class SetAlphaShaderNode : public ShaderNode { GPU_stack_link(material, &bnode(), "node_composite_set_alpha_replace", inputs, outputs); } - NodeSetAlpha *get_node_set_alpha() + NodeSetAlpha *get_data() { return static_cast(bnode().storage); } -- cgit v1.2.3