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

Refactor OverworldEditor to lazy load area graphics

Browse Source
This commit is contained in:
scawful
2024-08-22 01:02:20 -04:00
parent 8177ec3dce
commit 94108ebc0d
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/editor/overworld/overworld_editor.cc
View File

@@ -669,16 +669,15 @@ void OverworldEditor::DrawTile8Selector() {
} }
absl::Status OverworldEditor::DrawAreaGraphics() { absl::Status OverworldEditor::DrawAreaGraphics() {
if (overworld_.is_loaded()) { if (overworld_.is_loaded() &&
if (current_graphics_set_.count(current_map_) == 0) { current_graphics_set_.count(current_map_) == 0) {
overworld_.set_current_map(current_map_); overworld_.set_current_map(current_map_);
palette_ = overworld_.AreaPalette(); palette_ = overworld_.AreaPalette();
gfx::Bitmap bmp; gfx::Bitmap bmp;
RETURN_IF_ERROR(Renderer::GetInstance().CreateAndRenderBitmap( RETURN_IF_ERROR(Renderer::GetInstance().CreateAndRenderBitmap(
0x80, kOverworldMapSize, 0x08, overworld_.current_graphics(), bmp, 0x80, kOverworldMapSize, 0x08, overworld_.current_graphics(), bmp,
palette_)); palette_));
current_graphics_set_[current_map_] = bmp; current_graphics_set_[current_map_] = bmp;
}
} }
gui::BeginPadding(3); gui::BeginPadding(3);

14
src/app/editor/overworld/refresh.cc
View File

@@ -113,18 +113,15 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {
RETURN_IF_ERROR(tile16_blockset_bmp_.ApplyPalette(palette_)); RETURN_IF_ERROR(tile16_blockset_bmp_.ApplyPalette(palette_));
// Copy the tile16 data into individual tiles. // Copy the tile16 data into individual tiles.
auto tile16_data = overworld_.tile16_blockset_data(); const auto tile16_data = overworld_.tile16_blockset_data();
std::vector<std::future<void>> futures; std::vector<std::future<void>> futures;
// Loop through the tiles and copy their pixel data into separate vectors // Loop through the tiles and copy their pixel data into separate vectors
for (int i = 0; i < 4096; i++) { for (int i = 0; i < kNumTile16Individual; i++) {
futures.push_back(std::async( futures.push_back(std::async(
std::launch::async, std::launch::async,
[&](int index) { [&](int index) {
// Create a new vector for the pixel data of the current tile std::vector<uint8_t> tile_data(16 * 16, 0x00);
std::vector<uint8_t> tile_data(16 * 16, 0x00); // More efficient initialization
// Copy the pixel data for the current tile into the vector
for (int ty = 0; ty < 16; ty++) { for (int ty = 0; ty < 16; ty++) {
for (int tx = 0; tx < 16; tx++) { for (int tx = 0; tx < 16; tx++) {
int position = tx + (ty * 0x10); int position = tx + (ty * 0x10);
@@ -134,9 +131,6 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {
tile_data[position] = value; tile_data[position] = value;
} }
} }
// Add the vector for the current tile to the vector of tile pixel
// data
tile16_individual_[index].set_data(tile_data); tile16_individual_[index].set_data(tile_data);
}, },
i)); i));
@@ -147,7 +141,7 @@ absl::Status OverworldEditor::RefreshTile16Blockset() {
} }
// Render the bitmaps of each tile. // Render the bitmaps of each tile.
for (int id = 0; id < 4096; id++) { for (int id = 0; id < kNumTile16Individual; id++) {
RETURN_IF_ERROR(tile16_individual_[id].ApplyPalette(palette_)); RETURN_IF_ERROR(tile16_individual_[id].ApplyPalette(palette_));
Renderer::GetInstance().UpdateBitmap(&tile16_individual_[id]); Renderer::GetInstance().UpdateBitmap(&tile16_individual_[id]);
} }