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

chore: Update asset_browser to use std::array for gfx sheets

Browse Source
This commit is contained in:
scawful
2024-08-13 21:47:13 -04:00
parent c3c310a84c
commit 79e5986b0b
4 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/app/editor/graphics/graphics_editor.cc
View File

@@ -58,9 +58,9 @@ absl::Status GraphicsEditor::Update() {
status_ = UpdateGfxEdit(); status_ = UpdateGfxEdit();
TAB_ITEM("Sheet Browser") TAB_ITEM("Sheet Browser")
if (asset_browser_.Initialized == false) { if (asset_browser_.Initialized == false) {
asset_browser_.Initialize(rom()->mutable_bitmap_manager()); asset_browser_.Initialize(rom()->gfx_sheets());
} }
asset_browser_.Draw(rom()->mutable_bitmap_manager()); asset_browser_.Draw(rom()->gfx_sheets());
END_TAB_ITEM() END_TAB_ITEM()
status_ = UpdateScadView(); status_ = UpdateScadView();
@@ -194,21 +194,21 @@ absl::Status GraphicsEditor::UpdateGfxSheetList() {
static ImGuiSelectionBasicStorage selection; static ImGuiSelectionBasicStorage selection;
ImGuiMultiSelectFlags flags = ImGuiMultiSelectFlags flags =
ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_BoxSelect1d; ImGuiMultiSelectFlags_ClearOnEscape | ImGuiMultiSelectFlags_BoxSelect1d;
ImGuiMultiSelectIO* ms_io = ImGui::BeginMultiSelect( ImGuiMultiSelectIO* ms_io =
flags, selection.Size, rom()->bitmap_manager().size()); ImGui::BeginMultiSelect(flags, selection.Size, kNumGfxSheets);
selection.ApplyRequests(ms_io); selection.ApplyRequests(ms_io);
ImGuiListClipper clipper; ImGuiListClipper clipper;
clipper.Begin(rom()->bitmap_manager().size()); clipper.Begin(kNumGfxSheets);
if (ms_io->RangeSrcItem != -1) if (ms_io->RangeSrcItem != -1)
clipper.IncludeItemByIndex( clipper.IncludeItemByIndex(
(int)ms_io->RangeSrcItem); // Ensure RangeSrc item is not clipped. (int)ms_io->RangeSrcItem); // Ensure RangeSrc item is not clipped.
for (auto& [key, value] : rom()->bitmap_manager()) { int key = 0;
for (auto& value : rom()->gfx_sheets()) {
ImGui::BeginChild(absl::StrFormat("##GfxSheet%02X", key).c_str(), ImGui::BeginChild(absl::StrFormat("##GfxSheet%02X", key).c_str(),
ImVec2(0x100 + 1, 0x40 + 1), true, ImVec2(0x100 + 1, 0x40 + 1), true,
ImGuiWindowFlags_NoDecoration); ImGuiWindowFlags_NoDecoration);
ImGui::PopStyleVar(); ImGui::PopStyleVar();
gui::Canvas graphics_bin_canvas_;
graphics_bin_canvas_.DrawBackground(ImVec2(0x100 + 1, 0x40 + 1)); graphics_bin_canvas_.DrawBackground(ImVec2(0x100 + 1, 0x40 + 1));
graphics_bin_canvas_.DrawContextMenu(); graphics_bin_canvas_.DrawContextMenu();
@@ -242,6 +242,8 @@ absl::Status GraphicsEditor::UpdateGfxSheetList() {
graphics_bin_canvas_.draw_list()->AddText( graphics_bin_canvas_.draw_list()->AddText(
text_pos, IM_COL32(125, 255, 125, 255), text_pos, IM_COL32(125, 255, 125, 255),
absl::StrFormat("%02X", key).c_str()); absl::StrFormat("%02X", key).c_str());
key++;
} }
graphics_bin_canvas_.DrawGrid(16.0f); graphics_bin_canvas_.DrawGrid(16.0f);
graphics_bin_canvas_.DrawOverlay(); graphics_bin_canvas_.DrawOverlay();
@@ -460,17 +462,18 @@ absl::Status GraphicsEditor::UpdateScadView() {
NEXT_COLUMN() NEXT_COLUMN()
if (super_donkey_) { if (super_donkey_) {
if (refresh_graphics_) { // TODO: Implement the Super Donkey 1 graphics decompression
for (int i = 0; i < graphics_bin_.size(); i++) { // if (refresh_graphics_) {
status_ = graphics_bin_[i].ApplyPalette( // for (int i = 0; i < kNumGfxSheets; i++) {
col_file_palette_group_[current_palette_index_]); // status_ = graphics_bin_[i].ApplyPalette(
Renderer::GetInstance().UpdateBitmap(&graphics_bin_[i]); // col_file_palette_group_[current_palette_index_]);
} // Renderer::GetInstance().UpdateBitmap(&graphics_bin_[i]);
refresh_graphics_ = false; // }
} // refresh_graphics_ = false;
// }
// Load the full graphics space from `super_donkey_1.bin` // Load the full graphics space from `super_donkey_1.bin`
gui::GraphicsBinCanvasPipeline(0x100, 0x40, 0x20, num_sheets_to_load_, 3, // gui::GraphicsBinCanvasPipeline(0x100, 0x40, 0x20, num_sheets_to_load_, 3,
super_donkey_, graphics_bin_); // super_donkey_, graphics_bin_);
} else if (cgx_loaded_ && col_file_) { } else if (cgx_loaded_ && col_file_) {
// Load the CGX graphics // Load the CGX graphics
gui::BitmapCanvasPipeline(import_canvas_, cgx_bitmap_, 0x100, 16384, 0x20, gui::BitmapCanvasPipeline(import_canvas_, cgx_bitmap_, 0x100, 16384, 0x20,
@@ -792,11 +795,10 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
auto decompressed_data, auto decompressed_data,
gfx::lc_lz2::DecompressV2(temp_rom_.data(), offset_value, 0x1000)) gfx::lc_lz2::DecompressV2(temp_rom_.data(), offset_value, 0x1000))
auto converted_sheet = gfx::SnesTo8bppSheet(decompressed_data, 3); auto converted_sheet = gfx::SnesTo8bppSheet(decompressed_data, 3);
graphics_bin_[i] = gfx_sheets_[i] = gfx::Bitmap(core::kTilesheetWidth, core::kTilesheetHeight,
gfx::Bitmap(core::kTilesheetWidth, core::kTilesheetHeight, core::kTilesheetDepth, converted_sheet);
core::kTilesheetDepth, converted_sheet);
if (col_file_) { if (col_file_) {
status_ = graphics_bin_[i].ApplyPalette( status_ = gfx_sheets_[i].ApplyPalette(
col_file_palette_group_[current_palette_index_]); col_file_palette_group_[current_palette_index_]);
} else { } else {
// ROM palette // ROM palette
@@ -804,10 +806,10 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
auto palette_group = rom()->palette_group().get_group( auto palette_group = rom()->palette_group().get_group(
kPaletteGroupAddressesKeys[current_palette_]); kPaletteGroupAddressesKeys[current_palette_]);
z3_rom_palette_ = *palette_group->mutable_palette(current_palette_index_); z3_rom_palette_ = *palette_group->mutable_palette(current_palette_index_);
status_ = graphics_bin_[i].ApplyPalette(z3_rom_palette_); status_ = gfx_sheets_[i].ApplyPalette(z3_rom_palette_);
} }
Renderer::GetInstance().RenderBitmap(&graphics_bin_[i]); Renderer::GetInstance().RenderBitmap(&gfx_sheets_[i]);
i++; i++;
} }
@@ -818,21 +820,20 @@ absl::Status GraphicsEditor::DecompressSuperDonkey() {
auto decompressed_data, auto decompressed_data,
gfx::lc_lz2::DecompressV2(temp_rom_.data(), offset_value, 0x1000)) gfx::lc_lz2::DecompressV2(temp_rom_.data(), offset_value, 0x1000))
auto converted_sheet = gfx::SnesTo8bppSheet(decompressed_data, 3); auto converted_sheet = gfx::SnesTo8bppSheet(decompressed_data, 3);
graphics_bin_[i] = gfx_sheets_[i] = gfx::Bitmap(core::kTilesheetWidth, core::kTilesheetHeight,
gfx::Bitmap(core::kTilesheetWidth, core::kTilesheetHeight, core::kTilesheetDepth, converted_sheet);
core::kTilesheetDepth, converted_sheet);
if (col_file_) { if (col_file_) {
status_ = graphics_bin_[i].ApplyPalette( status_ = gfx_sheets_[i].ApplyPalette(
col_file_palette_group_[current_palette_index_]); col_file_palette_group_[current_palette_index_]);
} else { } else {
// ROM palette // ROM palette
auto palette_group = rom()->palette_group().get_group( auto palette_group = rom()->palette_group().get_group(
kPaletteGroupAddressesKeys[current_palette_]); kPaletteGroupAddressesKeys[current_palette_]);
z3_rom_palette_ = *palette_group->mutable_palette(current_palette_index_); z3_rom_palette_ = *palette_group->mutable_palette(current_palette_index_);
status_ = graphics_bin_[i].ApplyPalette(z3_rom_palette_); status_ = gfx_sheets_[i].ApplyPalette(z3_rom_palette_);
} }
Renderer::GetInstance().RenderBitmap(&graphics_bin_[i]); Renderer::GetInstance().RenderBitmap(&gfx_sheets_[i]);
i++; i++;
} }
super_donkey_ = true; super_donkey_ = true;

13
src/app/editor/graphics/graphics_editor.h
View File

@@ -2,10 +2,6 @@
#define YAZE_APP_EDITOR_GRAPHICS_EDITOR_H #define YAZE_APP_EDITOR_GRAPHICS_EDITOR_H
#include "ImGuiFileDialog/ImGuiFileDialog.h" #include "ImGuiFileDialog/ImGuiFileDialog.h"
#include "imgui/imgui.h"
#include "imgui/misc/cpp/imgui_stdlib.h"
#include "imgui_memory_editor.h"
#include "absl/status/status.h" #include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "app/editor/graphics/palette_editor.h" #include "app/editor/graphics/palette_editor.h"
@@ -17,6 +13,9 @@
#include "app/gui/input.h" #include "app/gui/input.h"
#include "app/rom.h" #include "app/rom.h"
#include "app/zelda3/overworld/overworld.h" #include "app/zelda3/overworld/overworld.h"
#include "imgui/imgui.h"
#include "imgui/misc/cpp/imgui_stdlib.h"
#include "imgui_memory_editor.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
@@ -179,9 +178,8 @@ class GraphicsEditor : public SharedRom, public Editor {
gfx::Bitmap scr_bitmap_; gfx::Bitmap scr_bitmap_;
gfx::Bitmap bin_bitmap_; gfx::Bitmap bin_bitmap_;
gfx::Bitmap link_full_sheet_; gfx::Bitmap link_full_sheet_;
gfx::BitmapTable graphics_bin_; std::array<gfx::Bitmap, kNumGfxSheets> gfx_sheets_;
gfx::BitmapTable clipboard_graphics_bin_;
gfx::BitmapTable link_graphics_;
gfx::PaletteGroup col_file_palette_group_; gfx::PaletteGroup col_file_palette_group_;
gfx::SnesPalette z3_rom_palette_; gfx::SnesPalette z3_rom_palette_;
gfx::SnesPalette col_file_palette_; gfx::SnesPalette col_file_palette_;
@@ -189,6 +187,7 @@ class GraphicsEditor : public SharedRom, public Editor {
gui::Canvas import_canvas_; gui::Canvas import_canvas_;
gui::Canvas scr_canvas_; gui::Canvas scr_canvas_;
gui::Canvas super_donkey_canvas_; gui::Canvas super_donkey_canvas_;
gui::Canvas graphics_bin_canvas_;
gui::Canvas current_sheet_canvas_{"CurrentSheetCanvas", ImVec2(0x80, 0x20), gui::Canvas current_sheet_canvas_{"CurrentSheetCanvas", ImVec2(0x80, 0x20),
gui::CanvasGridSize::k8x8}; gui::CanvasGridSize::k8x8};
gui::Canvas link_canvas_{ gui::Canvas link_canvas_{

10
src/app/gui/asset_browser.cc
View File

@@ -10,7 +10,8 @@ using namespace ImGui;
const ImGuiTableSortSpecs* AssetObject::s_current_sort_specs = NULL; const ImGuiTableSortSpecs* AssetObject::s_current_sort_specs = NULL;
void GfxSheetAssetBrowser::Draw(gfx::BitmapManager* bmp_manager) { void GfxSheetAssetBrowser::Draw(
const std::array<gfx::Bitmap, kNumGfxSheets>& bmp_manager) {
PushItemWidth(GetFontSize() * 10); PushItemWidth(GetFontSize() * 10);
SeparatorText("Contents"); SeparatorText("Contents");
Checkbox("Show Type Overlay", &ShowTypeOverlay); Checkbox("Show Type Overlay", &ShowTypeOverlay);
@@ -228,10 +229,9 @@ void GfxSheetAssetBrowser::Draw(gfx::BitmapManager* bmp_manager) {
if (display_label) { if (display_label) {
ImU32 label_col = GetColorU32( ImU32 label_col = GetColorU32(
item_is_selected ? ImGuiCol_Text : ImGuiCol_TextDisabled); item_is_selected ? ImGuiCol_Text : ImGuiCol_TextDisabled);
draw_list->AddImage( draw_list->AddImage((void*)bmp_manager[item_data->ID].texture(),
(void*)bmp_manager->mutable_bitmap(item_data->ID)->texture(), box_min, box_max, ImVec2(0, 0), ImVec2(1, 1),
box_min, box_max, ImVec2(0, 0), ImVec2(1, 1), GetColorU32(ImVec4(1, 1, 1, 1)));
GetColorU32(ImVec4(1, 1, 1, 1)));
draw_list->AddText(ImVec2(box_min.x, box_max.y - GetFontSize()), draw_list->AddText(ImVec2(box_min.x, box_max.y - GetFontSize()),
label_col, label_col,
absl::StrFormat("%X", item_data->ID).c_str()); absl::StrFormat("%X", item_data->ID).c_str());

11
src/app/gui/asset_browser.h
View File

@@ -1,11 +1,12 @@
#ifndef YAZE_APP_GUI_ASSET_BROWSER_H #ifndef YAZE_APP_GUI_ASSET_BROWSER_H
#define YAZE_APP_GUI_ASSET_BROWSER_H #define YAZE_APP_GUI_ASSET_BROWSER_H
#include "imgui/imgui.h" #include <array>
#include <string> #include <string>
#include "app/gfx/bitmap.h" #include "app/gfx/bitmap.h"
#include "app/rom.h"
#include "imgui/imgui.h"
#define IM_MIN(A, B) (((A) < (B)) ? (A) : (B)) #define IM_MIN(A, B) (((A) < (B)) ? (A) : (B))
#define IM_MAX(A, B) (((A) >= (B)) ? (A) : (B)) #define IM_MAX(A, B) (((A) >= (B)) ? (A) : (B))
@@ -187,9 +188,9 @@ struct GfxSheetAssetBrowser {
int LayoutLineCount = 0; int LayoutLineCount = 0;
bool Initialized = false; bool Initialized = false;
void Initialize(gfx::BitmapManager* bmp_manager) { void Initialize(const std::array<gfx::Bitmap, kNumGfxSheets>& bmp_manager) {
// Load the assets // Load the assets
for (int i = 0; i < bmp_manager->size(); i++) { for (int i = 0; i < kNumGfxSheets; i++) {
Items.push_back(UnsortedAsset(i)); Items.push_back(UnsortedAsset(i));
} }
Initialized = true; Initialized = true;
@@ -238,7 +239,7 @@ struct GfxSheetAssetBrowser {
LayoutOuterPadding = floorf(LayoutItemSpacing * 0.5f); LayoutOuterPadding = floorf(LayoutItemSpacing * 0.5f);
} }
void Draw(gfx::BitmapManager* bmp_manager); void Draw(const std::array<gfx::Bitmap, kNumGfxSheets>& bmp_manager);
}; };
} // namespace gui } // namespace gui