From 796959c20564657bc49cbdb5097bb0a2ef02d03c Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Mon, 2 Dec 2024 11:25:32 +0100 Subject: [PATCH] Cleanup: ImageEngine: Code-style (enum casing) --- .../blender/draw/engines/image/image_enums.hh | 12 +++++------ .../draw/engines/image/image_shader_params.hh | 4 ++-- .../draw/engines/image/image_space_image.hh | 20 +++++++++---------- .../draw/engines/image/image_space_node.hh | 18 ++++++++--------- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/source/blender/draw/engines/image/image_enums.hh b/source/blender/draw/engines/image/image_enums.hh index 2659135bd79..93d9d0cca43 100644 --- a/source/blender/draw/engines/image/image_enums.hh +++ b/source/blender/draw/engines/image/image_enums.hh @@ -14,12 +14,12 @@ namespace blender::image_engine { /* Shader parameters. */ enum class ImageDrawFlags { - Default = 0, - ShowAlpha = (1 << 0), - ApplyAlpha = (1 << 1), - Shuffling = (1 << 2), - Depth = (1 << 3) + DEFAULT = 0, + SHOW_ALPHA = (1 << 0), + APPLY_ALPHA = (1 << 1), + SHUFFLING = (1 << 2), + DEPTH = (1 << 3) }; -ENUM_OPERATORS(ImageDrawFlags, ImageDrawFlags::Depth); +ENUM_OPERATORS(ImageDrawFlags, ImageDrawFlags::DEPTH); } // namespace blender::image_engine diff --git a/source/blender/draw/engines/image/image_shader_params.hh b/source/blender/draw/engines/image/image_shader_params.hh index d5034f41e36..bab66e92fec 100644 --- a/source/blender/draw/engines/image/image_shader_params.hh +++ b/source/blender/draw/engines/image/image_shader_params.hh @@ -22,14 +22,14 @@ namespace blender::image_engine { struct ShaderParameters { - ImageDrawFlags flags = ImageDrawFlags::Default; + ImageDrawFlags flags = ImageDrawFlags::DEFAULT; float shuffle[4]; float far_near[2]; bool use_premul_alpha = false; void update(AbstractSpaceAccessor *space, const Scene *scene, Image *image, ImBuf *image_buffer) { - flags = ImageDrawFlags::Default; + flags = ImageDrawFlags::DEFAULT; copy_v4_fl(shuffle, 1.0f); copy_v2_fl2(far_near, 100.0f, 0.0f); diff --git a/source/blender/draw/engines/image/image_space_image.hh b/source/blender/draw/engines/image/image_space_image.hh index 925158cf199..15f0121e707 100644 --- a/source/blender/draw/engines/image/image_space_image.hh +++ b/source/blender/draw/engines/image/image_space_image.hh @@ -45,40 +45,40 @@ class SpaceImageAccessor : public AbstractSpaceAccessor { const int sima_flag = sima->flag & ED_space_image_get_display_channel_mask(image_buffer); if ((sima_flag & SI_USE_ALPHA) != 0) { /* Show RGBA */ - r_shader_parameters.flags |= ImageDrawFlags::ShowAlpha | ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::SHOW_ALPHA | ImageDrawFlags::APPLY_ALPHA; } else if ((sima_flag & SI_SHOW_ALPHA) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::SHUFFLING; copy_v4_fl4(r_shader_parameters.shuffle, 0.0f, 0.0f, 0.0f, 1.0f); } else if ((sima_flag & SI_SHOW_ZBUF) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Depth | ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::DEPTH | ImageDrawFlags::SHUFFLING; copy_v4_fl4(r_shader_parameters.shuffle, 1.0f, 0.0f, 0.0f, 0.0f); } else if ((sima_flag & SI_SHOW_R) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::SHUFFLING; if (IMB_alpha_affects_rgb(image_buffer)) { - r_shader_parameters.flags |= ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::APPLY_ALPHA; } copy_v4_fl4(r_shader_parameters.shuffle, 1.0f, 0.0f, 0.0f, 0.0f); } else if ((sima_flag & SI_SHOW_G) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::SHUFFLING; if (IMB_alpha_affects_rgb(image_buffer)) { - r_shader_parameters.flags |= ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::APPLY_ALPHA; } copy_v4_fl4(r_shader_parameters.shuffle, 0.0f, 1.0f, 0.0f, 0.0f); } else if ((sima_flag & SI_SHOW_B) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::SHUFFLING; if (IMB_alpha_affects_rgb(image_buffer)) { - r_shader_parameters.flags |= ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::APPLY_ALPHA; } copy_v4_fl4(r_shader_parameters.shuffle, 0.0f, 0.0f, 1.0f, 0.0f); } else /* RGB */ { if (IMB_alpha_affects_rgb(image_buffer)) { - r_shader_parameters.flags |= ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::APPLY_ALPHA; } } } diff --git a/source/blender/draw/engines/image/image_space_node.hh b/source/blender/draw/engines/image/image_space_node.hh index 59cdc1cfdc6..461e74c9e17 100644 --- a/source/blender/draw/engines/image/image_space_node.hh +++ b/source/blender/draw/engines/image/image_space_node.hh @@ -42,36 +42,36 @@ class SpaceNodeAccessor : public AbstractSpaceAccessor { { if ((snode->flag & SNODE_USE_ALPHA) != 0) { /* Show RGBA */ - r_shader_parameters.flags |= ImageDrawFlags::ShowAlpha | ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::SHOW_ALPHA | ImageDrawFlags::APPLY_ALPHA; } else if ((snode->flag & SNODE_SHOW_ALPHA) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::SHUFFLING; copy_v4_fl4(r_shader_parameters.shuffle, 0.0f, 0.0f, 0.0f, 1.0f); } else if ((snode->flag & SNODE_SHOW_R) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::SHUFFLING; if (IMB_alpha_affects_rgb(ibuf)) { - r_shader_parameters.flags |= ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::APPLY_ALPHA; } copy_v4_fl4(r_shader_parameters.shuffle, 1.0f, 0.0f, 0.0f, 0.0f); } else if ((snode->flag & SNODE_SHOW_G) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::SHUFFLING; if (IMB_alpha_affects_rgb(ibuf)) { - r_shader_parameters.flags |= ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::APPLY_ALPHA; } copy_v4_fl4(r_shader_parameters.shuffle, 0.0f, 1.0f, 0.0f, 0.0f); } else if ((snode->flag & SNODE_SHOW_B) != 0) { - r_shader_parameters.flags |= ImageDrawFlags::Shuffling; + r_shader_parameters.flags |= ImageDrawFlags::SHUFFLING; if (IMB_alpha_affects_rgb(ibuf)) { - r_shader_parameters.flags |= ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::APPLY_ALPHA; } copy_v4_fl4(r_shader_parameters.shuffle, 0.0f, 0.0f, 1.0f, 0.0f); } else /* RGB */ { if (IMB_alpha_affects_rgb(ibuf)) { - r_shader_parameters.flags |= ImageDrawFlags::ApplyAlpha; + r_shader_parameters.flags |= ImageDrawFlags::APPLY_ALPHA; } } }