phaneron/Kelsidavis-WoWee
1
0
Fork 0
mirror of https://github.com/Kelsidavis/WoWee.git synced 2026-03-26 00:40:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: consolidate UI colors, quality colors, and renderCoinsText

Browse source 
Create shared include/ui/ui_colors.hpp with common ImGui color constants,
item quality color lookup, and renderCoinsText utility. Remove 3 duplicate
renderCoinsText implementations and 3 duplicate quality color switch
blocks across game_screen, inventory_screen, and quest_log_screen.
This commit is contained in:
Kelsi 2026-03-25 12:27:43 -07:00
parent eea205ffc9
commit 4d46641ac2
4 changed files with 71 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

56
include/ui/ui_colors.hpp Normal file
View file

@ -0,0 +1,56 @@
#pragma once
#include <imgui.h>
#include "game/inventory.hpp"
namespace wowee::ui {
// ---- Common UI colors ----
namespace colors {
constexpr ImVec4 kRed = {1.0f, 0.3f, 0.3f, 1.0f};
constexpr ImVec4 kGreen = {0.4f, 1.0f, 0.4f, 1.0f};
constexpr ImVec4 kBrightGreen = {0.3f, 1.0f, 0.3f, 1.0f};
constexpr ImVec4 kYellow = {1.0f, 1.0f, 0.3f, 1.0f};
constexpr ImVec4 kGray = {0.6f, 0.6f, 0.6f, 1.0f};
constexpr ImVec4 kDarkGray = {0.5f, 0.5f, 0.5f, 1.0f};
constexpr ImVec4 kLightGray = {0.7f, 0.7f, 0.7f, 1.0f};
constexpr ImVec4 kWhite = {1.0f, 1.0f, 1.0f, 1.0f};
// Coin colors
constexpr ImVec4 kGold = {1.00f, 0.82f, 0.00f, 1.0f};
constexpr ImVec4 kSilver = {0.80f, 0.80f, 0.80f, 1.0f};
constexpr ImVec4 kCopper = {0.72f, 0.45f, 0.20f, 1.0f};
} // namespace colors
// ---- Item quality colors ----
inline ImVec4 getQualityColor(game::ItemQuality quality) {
switch (quality) {
case game::ItemQuality::POOR: return {0.62f, 0.62f, 0.62f, 1.0f};
case game::ItemQuality::COMMON: return {1.0f, 1.0f, 1.0f, 1.0f};
case game::ItemQuality::UNCOMMON: return {0.12f, 1.0f, 0.0f, 1.0f};
case game::ItemQuality::RARE: return {0.0f, 0.44f, 0.87f, 1.0f};
case game::ItemQuality::EPIC: return {0.64f, 0.21f, 0.93f, 1.0f};
case game::ItemQuality::LEGENDARY: return {1.0f, 0.50f, 0.0f, 1.0f};
case game::ItemQuality::ARTIFACT: return {0.90f, 0.80f, 0.50f, 1.0f};
case game::ItemQuality::HEIRLOOM: return {0.90f, 0.80f, 0.50f, 1.0f};
default: return {1.0f, 1.0f, 1.0f, 1.0f};
}
}
// ---- Coin display (gold/silver/copper) ----
inline void renderCoinsText(uint32_t g, uint32_t s, uint32_t c) {
bool any = false;
if (g > 0) {
ImGui::TextColored(colors::kGold, "%ug", g);
any = true;
}
if (s > 0 || g > 0) {
if (any) ImGui::SameLine(0, 3);
ImGui::TextColored(colors::kSilver, "%us", s);
any = true;
}
if (any) ImGui::SameLine(0, 3);
ImGui::TextColored(colors::kCopper, "%uc", c);
}
} // namespace wowee::ui

55
src/ui/game_screen.cpp
View file

