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

Display current graphics in overworld editor

Browse Source
This commit is contained in:
Justin Scofield
2022-07-24 00:01:19 -04:00
parent bbef72a9b0
commit fc2eb18212
1 changed files with 22 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/app/editor/overworld_editor.cc
View File

@@ -119,10 +119,7 @@ void OverworldEditor::DrawToolset() {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
if (ImGui::Button(ICON_MD_UPDATE)) { if (ImGui::Button(ICON_MD_UPDATE)) {
overworld_.Load(rom_, tile16_blockset_bmp_.GetData(), overworld_.Load(rom_, tile16_blockset_bmp_.GetData());
current_gfx_bmp_.GetData());
current_gfx_bmp_.CreateTexture(rom_.Renderer());
} }
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@@ -242,9 +239,9 @@ void OverworldEditor::DrawTileSelector() {
ImGui::EndChild(); ImGui::EndChild();
ImGui::EndTabItem(); ImGui::EndTabItem();
} }
if (ImGui::BeginTabItem("Current Graphics")) { if (ImGui::BeginTabItem("Area Graphics")) {
if (ImGui::BeginChild("#Tile16Child", ImGui::GetContentRegionAvail(), if (ImGui::BeginChild("#Tile16Child", ImGui::GetContentRegionAvail(),
true, ImGuiWindowFlags_NoScrollbar)) { true, ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
DrawAreaGraphics(); DrawAreaGraphics();
} }
ImGui::EndChild(); ImGui::EndChild();
@@ -294,21 +291,26 @@ void OverworldEditor::DrawTile8Selector() {
} }
void OverworldEditor::DrawAreaGraphics() { void OverworldEditor::DrawAreaGraphics() {
if (rom_.isLoaded()) { if (overworld_.isLoaded()) {
// TODO current_gfx_canvas_.DrawBackground(ImVec2(256 + 1, 16 * 64 + 1));
}
current_gfx_canvas_.DrawBackground();
current_gfx_canvas_.UpdateContext(); current_gfx_canvas_.UpdateContext();
current_gfx_canvas_.DrawGrid(); current_gfx_canvas_.DrawGrid();
for (const auto &[key, value] :
overworld_.GetOverworldMap(0).GetCurrentGraphicsSet()) {
int offset = 64 * (key + 1);
int top_left_y = current_gfx_canvas_.GetZeroPoint().y + 2;
if (key >= 1) {
top_left_y = current_gfx_canvas_.GetZeroPoint().y + 64 * key;
}
current_gfx_canvas_.GetDrawList()->AddImage( current_gfx_canvas_.GetDrawList()->AddImage(
(void *)current_gfx_bmp_.GetTexture(), (void *)value.GetTexture(),
ImVec2(current_gfx_canvas_.GetZeroPoint().x + 2, ImVec2(current_gfx_canvas_.GetZeroPoint().x + 2, top_left_y),
current_gfx_canvas_.GetZeroPoint().y + 2), ImVec2(current_gfx_canvas_.GetZeroPoint().x + 256,
ImVec2( current_gfx_canvas_.GetZeroPoint().y + offset));
current_gfx_canvas_.GetZeroPoint().x + current_gfx_bmp_.GetWidth(), }
current_gfx_canvas_.GetZeroPoint().y + current_gfx_bmp_.GetHeight()));
current_gfx_canvas_.DrawOverlay(); current_gfx_canvas_.DrawOverlay();
} }
}
void OverworldEditor::LoadGraphics() { void OverworldEditor::LoadGraphics() {
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
@@ -318,22 +320,13 @@ void OverworldEditor::LoadGraphics() {
current_palette_[i].w = 1.f; current_palette_[i].w = 1.f;
} }
rom_.LoadAllGraphicsData();
graphics_bin_ = rom_.GetGraphicsBin();
absl::Status graphics_data_status = rom_.LoadAllGraphicsDataV2(); absl::Status graphics_data_status = rom_.LoadAllGraphicsDataV2();
if (!graphics_data_status.ok()) { if (!graphics_data_status.ok()) {
std::cout << "Error " << graphics_data_status.ToString() << std::endl; std::cout << "Error " << graphics_data_status.ToString() << std::endl;
} }
graphics_bin_v2_ = rom_.GetGraphicsBinV2(); graphics_bin_v2_ = rom_.GetGraphicsBinV2();
// for (auto &[key, value] : graphics_bin_) {
// auto tilesheet = value.CreateTiles();
// if (!tilesheet.ok()) {
// std::cout << "Error loading" << std::endl;
// }
// }
tile16_blockset_bmp_.Create(128 * 2, 8192 * 2, 8, 1048576); tile16_blockset_bmp_.Create(128 * 2, 8192 * 2, 8, 1048576);
current_gfx_bmp_.Create(128 * 2, 512 * 2, 8, 32768);
} }
} // namespace editor } // namespace editor