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

Refactor tile rendering in Canvas to prevent crashes

Browse Source 
- Removed pre-rendering of tiles to avoid issues with tile cache.
- Updated tile drawing logic to directly use the atlas texture, enhancing stability and performance.
- Added bounds checks and UV coordinate calculations for improved rendering accuracy.
This commit is contained in:
scawful
2025-09-29 09:21:27 -04:00
parent 4bf4a13dae
commit cfd56d53ee
1 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/app/gui/canvas.cc
View File

@@ -904,16 +904,8 @@ void Canvas::DrawBitmapGroup(std::vector<int> &group, gfx::Tilemap &tilemap,
return; return;
} }
// Pre-render all tiles to avoid timing issues // Skip pre-rendering to avoid tile cache crashes
auto tilemap_size = tilemap.atlas.width() * tilemap.atlas.height() / tilemap.map_size.x; // We'll draw directly from the atlas instead
for (int tile_id : group) {
if (tile_id >= 0 && tile_id < tilemap_size) {
gfx::RenderTile(tilemap, tile_id);
// DISABLED: tile cache operations that cause crashes
// The tile rendering is handled by RenderTile() above
}
}
// Top-left and bottom-right corners of the rectangle // Top-left and bottom-right corners of the rectangle
ImVec2 rect_top_left = selected_points_[0]; ImVec2 rect_top_left = selected_points_[0];
@@ -957,11 +949,34 @@ void Canvas::DrawBitmapGroup(std::vector<int> &group, gfx::Tilemap &tilemap,
int tile_pos_x = (x + start_tile_x) * tile_size * scale; int tile_pos_x = (x + start_tile_x) * tile_size * scale;
int tile_pos_y = (y + start_tile_y) * tile_size * scale; int tile_pos_y = (y + start_tile_y) * tile_size * scale;
// Draw the tile bitmap at the calculated position // Draw tile directly from atlas without caching to prevent crashes
gfx::RenderTile(tilemap, tile_id); if (tilemap.atlas.is_active() && tilemap.atlas.texture()) {
int tiles_per_row = tilemap.atlas.width() / tilemap.tile_size.x;
if (tiles_per_row > 0) {
int atlas_tile_x = (tile_id % tiles_per_row) * tilemap.tile_size.x;
int atlas_tile_y = (tile_id / tiles_per_row) * tilemap.tile_size.y;
// DISABLED: tile cache operations that cause crashes // Simple bounds check
// Skip individual tile drawing for now to prevent crashes if (atlas_tile_x >= 0 && atlas_tile_x < tilemap.atlas.width() &&
atlas_tile_y >= 0 && atlas_tile_y < tilemap.atlas.height()) {
// Calculate UV coordinates for atlas texture
ImVec2 uv0 = ImVec2(static_cast<float>(atlas_tile_x) / tilemap.atlas.width(),
static_cast<float>(atlas_tile_y) / tilemap.atlas.height());
ImVec2 uv1 = ImVec2(static_cast<float>(atlas_tile_x + tilemap.tile_size.x) / tilemap.atlas.width(),
static_cast<float>(atlas_tile_y + tilemap.tile_size.y) / tilemap.atlas.height());
// Draw from atlas texture with transparency for preview
draw_list_->AddImage(
(ImTextureID)(intptr_t)tilemap.atlas.texture(),
ImVec2(canvas_p0_.x + scrolling_.x + tile_pos_x,
canvas_p0_.y + scrolling_.y + tile_pos_y),
ImVec2(canvas_p0_.x + scrolling_.x + tile_pos_x + (tilemap.tile_size.x * scale),
canvas_p0_.y + scrolling_.y + tile_pos_y + (tilemap.tile_size.y * scale)),
uv0, uv1, IM_COL32(255, 255, 255, 150)); // 150 alpha for preview
}
}
}
} }
i++; i++;
} }