From ec85a206b1412f9caa654df0ceb5132c4e008e99 Mon Sep 17 00:00:00 2001 From: scawful Date: Mon, 18 Nov 2024 14:12:46 -0500 Subject: [PATCH] Refactor color conversion functions for consistent naming and improved readability --- src/app/editor/graphics/palette_editor.cc | 2 +- src/app/gfx/snes_color.cc | 16 ++++++------- src/app/gfx/snes_color.h | 18 +++++++-------- src/app/gfx/snes_palette.cc | 8 +++---- src/app/gui/color.cc | 2 +- src/test/gfx/snes_palette_test.cc | 28 +++++++++++------------ 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/app/editor/graphics/palette_editor.cc b/src/app/editor/graphics/palette_editor.cc index da67b837..b62b17e7 100644 --- a/src/app/editor/graphics/palette_editor.cc +++ b/src/app/editor/graphics/palette_editor.cc @@ -433,7 +433,7 @@ absl::Status PaletteEditor::HandleColorPopup(gfx::SnesPalette& palette, int i, // SNES Format CustomFormatString(buf, IM_ARRAYSIZE(buf), "$%04X", - ConvertRGBtoSNES(ImVec4(col[0], col[1], col[2], 1.0f))); + ConvertRgbToSnes(ImVec4(col[0], col[1], col[2], 1.0f))); if (Selectable(buf)) SetClipboardText(buf); EndPopup(); diff --git a/src/app/gfx/snes_color.cc b/src/app/gfx/snes_color.cc index ee55fbd1..1c74d444 100644 --- a/src/app/gfx/snes_color.cc +++ b/src/app/gfx/snes_color.cc @@ -1,11 +1,11 @@ #include "app/gfx/snes_color.h" -#include "imgui/imgui.h" - #include #include +#include "imgui/imgui.h" + namespace yaze { namespace app { namespace gfx { @@ -17,7 +17,7 @@ constexpr uint16_t SNES_BLUE_MASK = 32; constexpr uint16_t SNES_GREEN_SHIFT = 32; constexpr uint16_t SNES_BLUE_SHIFT = 1024; -snes_color ConvertSNEStoRGB(uint16_t color_snes) { +snes_color ConvertSnesToRgb(uint16_t color_snes) { snes_color result; result.red = (color_snes % SNES_RED_MASK) * 8; @@ -31,19 +31,19 @@ snes_color ConvertSNEStoRGB(uint16_t color_snes) { return result; } -uint16_t ConvertRGBtoSNES(const snes_color& color) { +uint16_t ConvertRgbToSnes(const snes_color& color) { uint16_t red = color.red / 8; uint16_t green = color.green / 8; uint16_t blue = color.blue / 8; return (blue * SNES_BLUE_SHIFT) + (green * SNES_GREEN_SHIFT) + red; } -uint16_t ConvertRGBtoSNES(const ImVec4& color) { +uint16_t ConvertRgbToSnes(const ImVec4& color) { snes_color new_color; new_color.red = color.x * kColorByteMax; new_color.green = color.y * kColorByteMax; new_color.blue = color.z * kColorByteMax; - return ConvertRGBtoSNES(new_color); + return ConvertRgbToSnes(new_color); } SnesColor ReadColorFromRom(int offset, const uint8_t* rom) { @@ -62,7 +62,7 @@ std::vector Extract(const char* data, unsigned int offset, for (unsigned int i = 0; i < palette_size * 2; i += 2) { uint16_t snes_color = (static_cast(data[offset + i + 1]) << 8) | static_cast(data[offset + i]); - palette[i / 2] = ConvertSNEStoRGB(snes_color); + palette[i / 2] = ConvertSnesToRgb(snes_color); } return palette; } @@ -70,7 +70,7 @@ std::vector Extract(const char* data, unsigned int offset, std::vector Convert(const std::vector& palette) { std::vector data(palette.size() * 2); for (unsigned int i = 0; i < palette.size(); i++) { - uint16_t snes_data = ConvertRGBtoSNES(palette[i]); + uint16_t snes_data = ConvertRgbToSnes(palette[i]); data[i * 2] = snes_data & 0xFF; data[i * 2 + 1] = snes_data >> 8; } diff --git a/src/app/gfx/snes_color.h b/src/app/gfx/snes_color.h index a10eceb5..8045c1e8 100644 --- a/src/app/gfx/snes_color.h +++ b/src/app/gfx/snes_color.h @@ -14,9 +14,9 @@ namespace gfx { constexpr int NumberOfColors = 3143; -snes_color ConvertSNEStoRGB(uint16_t snes_color); -uint16_t ConvertRGBtoSNES(const snes_color& color); -uint16_t ConvertRGBtoSNES(const ImVec4& color); +snes_color ConvertSnesToRgb(uint16_t snes_color); +uint16_t ConvertRgbToSnes(const snes_color& color); +uint16_t ConvertRgbToSnes(const ImVec4& color); std::vector Extract(const char* data, unsigned int offset, unsigned int palette_size); @@ -44,15 +44,15 @@ class SnesColor { color.red = val.x / kColorByteMax; color.green = val.y / kColorByteMax; color.blue = val.z / kColorByteMax; - snes_ = ConvertRGBtoSNES(color); + snes_ = ConvertRgbToSnes(color); } explicit SnesColor(const uint16_t val) : snes_(val) { - snes_color color = ConvertSNEStoRGB(val); + snes_color color = ConvertSnesToRgb(val); rgb_ = ImVec4(color.red, color.green, color.blue, 0.f); } explicit SnesColor(const snes_color val) : rgb_(val.red, val.green, val.blue, kColorByteMaxF), - snes_(ConvertRGBtoSNES(val)), + snes_(ConvertRgbToSnes(val)), rom_color_(val) {} SnesColor(uint8_t r, uint8_t g, uint8_t b) { @@ -61,7 +61,7 @@ class SnesColor { color.red = r; color.green = g; color.blue = b; - snes_ = ConvertRGBtoSNES(color); + snes_ = ConvertRgbToSnes(color); rom_color_ = color; } @@ -76,13 +76,13 @@ class SnesColor { color.green = val.y; color.blue = val.z; rom_color_ = color; - snes_ = ConvertRGBtoSNES(color); + snes_ = ConvertRgbToSnes(color); modified = true; } void set_snes(uint16_t val) { snes_ = val; - snes_color col = ConvertSNEStoRGB(val); + snes_color col = ConvertSnesToRgb(val); rgb_ = ImVec4(col.red, col.green, col.blue, 0.f); modified = true; } diff --git a/src/app/gfx/snes_palette.cc b/src/app/gfx/snes_palette.cc index c0f5f81a..0188fcc7 100644 --- a/src/app/gfx/snes_palette.cc +++ b/src/app/gfx/snes_palette.cc @@ -229,7 +229,7 @@ SnesPalette::SnesPalette(char *data) { SnesColor col; col.set_snes(static_cast(data[i + 1]) << 8); col.set_snes(col.snes() | static_cast(data[i])); - snes_color mColor = ConvertSNEStoRGB(col.snes()); + snes_color mColor = ConvertSnesToRgb(col.snes()); col.set_rgb(ImVec4(mColor.red, mColor.green, mColor.blue, 1.f)); colors.push_back(col); } @@ -241,7 +241,7 @@ SnesPalette::SnesPalette(const unsigned char *snes_pal) { SnesColor col; col.set_snes(snes_pal[i + 1] << (uint16_t)8); col.set_snes(col.snes() | snes_pal[i]); - snes_color mColor = ConvertSNEStoRGB(col.snes()); + snes_color mColor = ConvertSnesToRgb(col.snes()); col.set_rgb(ImVec4(mColor.red, mColor.green, mColor.blue, 1.f)); colors.push_back(col); } @@ -258,7 +258,7 @@ SnesPalette::SnesPalette(const std::vector &cols) { SnesPalette::SnesPalette(const std::vector &cols) { for (const auto &each : cols) { SnesColor scol; - scol.set_snes(ConvertRGBtoSNES(each)); + scol.set_snes(ConvertRgbToSnes(each)); colors.push_back(scol); } } @@ -279,7 +279,7 @@ SnesPalette ReadPaletteFromRom(int offset, int num_colors, const uint8_t *rom) { new_color.red = (color & 0x1F) * 8; new_color.green = ((color >> 5) & 0x1F) * 8; new_color.blue = ((color >> 10) & 0x1F) * 8; - colors[color_offset].set_snes(ConvertRGBtoSNES(new_color)); + colors[color_offset].set_snes(ConvertRgbToSnes(new_color)); if (color_offset == 0) { colors[color_offset].set_transparent(true); } diff --git a/src/app/gui/color.cc b/src/app/gui/color.cc index 28260b16..9e8ea108 100644 --- a/src/app/gui/color.cc +++ b/src/app/gui/color.cc @@ -48,7 +48,7 @@ IMGUI_API bool SnesColorEdit4(absl::string_view label, SnesColor* color, ImGui::ColorEdit4(label.data(), (float*)&displayColor.x, flags); color->set_rgb(displayColor); - color->set_snes(gfx::ConvertRGBtoSNES(displayColor)); + color->set_snes(gfx::ConvertRgbToSnes(displayColor)); return pressed; } diff --git a/src/test/gfx/snes_palette_test.cc b/src/test/gfx/snes_palette_test.cc index c57397d2..2e962290 100644 --- a/src/test/gfx/snes_palette_test.cc +++ b/src/test/gfx/snes_palette_test.cc @@ -10,8 +10,8 @@ namespace test { namespace gfx { using ::testing::ElementsAreArray; -using yaze::app::gfx::ConvertRGBtoSNES; -using yaze::app::gfx::ConvertSNEStoRGB; +using yaze::app::gfx::ConvertRgbToSnes; +using yaze::app::gfx::ConvertSnestoRGB; using yaze::app::gfx::Extract; using yaze::app::gfx::SnesPalette; @@ -25,45 +25,45 @@ unsigned int test_convert(snes_color col) { } } // namespace -TEST(SNESPaletteTest, AddColor) { +TEST(SnesPaletteTest, AddColor) { yaze::app::gfx::SnesPalette palette; yaze::app::gfx::SnesColor color; palette.AddColor(color); ASSERT_EQ(palette.size(), 1); } -TEST(SNESColorTest, ConvertRGBtoSNES) { +TEST(SnesColorTest, ConvertRgbToSnes) { snes_color color = {132, 132, 132}; - uint16_t snes = ConvertRGBtoSNES(color); + uint16_t snes = ConvertRgbToSnes(color); ASSERT_EQ(snes, 0x4210); } -TEST(SNESColorTest, ConvertSNEStoRGB) { +TEST(SnesColorTest, ConvertSnestoRGB) { uint16_t snes = 0x4210; - snes_color color = ConvertSNEStoRGB(snes); + snes_color color = ConvertSnestoRGB(snes); ASSERT_EQ(color.red, 132); ASSERT_EQ(color.green, 132); ASSERT_EQ(color.blue, 132); } -TEST(SNESColorTest, ConvertSNESToRGB_Binary) { +TEST(SnesColorTest, ConvertSnesToRGB_Binary) { uint16_t red = 0b0000000000011111; uint16_t blue = 0b0111110000000000; uint16_t green = 0b0000001111100000; uint16_t purple = 0b0111110000011111; snes_color testcolor; - testcolor = ConvertSNEStoRGB(red); + testcolor = ConvertSnestoRGB(red); ASSERT_EQ(0xFF0000, test_convert(testcolor)); - testcolor = ConvertSNEStoRGB(green); + testcolor = ConvertSnestoRGB(green); ASSERT_EQ(0x00FF00, test_convert(testcolor)); - testcolor = ConvertSNEStoRGB(blue); + testcolor = ConvertSnestoRGB(blue); ASSERT_EQ(0x0000FF, test_convert(testcolor)); - testcolor = ConvertSNEStoRGB(purple); + testcolor = ConvertSnestoRGB(purple); ASSERT_EQ(0xFF00FF, test_convert(testcolor)); } -TEST(SNESColorTest, Extraction) { +TEST(SnesColorTest, Extraction) { // red, blue, green, purple char data[8] = {0x1F, 0x00, 0x00, 0x7C, static_cast(0xE0), 0x03, 0x1F, 0x7C}; @@ -75,7 +75,7 @@ TEST(SNESColorTest, Extraction) { ASSERT_EQ(0xFF00FF, test_convert(pal[3])); } -TEST(SNESColorTest, Convert) { +TEST(SnesColorTest, Convert) { // red, blue, green, purple white char data[10] = {0x1F, 0x00,