move OverworldEditor to editor/overworld

This commit is contained in:
scawful
2024-08-10 11:47:17 -04:00
parent 250096a0a0
commit 94a0fd02f6
9 changed files with 13 additions and 7 deletions

View File

@@ -3,7 +3,7 @@ set(
app/editor/dungeon/dungeon_editor.cc
app/editor/master_editor.cc
app/editor/settings_editor.cc
app/editor/overworld_editor.cc
app/editor/overworld/overworld_editor.cc
app/editor/sprite/sprite_editor.cc
app/editor/music/music_editor.cc
app/editor/message/message_editor.cc

View File

@@ -17,7 +17,7 @@
#include "app/editor/graphics/palette_editor.h"
#include "app/editor/graphics/screen_editor.h"
#include "app/editor/music/music_editor.h"
#include "app/editor/overworld_editor.h"
#include "app/editor/overworld/overworld_editor.h"
#include "app/editor/sprite/sprite_editor.h"
#include "app/editor/utils/editor.h"
#include "app/editor/utils/gfx_context.h"

View File

@@ -14,7 +14,7 @@
#include "app/editor/graphics/palette_editor.h"
#include "app/editor/graphics/screen_editor.h"
#include "app/editor/music/music_editor.h"
#include "app/editor/overworld_editor.h"
#include "app/editor/overworld/overworld_editor.h"
#include "app/editor/sprite/sprite_editor.h"
#include "app/editor/utils/flags.h"
#include "app/editor/utils/recent_files.h"

View File

@@ -17,7 +17,7 @@
#include "app/editor/graphics/screen_editor.h"
#include "app/editor/message/message_editor.h"
#include "app/editor/music/music_editor.h"
#include "app/editor/overworld_editor.h"
#include "app/editor/overworld/overworld_editor.h"
#include "app/editor/settings_editor.h"
#include "app/editor/sprite/sprite_editor.h"
#include "app/editor/utils/gfx_context.h"

View File

@@ -3,7 +3,7 @@
#include "imgui/imgui.h"
#include "app/editor/overworld_editor.h"
#include "app/editor/overworld/overworld_editor.h"
#include "app/zelda3/common.h"
#include "app/zelda3/overworld/overworld.h"

View File

@@ -647,6 +647,12 @@ void OverworldEditor::DrawOverworldCanvas() {
ow_map_canvas_.DrawGrid();
ow_map_canvas_.DrawOverlay();
EndChild();
// Handle mouse wheel activity
if (ImGui::IsWindowHovered(ImGuiHoveredFlags_ChildWindows) && ImGui::IsMouseDragging(ImGuiMouseButton_Middle)) {
ImGui::SetScrollX(ImGui::GetScrollX() + ImGui::GetIO().MouseWheelH * 16.0f);
ImGui::SetScrollY(ImGui::GetScrollY() + ImGui::GetIO().MouseWheel * 16.0f);
}
}
absl::Status OverworldEditor::DrawTile16Selector() {

View File

@@ -1,5 +1,5 @@
#include "app/core/platform/renderer.h"
#include "app/editor/overworld_editor.h"
#include "app/editor/overworld/overworld_editor.h"
namespace yaze {
namespace app {