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

Implement critical fixes for tile cache issues and optimize resource management

Browse Source 
- Updated Tile16Editor to regenerate blockset atlas directly from ROM data, bypassing problematic tile cache.
- Enhanced clipboard functionality to extract tile data directly from the atlas, improving reliability.
- Refactored Arena class shutdown process to ensure safe cleanup of resources, preventing double-free issues.
- Optimized Canvas rendering logic to utilize pre-calculated values for improved performance with large selections.
This commit is contained in:
scawful
2025-09-29 09:42:06 -04:00
parent 94f5c0ec60
commit 690f77eea0
3 changed files with 66 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/editor/overworld/tile16_editor.cc
View File

@@ -338,16 +338,13 @@ absl::Status Tile16Editor::RefreshTile16Blockset() {
return absl::FailedPreconditionError("Tile16 blockset not available");
}
// Force regeneration of the blockset atlas from ROM tile16 data
// This ensures the blockset reflects any changes made to individual tiles
// Clear cached tiles to force regeneration
tile16_blockset_->tile_cache.Clear();
// CRITICAL FIX: Force regeneration without using problematic tile cache
// Directly mark atlas as modified to trigger regeneration from ROM data
// Mark atlas as modified to trigger regeneration
tile16_blockset_->atlas.set_modified(true);
// Update the atlas bitmap
// Update the atlas bitmap using the safer direct approach
core::Renderer::Get().UpdateBitmap(&tile16_blockset_->atlas);
util::logf("Tile16 blockset refreshed and regenerated");
@@ -1084,12 +1081,11 @@ absl::Status Tile16Editor::CopyTile16ToClipboard(int tile_id) {
return absl::InvalidArgumentError("Invalid tile ID");
}
// Create a copy of the tile16 bitmap
gfx::RenderTile(*tile16_blockset_, tile_id);
auto* cached_tile = tile16_blockset_->tile_cache.GetTile(tile_id);
if (cached_tile) {
clipboard_tile16_.Create(16, 16, 8, cached_tile->vector());
clipboard_tile16_.SetPalette(cached_tile->palette());
// CRITICAL FIX: Extract tile data directly from atlas instead of using problematic tile cache
auto tile_data = gfx::GetTilemapData(*tile16_blockset_, tile_id);
if (!tile_data.empty()) {
clipboard_tile16_.Create(16, 16, 8, tile_data);
clipboard_tile16_.SetPalette(tile16_blockset_->atlas.palette());
}
core::Renderer::Get().RenderBitmap(&clipboard_tile16_);
@@ -1497,10 +1493,8 @@ absl::Status Tile16Editor::UpdateOverworldTilemap() {
return absl::OutOfRangeError("Current tile16 ID out of range");
}
// Update the tilemap with our modified bitmap
// Create a copy to avoid moving the original bitmap
gfx::Bitmap tile_copy = current_tile16_bmp_;
tile16_blockset_->tile_cache.CacheTile(current_tile16_, std::move(tile_copy));
// CRITICAL FIX: Update atlas directly instead of using problematic tile cache
// This prevents the move-related crashes we experienced earlier
// Update the atlas if needed
if (tile16_blockset_->atlas.is_active()) {