From fee9484a5d2937a14eb4e7355482527fa01f61e7 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 18 Nov 2023 14:17:06 -0500 Subject: [PATCH] Add resources folder for music and palette editor --- src/app/editor/graphics_editor.cc | 9 +++++---- src/app/editor/graphics_editor.h | 2 +- src/app/editor/master_editor.cc | 4 ++-- src/app/editor/master_editor.h | 4 ++-- src/app/editor/modules/gfx_group_editor.cc | 2 +- src/app/editor/modules/gfx_group_editor.h | 2 +- src/app/editor/modules/tile16_editor.cc | 2 +- src/app/editor/modules/tile16_editor.h | 2 +- src/app/editor/overworld_editor.cc | 6 +++--- src/app/editor/overworld_editor.h | 2 +- src/app/editor/{ => resources}/music_editor.cc | 0 src/app/editor/{ => resources}/music_editor.h | 0 src/app/editor/{ => resources}/palette_editor.cc | 0 src/app/editor/{ => resources}/palette_editor.h | 0 14 files changed, 18 insertions(+), 17 deletions(-) rename src/app/editor/{ => resources}/music_editor.cc (100%) rename src/app/editor/{ => resources}/music_editor.h (100%) rename src/app/editor/{ => resources}/palette_editor.cc (100%) rename src/app/editor/{ => resources}/palette_editor.h (100%) diff --git a/src/app/editor/graphics_editor.cc b/src/app/editor/graphics_editor.cc index 2430512f..2831391a 100644 --- a/src/app/editor/graphics_editor.cc +++ b/src/app/editor/graphics_editor.cc @@ -8,7 +8,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "app/core/pipeline.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/compression.h" #include "app/gfx/scad_format.h" @@ -164,7 +164,8 @@ absl::Status GraphicsEditor::DrawCgxImport() { core::ButtonPipe("Load CGX Data", [this]() { status_ = gfx::LoadCgx(current_bpp_, cgx_file_path_, cgx_data_, decoded_cgx_, extra_cgx_data_); - cgx_bitmap_.Create(0x80, 0x200, 8, decoded_cgx_); + PRINT_IF_ERROR( + cgx_bitmap_.InitializeFromData(0x80, 0x200, 8, decoded_cgx_)); if (col_file_) { cgx_bitmap_.ApplyPalette(decoded_col_); rom()->RenderBitmap(&cgx_bitmap_); @@ -197,8 +198,8 @@ absl::Status GraphicsEditor::DrawScrImport() { decoded_scr_data_.resize(0x100 * 0x100); status_ = gfx::DrawScrWithCgx(current_bpp_, scr_data_, decoded_scr_data_, decoded_cgx_); - - scr_bitmap_.Create(0x100, 0x100, 8, decoded_scr_data_); + PRINT_IF_ERROR( + scr_bitmap_.InitializeFromData(0x100, 0x100, 8, decoded_scr_data_)); if (scr_loaded_) { scr_bitmap_.ApplyPalette(decoded_col_); rom()->RenderBitmap(&scr_bitmap_); diff --git a/src/app/editor/graphics_editor.h b/src/app/editor/graphics_editor.h index b97f7aa7..f36a0460 100644 --- a/src/app/editor/graphics_editor.h +++ b/src/app/editor/graphics_editor.h @@ -9,7 +9,7 @@ #include "absl/status/status.h" #include "absl/status/statusor.h" #include "app/core/pipeline.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_tile.h" #include "app/gui/canvas.h" diff --git a/src/app/editor/master_editor.cc b/src/app/editor/master_editor.cc index 7ab686cb..bf8a7d74 100644 --- a/src/app/editor/master_editor.cc +++ b/src/app/editor/master_editor.cc @@ -13,9 +13,9 @@ #include "app/editor/dungeon_editor.h" #include "app/editor/graphics_editor.h" #include "app/editor/modules/assembly_editor.h" -#include "app/editor/music_editor.h" +#include "app/editor/resources/music_editor.h" #include "app/editor/overworld_editor.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/editor/screen_editor.h" #include "app/editor/sprite_editor.h" #include "app/emu/emulator.h" diff --git a/src/app/editor/master_editor.h b/src/app/editor/master_editor.h index b40475e9..2e2ffa7c 100644 --- a/src/app/editor/master_editor.h +++ b/src/app/editor/master_editor.h @@ -14,9 +14,9 @@ #include "app/editor/dungeon_editor.h" #include "app/editor/graphics_editor.h" #include "app/editor/modules/assembly_editor.h" -#include "app/editor/music_editor.h" +#include "app/editor/resources/music_editor.h" #include "app/editor/overworld_editor.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/editor/screen_editor.h" #include "app/editor/sprite_editor.h" #include "app/emu/emulator.h" diff --git a/src/app/editor/modules/gfx_group_editor.cc b/src/app/editor/modules/gfx_group_editor.cc index eb6d951d..57df667f 100644 --- a/src/app/editor/modules/gfx_group_editor.cc +++ b/src/app/editor/modules/gfx_group_editor.cc @@ -8,7 +8,7 @@ #include "absl/status/statusor.h" #include "app/core/editor.h" #include "app/core/pipeline.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" #include "app/gfx/snes_tile.h" diff --git a/src/app/editor/modules/gfx_group_editor.h b/src/app/editor/modules/gfx_group_editor.h index 11e7959f..ec4f2a1b 100644 --- a/src/app/editor/modules/gfx_group_editor.h +++ b/src/app/editor/modules/gfx_group_editor.h @@ -9,7 +9,7 @@ #include "absl/status/statusor.h" #include "app/core/editor.h" #include "app/core/pipeline.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" #include "app/gfx/snes_tile.h" diff --git a/src/app/editor/modules/tile16_editor.cc b/src/app/editor/modules/tile16_editor.cc index 6bd7fa27..71117029 100644 --- a/src/app/editor/modules/tile16_editor.cc +++ b/src/app/editor/modules/tile16_editor.cc @@ -8,7 +8,7 @@ #include "absl/status/statusor.h" #include "app/core/editor.h" #include "app/core/pipeline.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" #include "app/gfx/snes_tile.h" diff --git a/src/app/editor/modules/tile16_editor.h b/src/app/editor/modules/tile16_editor.h index f1f061db..272eebfc 100644 --- a/src/app/editor/modules/tile16_editor.h +++ b/src/app/editor/modules/tile16_editor.h @@ -9,7 +9,7 @@ #include "absl/status/statusor.h" #include "app/core/editor.h" #include "app/core/pipeline.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" #include "app/gfx/snes_tile.h" diff --git a/src/app/editor/overworld_editor.cc b/src/app/editor/overworld_editor.cc index 619d8260..1801e66f 100644 --- a/src/app/editor/overworld_editor.cc +++ b/src/app/editor/overworld_editor.cc @@ -10,7 +10,7 @@ #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "app/core/pipeline.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" #include "app/gfx/snes_tile.h" @@ -32,8 +32,8 @@ absl::Status OverworldEditor::Update() { // Initialize overworld graphics, maps, and palettes if (rom()->isLoaded() && !all_gfx_loaded_) { RETURN_IF_ERROR(LoadGraphics()) - tile16_editor_.InitBlockset(tile16_blockset_bmp_, tile16_individual_, - tile8_individual_); + RETURN_IF_ERROR(tile16_editor_.InitBlockset( + tile16_blockset_bmp_, tile16_individual_, tile8_individual_)); gfx_group_editor_.InitBlockset(tile16_blockset_bmp_); all_gfx_loaded_ = true; } diff --git a/src/app/editor/overworld_editor.h b/src/app/editor/overworld_editor.h index 585a9554..005cdcba 100644 --- a/src/app/editor/overworld_editor.h +++ b/src/app/editor/overworld_editor.h @@ -15,7 +15,7 @@ #include "app/core/pipeline.h" #include "app/editor/modules/gfx_group_editor.h" #include "app/editor/modules/tile16_editor.h" -#include "app/editor/palette_editor.h" +#include "app/editor/resources/palette_editor.h" #include "app/gfx/bitmap.h" #include "app/gfx/snes_palette.h" #include "app/gfx/snes_tile.h" diff --git a/src/app/editor/music_editor.cc b/src/app/editor/resources/music_editor.cc similarity index 100% rename from src/app/editor/music_editor.cc rename to src/app/editor/resources/music_editor.cc diff --git a/src/app/editor/music_editor.h b/src/app/editor/resources/music_editor.h similarity index 100% rename from src/app/editor/music_editor.h rename to src/app/editor/resources/music_editor.h diff --git a/src/app/editor/palette_editor.cc b/src/app/editor/resources/palette_editor.cc similarity index 100% rename from src/app/editor/palette_editor.cc rename to src/app/editor/resources/palette_editor.cc diff --git a/src/app/editor/palette_editor.h b/src/app/editor/resources/palette_editor.h similarity index 100% rename from src/app/editor/palette_editor.h rename to src/app/editor/resources/palette_editor.h