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

feat: Improve dungeon canvas rendering and object interaction

Browse Source 
- Updated DungeonCanvasViewer and DungeonEditor to render room objects as primitives temporarily for debugging purposes.
- Enhanced object interaction with new context menu options for deleting, copying, and pasting selected objects.
- Implemented drag-and-drop functionality for moving selected objects within the dungeon.
- Added texture processing for background layers and deferred texture commands to optimize rendering performance.
- Refactored code for clarity and maintainability, ensuring better handling of object interactions and rendering logic.
This commit is contained in:
scawful
2025-10-09 08:37:03 -04:00
parent 557b89dac4
commit 48faee6711
5 changed files with 246 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/app/editor/dungeon/dungeon_editor.cc
View File

@@ -715,20 +715,42 @@ void DungeonEditor::DrawDungeonCanvas(int room_id) {
}
// Render background layers with proper positioning
renderer_.RenderRoomBackgroundLayers(room_id);
// Render room objects and sprites with improved graphics
// This uses per-room buffers which already include objects drawn by ObjectDrawer
auto& room = rooms_[room_id];
auto& bg1_bitmap = room.bg1_buffer().bitmap();
auto& bg2_bitmap = room.bg2_buffer().bitmap();
if (bg1_bitmap.is_active() && bg1_bitmap.width() > 0) {
if (!bg1_bitmap.texture()) {
// Queue texture creation for background layer 1
gfx::Arena::Get().QueueTextureCommand(
gfx::Arena::TextureCommandType::CREATE, &bg1_bitmap);
}
canvas_.DrawBitmap(bg1_bitmap, 0, 0, 1.0f, 255);
}
if (bg2_bitmap.is_active() && bg2_bitmap.width() > 0) {
if (!bg2_bitmap.texture()) {
// Queue texture creation for background layer 2
gfx::Arena::Get().QueueTextureCommand(
gfx::Arena::TextureCommandType::CREATE, &bg2_bitmap);
}
canvas_.DrawBitmap(bg2_bitmap, 0, 0, 1.0f, 200);
}
// TEMPORARY: Render all objects as primitives until proper rendering is fixed
if (current_palette_id_ < current_palette_group_.size()) {
auto room_palette = current_palette_group_[current_palette_id_];
// Render regular objects with improved fallback
for (const auto& object : rooms_[room_id].GetTileObjects()) {
// Render regular objects with primitive fallback
for (const auto& object : room.GetTileObjects()) {
renderer_.RenderObjectInCanvas(object, room_palette);
}
// Render sprites as simple 16x16 squares with labels
renderer_.RenderSprites(rooms_[room_id]);
}
// Render sprites as simple 16x16 squares with labels
// (Sprites are not part of the background buffers)
renderer_.RenderSprites(rooms_[room_id]);
}
// Phase 5: Render with integrated object editor
@@ -740,6 +762,9 @@ void DungeonEditor::DrawDungeonCanvas(int room_id) {
canvas_.DrawGrid();
canvas_.DrawOverlay();
// Process queued texture commands
ProcessDeferredTextures();
}
// ============================================================================
@@ -847,4 +872,10 @@ absl::Status DungeonEditor::UpdateRoomBackgroundLayers(int /*room_id*/) {
return absl::OkStatus();
}
void DungeonEditor::ProcessDeferredTextures() {
// Process queued texture commands via Arena's deferred system
// Note: Arena will use its stored renderer reference
gfx::Arena::Get().ProcessTextureQueue(nullptr);
}
} // namespace yaze::editor