@ -1,4 +1,5 @@
#include "ui/game_screen.hpp"
#include "ui/ui_colors.hpp"
#include "rendering/character_preview.hpp"
#include "rendering/vk_context.hpp"
#include "core/application.hpp"
@ -49,13 +50,14 @@
#include <unordered_set>
namespace {
// Common ImGui colors
constexpr ImVec4 kColorRed = {1.0f, 0.3f, 0.3f, 1.0f};
constexpr ImVec4 kColorGreen = {0.4f, 1.0f, 0.4f, 1.0f};
constexpr ImVec4 kColorBrightGreen= {0.3f, 1.0f, 0.3f, 1.0f};
constexpr ImVec4 kColorYellow = {1.0f, 1.0f, 0.3f, 1.0f};
constexpr ImVec4 kColorGray = {0.6f, 0.6f, 0.6f, 1.0f};
constexpr ImVec4 kColorDarkGray = {0.5f, 0.5f, 0.5f, 1.0f};
// Common ImGui colors (aliases into local namespace for brevity)
using namespace wowee::ui::colors;
constexpr auto& kColorRed = kRed;
constexpr auto& kColorGreen = kGreen;
constexpr auto& kColorBrightGreen= kBrightGreen;
constexpr auto& kColorYellow = kYellow;
constexpr auto& kColorGray = kGray;
constexpr auto& kColorDarkGray = kDarkGray;
// Common ImGui window flags for popup dialogs
const ImGuiWindowFlags kDialogFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoResize;
@ -87,21 +89,6 @@ namespace {
// Render gold/silver/copper amounts in WoW-canonical colors on the current ImGui line.
// Skips zero-value denominations (except copper, which is always shown when gold=silver=0).
void renderCoinsText(uint32_t g, uint32_t s, uint32_t c) {
bool any = false;
if (g > 0) {
ImGui::TextColored(ImVec4(1.00f, 0.82f, 0.00f, 1.0f), "%ug", g);
any = true;
}
if (s > 0 || g > 0) {
if (any) ImGui::SameLine(0, 3);
ImGui::TextColored(ImVec4(0.80f, 0.80f, 0.80f, 1.0f), "%us", s);
any = true;
}
if (any) ImGui::SameLine(0, 3);
ImGui::TextColored(ImVec4(0.72f, 0.45f, 0.20f, 1.0f), "%uc", c);
}
// Return the canonical Blizzard class color as ImVec4.
// classId is byte 1 of UNIT_FIELD_BYTES_0 (or CharacterData::classId).
// Returns a neutral light-gray for unknown / class 0.
@ -1419,15 +1406,7 @@ void GameScreen::renderChatWindow(game::GameHandler& gameHandler) {
ImGui::BeginTooltip();
// Quality color for name
ImVec4 qColor(1, 1, 1, 1);
switch (info->quality) {
case 0: qColor = ImVec4(0.62f, 0.62f, 0.62f, 1.0f); break; // Poor
case 1: qColor = ImVec4(1.0f, 1.0f, 1.0f, 1.0f); break; // Common
case 2: qColor = ImVec4(0.12f, 1.0f, 0.0f, 1.0f); break; // Uncommon
case 3: qColor = ImVec4(0.0f, 0.44f, 0.87f, 1.0f); break; // Rare
case 4: qColor = ImVec4(0.64f, 0.21f, 0.93f, 1.0f); break; // Epic
case 5: qColor = ImVec4(1.0f, 0.50f, 0.0f, 1.0f); break; // Legendary
}
auto qColor = ui::getQualityColor(static_cast<game::ItemQuality>(info->quality));
ImGui::TextColored(qColor, "%s", info->name.c_str());
// Heroic indicator (green, matches WoW tooltip style)
@ -14000,18 +13979,8 @@ void GameScreen::renderLootRollPopup(game::GameHandler& gameHandler) {
if (ImGui::Begin("Loot Roll", nullptr, kDialogFlags)) {
// Quality color for item name
static const ImVec4 kQualityColors[] = {
kColorGray, // 0=poor (grey)
ImVec4(1.0f, 1.0f, 1.0f, 1.0f), // 1=common (white)
ImVec4(0.1f, 1.0f, 0.1f, 1.0f), // 2=uncommon (green)
ImVec4(0.0f, 0.44f, 0.87f, 1.0f),// 3=rare (blue)
ImVec4(0.64f, 0.21f, 0.93f, 1.0f),// 4=epic (purple)
ImVec4(1.0f, 0.5f, 0.0f, 1.0f), // 5=legendary (orange)
ImVec4(0.90f, 0.80f, 0.50f, 1.0f),// 6=artifact (light gold)
ImVec4(0.90f, 0.80f, 0.50f, 1.0f),// 7=heirloom (light gold)
};
uint8_t q = roll.itemQuality;
ImVec4 col = (q < 8) ? kQualityColors[q] : kQualityColors[1];
ImVec4 col = ui::getQualityColor(static_cast<game::ItemQuality>(q));
// Countdown bar
{
@ -14057,7 +14026,7 @@ void GameScreen::renderLootRollPopup(game::GameHandler& gameHandler) {
? rollInfo->name.c_str()
: roll.itemName.c_str();
if (rollInfo && rollInfo->valid)
col = (rollInfo->quality < 8) ? kQualityColors[rollInfo->quality] : kQualityColors[1];
col = ui::getQualityColor(static_cast<game::ItemQuality>(rollInfo->quality));
ImGui::TextColored(col, "[%s]", displayName);
if (ImGui::IsItemHovered() && rollInfo && rollInfo->valid) {
inventoryScreen.renderItemTooltip(*rollInfo);

27
src/ui/inventory_screen.cpp
View file

@ -1,4 +1,5 @@
#include "ui/inventory_screen.hpp"
#include "ui/ui_colors.hpp"
#include "ui/keybinding_manager.hpp"
#include "game/game_handler.hpp"
#include "core/application.hpp"
@ -74,20 +75,6 @@ const game::ItemSlot* findComparableEquipped(const game::Inventory& inventory, u
}
}
void renderCoinsText(uint32_t g, uint32_t s, uint32_t c) {
bool any = false;
if (g > 0) {
ImGui::TextColored(ImVec4(1.00f, 0.82f, 0.00f, 1.0f), "%ug", g);
any = true;
}
if (s > 0 || g > 0) {
if (any) ImGui::SameLine(0, 3);
ImGui::TextColored(ImVec4(0.80f, 0.80f, 0.80f, 1.0f), "%us", s);
any = true;
}
if (any) ImGui::SameLine(0, 3);
ImGui::TextColored(ImVec4(0.72f, 0.45f, 0.20f, 1.0f), "%uc", c);
}
} // namespace
InventoryScreen::~InventoryScreen() {
@ -96,17 +83,7 @@ InventoryScreen::~InventoryScreen() {
}
ImVec4 InventoryScreen::getQualityColor(game::ItemQuality quality) {
switch (quality) {
case game::ItemQuality::POOR: return ImVec4(0.62f, 0.62f, 0.62f, 1.0f); // Grey
case game::ItemQuality::COMMON: return ImVec4(1.0f, 1.0f, 1.0f, 1.0f); // White
case game::ItemQuality::UNCOMMON: return ImVec4(0.12f, 1.0f, 0.0f, 1.0f); // Green
case game::ItemQuality::RARE: return ImVec4(0.0f, 0.44f, 0.87f, 1.0f); // Blue
case game::ItemQuality::EPIC: return ImVec4(0.64f, 0.21f, 0.93f, 1.0f); // Purple
case game::ItemQuality::LEGENDARY: return ImVec4(1.0f, 0.50f, 0.0f, 1.0f); // Orange
case game::ItemQuality::ARTIFACT: return ImVec4(0.90f, 0.80f, 0.50f, 1.0f); // Light gold
case game::ItemQuality::HEIRLOOM: return ImVec4(0.90f, 0.80f, 0.50f, 1.0f); // Light gold
default: return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
}
return ui::getQualityColor(quality);
}
// ============================================================

15
src/ui/quest_log_screen.cpp
View file

@ -1,4 +1,5 @@
#include "ui/quest_log_screen.hpp"
#include "ui/ui_colors.hpp"
#include "ui/inventory_screen.hpp"
#include "ui/keybinding_manager.hpp"
#include "core/application.hpp"
@ -215,20 +216,6 @@ std::string cleanQuestTitleForUi(const std::string& raw, uint32_t questId) {
return s;
}
void renderCoinsText(uint32_t g, uint32_t s, uint32_t c) {
bool any = false;
if (g > 0) {
ImGui::TextColored(ImVec4(1.00f, 0.82f, 0.00f, 1.0f), "%ug", g);
any = true;
}
if (s > 0 || g > 0) {
if (any) ImGui::SameLine(0, 3);
ImGui::TextColored(ImVec4(0.80f, 0.80f, 0.80f, 1.0f), "%us", s);
any = true;
}
if (any) ImGui::SameLine(0, 3);
ImGui::TextColored(ImVec4(0.72f, 0.45f, 0.20f, 1.0f), "%uc", c);
}
} // anonymous namespace
void QuestLogScreen::render(game::GameHandler& gameHandler, InventoryScreen& invScreen) {