scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(palette): integrate PaletteManager for centralized color management in DungeonEditorV2

Browse Source
This commit is contained in:
scawful
2025-10-12 22:40:23 -04:00
parent 86f85a6afe
commit 2b107d9cd7
1 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/app/editor/dungeon/dungeon_editor_v2.cc
View File

@@ -5,6 +5,7 @@
#include "absl/strings/str_format.h" #include "absl/strings/str_format.h"
#include "app/gfx/arena.h" #include "app/gfx/arena.h"
#include "app/gfx/palette_manager.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"
#include "zelda3/dungeon/room.h" #include "zelda3/dungeon/room.h"
#include "app/gui/icons.h" #include "app/gui/icons.h"
@@ -149,13 +150,18 @@ absl::Status DungeonEditorV2::Load() {
// NOW initialize emulator preview with loaded ROM // NOW initialize emulator preview with loaded ROM
object_emulator_preview_.Initialize(renderer_, rom_); object_emulator_preview_.Initialize(renderer_, rom_);
// Initialize centralized PaletteManager with ROM data
// This MUST be done before initializing palette_editor_
gfx::PaletteManager::Get().Initialize(rom_);
// Initialize palette editor with loaded ROM // Initialize palette editor with loaded ROM
palette_editor_.Initialize(rom_); palette_editor_.Initialize(rom_);
// Initialize unified object editor card // Initialize unified object editor card
object_editor_card_ = std::make_unique<ObjectEditorCard>(renderer_, rom_, &canvas_viewer_); object_editor_card_ = std::make_unique<ObjectEditorCard>(renderer_, rom_, &canvas_viewer_);
// Wire palette changes to trigger room re-renders // Wire palette changes to trigger room re-renders
// PaletteManager now tracks all modifications globally
palette_editor_.SetOnPaletteChanged([this](int /*palette_id*/) { palette_editor_.SetOnPaletteChanged([this](int /*palette_id*/) {
// Re-render all active rooms when palette changes // Re-render all active rooms when palette changes
for (int i = 0; i < active_rooms_.Size; i++) { for (int i = 0; i < active_rooms_.Size; i++) {
@@ -201,12 +207,25 @@ absl::Status DungeonEditorV2::Save() {
return absl::FailedPreconditionError("ROM not loaded"); return absl::FailedPreconditionError("ROM not loaded");
} }
// Save palette changes first (if any)
if (gfx::PaletteManager::Get().HasUnsavedChanges()) {
auto status = gfx::PaletteManager::Get().SaveAllToRom();
if (!status.ok()) {
LOG_ERROR("DungeonEditorV2", "Failed to save palette changes: %s",
status.message().data());
return status;
}
LOG_INFO("DungeonEditorV2", "Saved %zu modified colors to ROM",
gfx::PaletteManager::Get().GetModifiedColorCount());
}
// Save all rooms (SaveObjects will handle which ones need saving) // Save all rooms (SaveObjects will handle which ones need saving)
for (auto& room : rooms_) { for (auto& room : rooms_) {
auto status = room.SaveObjects(); auto status = room.SaveObjects();
if (!status.ok()) { if (!status.ok()) {
// Log error but continue with other rooms // Log error but continue with other rooms
LOG_ERROR("DungeonEditorV2", "Failed to save room: %s", status.message().data()); LOG_ERROR("DungeonEditorV2", "Failed to save room: %s",
status.message().data());
} }
} }