GUI Improvements with fonts and some underlying palette and bitmap code stuff

src/Application/Editor/Editor.cc

@@ -2,10 +2,10 @@
 
 namespace yaze {
 namespace Application {
-namespace View {
+namespace Editor {
 
 void Editor::UpdateScreen() {
-  const ImGuiIO& io = ImGui::GetIO();
+  const ImGuiIO &io = ImGui::GetIO();
   ImGui::NewFrame();
   ImGui::SetNextWindowPos(ImVec2(0, 0));
   ImVec2 dimensions(io.DisplaySize.x, io.DisplaySize.y);
@@ -13,12 +13,13 @@ void Editor::UpdateScreen() {
   ImGuiWindowFlags flags =
       ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoCollapse |
       ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoScrollbar |
-      ImGuiWindowFlags_MenuBar;
+      ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoTitleBar;
 
-  if (!ImGui::Begin("Main", nullptr, flags)) {
+  if (!ImGui::Begin("#yaze", nullptr, flags)) {
     ImGui::End();
     return;
   }
+
   DrawYazeMenu();
 
   if (isLoaded) {
@@ -35,6 +36,7 @@ void Editor::UpdateScreen() {
   if (ImGui::BeginTabBar("##TabBar")) {
     DrawOverworldEditor();
     DrawDungeonEditor();
+    DrawScreenEditor();
     DrawROMInfo();
     ImGui::EndTabBar();
   }
@@ -45,15 +47,9 @@ void Editor::UpdateScreen() {
 
 void Editor::DrawYazeMenu() {
   if (ImGui::BeginMenuBar()) {
-    if (ImGui::BeginMenu("File")) {
-      DrawFileMenu();
-      ImGui::EndMenu();
-    }
-
-    if (ImGui::BeginMenu("Edit")) {
-      DrawEditMenu();
-      ImGui::EndMenu();
-    }
+    DrawFileMenu();
+    DrawEditMenu();
+    DrawViewMenu();
     ImGui::EndMenuBar();
   }
 
@@ -73,180 +69,174 @@ void Editor::DrawYazeMenu() {
 }
 
 void Editor::DrawFileMenu() const {
-  if (ImGui::MenuItem("Open", "Ctrl+O")) {
-    // TODO: Add the ability to open ALTTP ROM
-    ImGuiFileDialog::Instance()->OpenDialog("ChooseFileDlgKey", "Open ROM",
-                                            ".sfc,.smc", ".");
-  }
-  if (ImGui::BeginMenu("Open Recent")) {
-    ImGui::MenuItem("alttp.sfc");
-    // TODO: Display recently accessed files here
-    ImGui::EndMenu();
-  }
-  if (ImGui::MenuItem("Save", "Ctrl+S")) {
-    // TODO: Implement this
-  }
-  if (ImGui::MenuItem("Save As..")) {
-    // TODO: Implement this
-  }
+  if (ImGui::BeginMenu("File")) {
+    if (ImGui::MenuItem("Open", "Ctrl+O")) {
+      // TODO: Add the ability to open ALTTP ROM
+      ImGuiFileDialog::Instance()->OpenDialog("ChooseFileDlgKey", "Open ROM",
+                                              ".sfc,.smc", ".");
+    }
+    if (ImGui::BeginMenu("Open Recent")) {
+      ImGui::MenuItem("alttp.sfc");
+      // TODO: Display recently accessed files here
+      ImGui::EndMenu();
+    }
+    if (ImGui::MenuItem("Save", "Ctrl+S")) {
+      // TODO: Implement this
+    }
+    if (ImGui::MenuItem("Save As..")) {
+      // TODO: Implement this
+    }
 
-  ImGui::Separator();
+    ImGui::Separator();
 
-  // TODO: Make these options matter
-  if (ImGui::BeginMenu("Options")) {
-    static bool enabled = true;
-    ImGui::MenuItem("Enabled", "", &enabled);
-    ImGui::BeginChild("child", ImVec2(0, 60), true);
-    for (int i = 0; i < 10; i++) ImGui::Text("Scrolling Text %d", i);
-    ImGui::EndChild();
-    static float f = 0.5f;
-    static int n = 0;
-    ImGui::SliderFloat("Value", &f, 0.0f, 1.0f);
-    ImGui::InputFloat("Input", &f, 0.1f);
-    ImGui::Combo("Combo", &n, "Yes\0No\0Maybe\0\0");
+    // TODO: Make these options matter
+    if (ImGui::BeginMenu("Options")) {
+      static bool enabled = true;
+      ImGui::MenuItem("Enabled", "", &enabled);
+      ImGui::BeginChild("child", ImVec2(0, 60), true);
+      for (int i = 0; i < 10; i++)
+        ImGui::Text("Scrolling Text %d", i);
+      ImGui::EndChild();
+      static float f = 0.5f;
+      static int n = 0;
+      ImGui::SliderFloat("Value", &f, 0.0f, 1.0f);
+      ImGui::InputFloat("Input", &f, 0.1f);
+      ImGui::Combo("Combo", &n, "Yes\0No\0Maybe\0\0");
+      ImGui::EndMenu();
+    }
     ImGui::EndMenu();
   }
 }
 
 void Editor::DrawEditMenu() const {
-  if (ImGui::MenuItem("Undo", "Ctrl+O")) {
-    // TODO: Implement this
+  if (ImGui::BeginMenu("Edit")) {
+    if (ImGui::MenuItem("Undo", "Ctrl+Z")) {
+      // TODO: Implement this
+    }
+    if (ImGui::MenuItem("Undo", "Ctrl+Y")) {
+      // TODO: Implement this
+    }
+    ImGui::Separator();
+    if (ImGui::MenuItem("Cut", "Ctrl+X")) {
+      // TODO: Implement this
+    }
+    if (ImGui::MenuItem("Copy", "Ctrl+C")) {
+      // TODO: Implement this
+    }
+    if (ImGui::MenuItem("Paste", "Ctrl+V")) {
+      // TODO: Implement this
+    }
+    ImGui::Separator();
+    if (ImGui::MenuItem("Find", "Ctrl+F")) {
+      // TODO: Implement this
+    }
+    ImGui::EndMenu();
   }
-  if (ImGui::MenuItem("Undo", "Ctrl+O")) {
-    // TODO: Implement this
+}
+
+void Editor::DrawViewMenu() const {
+  static bool show_imgui_metrics = false;
+  static bool show_imgui_style_editor = false;
+  if (show_imgui_metrics) {
+    ImGui::ShowMetricsWindow(&show_imgui_metrics);
   }
-  ImGui::Separator();
-  if (ImGui::MenuItem("Cut", "Ctrl+X")) {
-    // TODO: Implement this
+
+  if (show_imgui_style_editor) {
+    ImGui::Begin("Style Editor (ImGui)", &show_imgui_style_editor);
+    ImGui::ShowStyleEditor();
+    ImGui::End();
   }
-  if (ImGui::MenuItem("Copy", "Ctrl+C")) {
-    // TODO: Implement this
-  }
-  if (ImGui::MenuItem("Paste", "Ctrl+V")) {
-    // TODO: Implement this
-  }
-  ImGui::Separator();
-  if (ImGui::MenuItem("Find Tiles", "Ctrl+F")) {
-    // TODO: Implement this
+
+  if (ImGui::BeginMenu("View")) {
+    if (ImGui::BeginMenu("Appearance")) {
+      if (ImGui::MenuItem("Fullscreen")) {
+      }
+      ImGui::EndMenu();
+    }
+
+    ImGui::Separator();
+    if (ImGui::BeginMenu("GUI Tools")) {
+      ImGui::MenuItem("Metrics (ImGui)", nullptr, &show_imgui_metrics);
+      ImGui::MenuItem("Style Editor (ImGui)", nullptr,
+                      &show_imgui_style_editor);
+      ImGui::EndMenu();
+    }
+    ImGui::EndMenu();
   }
 }
 
 // first step would be to decompress all graphics data from the game
-// (in alttp that's easy they're all located in the same location all the same
-// sheet size 128x32) have a code that convert PC address to SNES and vice-versa
+// (in alttp that's easy they're all located in the same location all the
+// same sheet size 128x32) have a code that convert PC address to SNES and
+// vice-versa
 
 // 1) find the gfx pointers (you could use ZS constant file)
 // 2) decompress all the gfx with your lz2 decompressor
 // 3) convert the 3bpp snes data into PC 4bpp (probably the hardest part)
 // 4) get the tiles32 data
 // 5) get the tiles16 data
-// 6) get the map32 data (they must be decompressed as well with a lz2 variant
-// not the same as gfx compression but pretty similar)
-// 7) get the gfx data of the map
-// yeah i forgot that one and load 4bpp in a pseudo vram and use that to
-// render tiles on screen
-// 8) try to render the tiles on the bitmap in black & white to start
-// 9) get the palettes data and try to find how they're loaded in
-// the game that's a big puzzle to solve then 9 you'll have an overworld map
-// viewer, in less than few hours if are able to understand the data quickly
+// 6) get the map32 data (they must be decompressed as well with a lz2
+// variant not the same as gfx compression but pretty similar) 7) get the
+// gfx data of the map yeah i forgot that one and load 4bpp in a pseudo vram
+// and use that to render tiles on screen 8) try to render the tiles on the
+// bitmap in black & white to start 9) get the palettes data and try to find
+// how they're loaded in the game that's a big puzzle to solve then 9 you'll
+// have an overworld map viewer, in less than few hours if are able to
+// understand the data quickly
 void Editor::DrawOverworldEditor() {
   if (ImGui::BeginTabItem("Overworld")) {
-    static ImVector<ImVec2> points;
-    static ImVec2 scrolling(0.0f, 0.0f);
-    static bool opt_enable_grid = true;
-    static bool opt_enable_context_menu = true;
-    static bool adding_line = false;
-
-    ImGui::Checkbox("Enable grid", &opt_enable_grid);
-
-    ImVec2 canvas_p0 = ImGui::GetCursorScreenPos();
-    ImVec2 canvas_sz = ImGui::GetContentRegionAvail();
-    ImVec2 canvas_p1 =
-        ImVec2(canvas_p0.x + canvas_sz.x, canvas_p0.y + canvas_sz.y);
-
-    // Draw border and background color
-    const ImGuiIO& io = ImGui::GetIO();
-    ImDrawList* draw_list = ImGui::GetWindowDrawList();
-    draw_list->AddRectFilled(canvas_p0, canvas_p1, IM_COL32(50, 50, 50, 255));
-    draw_list->AddRect(canvas_p0, canvas_p1, IM_COL32(255, 255, 255, 255));
-
-    // This will catch our interactions
-    ImGui::InvisibleButton(
-        "canvas", canvas_sz,
-        ImGuiButtonFlags_MouseButtonLeft | ImGuiButtonFlags_MouseButtonRight);
-    const bool is_hovered = ImGui::IsItemHovered();  // Hovered
-    const bool is_active = ImGui::IsItemActive();    // Held
-    const ImVec2 origin(canvas_p0.x + scrolling.x,
-                        canvas_p0.y + scrolling.y);  // Lock scrolled origin
-    const ImVec2 mouse_pos_in_canvas(io.MousePos.x - origin.x,
-                                     io.MousePos.y - origin.y);
-
-    // Add first and second point
-    if (is_hovered && !adding_line &&
-        ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
-      points.push_back(mouse_pos_in_canvas);
-      points.push_back(mouse_pos_in_canvas);
-      adding_line = true;
-    }
-    if (adding_line) {
-      points.back() = mouse_pos_in_canvas;
-      if (!ImGui::IsMouseDown(ImGuiMouseButton_Left)) adding_line = false;
-    }
-
-    // Pan (we use a zero mouse threshold when there's no context menu)
-    const float mouse_threshold_for_pan =
-        opt_enable_context_menu ? -1.0f : 0.0f;
-    if (is_active && ImGui::IsMouseDragging(ImGuiMouseButton_Right,
-                                            mouse_threshold_for_pan)) {
-      scrolling.x += io.MouseDelta.x;
-      scrolling.y += io.MouseDelta.y;
-    }
-
-    // Context menu (under default mouse threshold)
-    ImVec2 drag_delta = ImGui::GetMouseDragDelta(ImGuiMouseButton_Right);
-    if (opt_enable_context_menu && drag_delta.x == 0.0f && drag_delta.y == 0.0f)
-      ImGui::OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight);
-    if (ImGui::BeginPopup("context")) {
-      if (adding_line) points.resize(points.size() - 2);
-      adding_line = false;
-      if (ImGui::MenuItem("Remove one", NULL, false, points.Size > 0)) {
-        points.resize(points.size() - 2);
-      }
-      if (ImGui::MenuItem("Remove all", NULL, false, points.Size > 0)) {
-        points.clear();
-      }
-      ImGui::EndPopup();
-    }
-
-    // Draw grid + all lines in the canvas
-    draw_list->PushClipRect(canvas_p0, canvas_p1, true);
-    if (opt_enable_grid) {
-      const float GRID_STEP = 64.0f;
-      for (float x = fmodf(scrolling.x, GRID_STEP); x < canvas_sz.x;
-           x += GRID_STEP)
-        draw_list->AddLine(ImVec2(canvas_p0.x + x, canvas_p0.y),
-                           ImVec2(canvas_p0.x + x, canvas_p1.y),
-                           IM_COL32(200, 200, 200, 40));
-      for (float y = fmodf(scrolling.y, GRID_STEP); y < canvas_sz.y;
-           y += GRID_STEP)
-        draw_list->AddLine(ImVec2(canvas_p0.x, canvas_p0.y + y),
-                           ImVec2(canvas_p1.x, canvas_p0.y + y),
-                           IM_COL32(200, 200, 200, 40));
-    }
-
-    for (int n = 0; n < points.Size; n += 2)
-      draw_list->AddLine(
-          ImVec2(origin.x + points[n].x, origin.y + points[n].y),
-          ImVec2(origin.x + points[n + 1].x, origin.y + points[n + 1].y),
-          IM_COL32(255, 255, 0, 255), 2.0f);
-
-    draw_list->PopClipRect();
-
+    owEditor.Update();
     ImGui::EndTabItem();
   }
 }
-void DrawDungeonEditor() {
+
+void Editor::DrawDungeonEditor() {
   if (ImGui::BeginTabItem("Dungeon")) {
+    if (ImGui::BeginTable("DWToolset", 9, toolset_table_flags, ImVec2(0, 0))) {
+      ImGui::TableSetupColumn("#undoTool");
+      ImGui::TableSetupColumn("#redoTool");
+      ImGui::TableSetupColumn("#history");
+      ImGui::TableSetupColumn("#separator");
+      ImGui::TableSetupColumn("#bg1Tool");
+      ImGui::TableSetupColumn("#bg2Tool");
+      ImGui::TableSetupColumn("#bg3Tool");
+      ImGui::TableSetupColumn("#itemTool");
+      ImGui::TableSetupColumn("#spriteTool");
+
+      ImGui::TableNextColumn();
+      ImGui::Button(ICON_MD_UNDO);
+
+      ImGui::TableNextColumn();
+      ImGui::Button(ICON_MD_REDO);
+
+      ImGui::TableNextColumn();
+      ImGui::Button(ICON_MD_MANAGE_HISTORY);
+
+      ImGui::TableNextColumn();
+      ImGui::Text(ICON_MD_MORE_VERT);
+
+      ImGui::TableNextColumn();
+      ImGui::Button(ICON_MD_FILTER_1);
+
+      ImGui::TableNextColumn();
+      ImGui::Button(ICON_MD_FILTER_2);
+
+      ImGui::TableNextColumn();
+      ImGui::Button(ICON_MD_FILTER_3);
+
+      ImGui::TableNextColumn();
+      ImGui::Button(ICON_MD_GRASS);
+
+      ImGui::TableNextColumn();
+      ImGui::Button(ICON_MD_PEST_CONTROL_RODENT);
+      ImGui::EndTable();
+    }
+    ImGui::EndTabItem();
+  }
+}
+
+void Editor::DrawScreenEditor() {
+  if (ImGui::BeginTabItem("Screens")) {
     ImGui::EndTabItem();
   }
 }
@@ -263,6 +253,6 @@ void Editor::DrawROMInfo() {
   }
 }
 
-}  // namespace View
-}  // namespace Application
-}  // namespace yaze
+} // namespace Editor
+} // namespace Application
+} // namespace yaze

src/Application/Editor/Editor.h

@@ -3,7 +3,9 @@
 
 #include <memory>
 
+#include "Core/Icons.h"
 #include "Data/Overworld.h"
+#include "OverworldEditor.h"
 #include "ImGuiFileDialog/ImGuiFileDialog.h"
 #include "Utils/ROM.h"
 #include "imgui/backends/imgui_impl_sdl.h"
@@ -14,7 +16,7 @@
 
 namespace yaze {
 namespace Application {
-namespace View {
+namespace Editor {
 
 class Editor {
  public:
@@ -24,16 +26,22 @@ class Editor {
   void DrawYazeMenu();
   void DrawFileMenu() const;
   void DrawEditMenu() const;
+  void DrawViewMenu() const;
 
   void DrawOverworldEditor();
   void DrawDungeonEditor();
+  void DrawScreenEditor();
   void DrawROMInfo();
 
   bool isLoaded = false;
   bool doneLoaded = false;
   GLuint *overworld_texture;
   Data::Overworld overworld;
+  ::yaze::Application::Editor::OverworldEditor owEditor;
   Utils::ROM rom;
+
+
+  ImGuiTableFlags toolset_table_flags = ImGuiTableFlags_SizingFixedFit;
 };
 
 }  // namespace View

src/Application/Editor/OverworldEditor.cc

@@ -0,0 +1,239 @@
+#include "OverworldEditor.h"
+#include "Core/Icons.h"
+#include "imgui.h"
+#include <cmath>
+
+namespace yaze {
+namespace Application {
+namespace Editor {
+void OverworldEditor::Update() {
+  DrawToolset();
+  ImGui::Separator();
+  if (ImGui::BeginTable("#owEditTable", 2, ow_edit_flags, ImVec2(0, 0))) {
+    ImGui::TableSetupColumn("#overworldCanvas");
+    ImGui::TableSetupColumn("#tileSelector");
+    ImGui::TableNextColumn();
+    DrawOverworldCanvas();
+    ImGui::TableNextColumn();
+    DrawTileSelector();
+    ImGui::EndTable();
+  }
+}
+
+void OverworldEditor::DrawToolset() {
+  if (ImGui::BeginTable("Toolset", 12, toolset_table_flags, ImVec2(0, 0))) {
+
+    ImGui::TableSetupColumn("#undoTool");
+    ImGui::TableSetupColumn("#redoTool");
+    ImGui::TableSetupColumn("#drawTool");
+    ImGui::TableSetupColumn("#separator2");
+    ImGui::TableSetupColumn("#zoomOutTool");
+    ImGui::TableSetupColumn("#zoomInTool");
+    ImGui::TableSetupColumn("#separator");
+    ImGui::TableSetupColumn("#history");
+    ImGui::TableSetupColumn("#entranceExitTool");
+    ImGui::TableSetupColumn("#itemTool");
+    ImGui::TableSetupColumn("#spriteTool");
+    ImGui::TableSetupColumn("#transportTool");
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_UNDO);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_REDO);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_MANAGE_HISTORY);
+
+    ImGui::TableNextColumn();
+    ImGui::Text(ICON_MD_MORE_VERT);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_ZOOM_OUT);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_ZOOM_IN);
+
+    ImGui::TableNextColumn();
+    ImGui::Text(ICON_MD_MORE_VERT);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_DRAW);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_SENSOR_DOOR);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_GRASS);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_PEST_CONTROL_RODENT);
+
+    ImGui::TableNextColumn();
+    ImGui::Button(ICON_MD_ADD_LOCATION);
+
+    ImGui::EndTable();
+  }
+}
+
+void OverworldEditor::DrawOverworldMapSettings() {
+  if (ImGui::BeginTable("#mapSettings", 7, ow_map_settings_flags, ImVec2(0, 0),
+                        -1)) {
+
+    ImGui::TableSetupColumn("##1stCol");
+    ImGui::TableSetupColumn("##gfxCol");
+    ImGui::TableSetupColumn("##palCol");
+    ImGui::TableSetupColumn("##sprgfxCol");
+    ImGui::TableSetupColumn("##sprpalCol");
+    ImGui::TableSetupColumn("##msgidCol");
+    ImGui::TableSetupColumn("##2ndCol");
+
+    ImGui::TableNextColumn();
+    ImGui::SetNextItemWidth(100.f);
+    ImGui::Combo("##world", &current_world_,
+                 "Light World\0Dark World\0Extra World\0");
+
+    ImGui::TableNextColumn();
+    ImGui::Text("GFX");
+    ImGui::SameLine();
+    ImGui::SetNextItemWidth(kInputFieldSize);
+    ImGui::InputText("##mapGFX", map_gfx_, kByteSize);
+
+    ImGui::TableNextColumn();
+    ImGui::Text("Palette");
+    ImGui::SameLine();
+    ImGui::SetNextItemWidth(kInputFieldSize);
+    ImGui::InputText("##mapPal", map_palette_, kByteSize);
+
+    ImGui::TableNextColumn();
+    ImGui::Text("Spr GFX");
+    ImGui::SameLine();
+    ImGui::SetNextItemWidth(kInputFieldSize);
+    ImGui::InputText("##sprGFX", spr_gfx_, kByteSize);
+
+    ImGui::TableNextColumn();
+    ImGui::Text("Spr Palette");
+    ImGui::SameLine();
+    ImGui::SetNextItemWidth(kInputFieldSize);
+    ImGui::InputText("##sprPal", spr_palette_, kByteSize);
+
+    ImGui::TableNextColumn();
+    ImGui::Text("Msg ID");
+    ImGui::SameLine();
+    ImGui::SetNextItemWidth(50.f);
+    ImGui::InputText("##msgid", spr_palette_, kMessageIdSize);    
+    
+    ImGui::TableNextColumn();
+    ImGui::Checkbox("Show grid", &opt_enable_grid);
+    ImGui::EndTable();
+  }
+}
+
+void OverworldEditor::DrawOverworldCanvas() {
+  DrawOverworldMapSettings();
+  ImGui::Separator();
+  static ImVector<ImVec2> points;
+  static ImVec2 scrolling(0.0f, 0.0f);
+  static bool opt_enable_context_menu = true;
+  static bool adding_line = false;
+  ImVec2 canvas_p0 = ImGui::GetCursorScreenPos();
+  ImVec2 canvas_sz = ImGui::GetContentRegionAvail();
+  ImVec2 canvas_p1 =
+      ImVec2(canvas_p0.x + canvas_sz.x, canvas_p0.y + canvas_sz.y);
+
+  // Draw border and background color
+  const ImGuiIO &io = ImGui::GetIO();
+  ImDrawList *draw_list = ImGui::GetWindowDrawList();
+  draw_list->AddRectFilled(canvas_p0, canvas_p1, IM_COL32(32, 32, 32, 255));
+  draw_list->AddRect(canvas_p0, canvas_p1, IM_COL32(255, 255, 255, 255));
+
+  // This will catch our interactions
+  ImGui::InvisibleButton("canvas", canvas_sz,
+                         ImGuiButtonFlags_MouseButtonLeft |
+                             ImGuiButtonFlags_MouseButtonRight);
+  const bool is_hovered = ImGui::IsItemHovered(); // Hovered
+  const bool is_active = ImGui::IsItemActive();   // Held
+  const ImVec2 origin(canvas_p0.x + scrolling.x,
+                      canvas_p0.y + scrolling.y); // Lock scrolled origin
+  const ImVec2 mouse_pos_in_canvas(io.MousePos.x - origin.x,
+                                   io.MousePos.y - origin.y);
+
+  // Add first and second point
+  if (is_hovered && !adding_line &&
+      ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
+    points.push_back(mouse_pos_in_canvas);
+    points.push_back(mouse_pos_in_canvas);
+    adding_line = true;
+  }
+  if (adding_line) {
+    points.back() = mouse_pos_in_canvas;
+    if (!ImGui::IsMouseDown(ImGuiMouseButton_Left))
+      adding_line = false;
+  }
+
+  // Pan (we use a zero mouse threshold when there's no context menu)
+  const float mouse_threshold_for_pan = opt_enable_context_menu ? -1.0f : 0.0f;
+  if (is_active &&
+      ImGui::IsMouseDragging(ImGuiMouseButton_Right, mouse_threshold_for_pan)) {
+    scrolling.x += io.MouseDelta.x;
+    scrolling.y += io.MouseDelta.y;
+  }
+
+  // Context menu (under default mouse threshold)
+  ImVec2 drag_delta = ImGui::GetMouseDragDelta(ImGuiMouseButton_Right);
+  if (opt_enable_context_menu && drag_delta.x == 0.0f && drag_delta.y == 0.0f)
+    ImGui::OpenPopupOnItemClick("context", ImGuiPopupFlags_MouseButtonRight);
+  if (ImGui::BeginPopup("context")) {
+    if (adding_line)
+      points.resize(points.size() - 2);
+    adding_line = false;
+    if (ImGui::MenuItem("Remove one", NULL, false, points.Size > 0)) {
+      points.resize(points.size() - 2);
+    }
+    if (ImGui::MenuItem("Remove all", NULL, false, points.Size > 0)) {
+      points.clear();
+    }
+    ImGui::EndPopup();
+  }
+
+  // Draw grid + all lines in the canvas
+  draw_list->PushClipRect(canvas_p0, canvas_p1, true);
+  if (opt_enable_grid) {
+    const float GRID_STEP = 64.0f;
+    for (float x = fmodf(scrolling.x, GRID_STEP); x < canvas_sz.x;
+         x += GRID_STEP)
+      draw_list->AddLine(ImVec2(canvas_p0.x + x, canvas_p0.y),
+                         ImVec2(canvas_p0.x + x, canvas_p1.y),
+                         IM_COL32(200, 200, 200, 40));
+    for (float y = fmodf(scrolling.y, GRID_STEP); y < canvas_sz.y;
+         y += GRID_STEP)
+      draw_list->AddLine(ImVec2(canvas_p0.x, canvas_p0.y + y),
+                         ImVec2(canvas_p1.x, canvas_p0.y + y),
+                         IM_COL32(200, 200, 200, 40));
+  }
+
+  for (int n = 0; n < points.Size; n += 2)
+    draw_list->AddLine(
+        ImVec2(origin.x + points[n].x, origin.y + points[n].y),
+        ImVec2(origin.x + points[n + 1].x, origin.y + points[n + 1].y),
+        IM_COL32(255, 255, 0, 255), 2.0f);
+
+  draw_list->PopClipRect();
+}
+void OverworldEditor::DrawTileSelector() {
+  if (ImGui::BeginTabBar("##TabBar")) {
+    if (ImGui::BeginTabItem("Tile16")) {
+
+      ImGui::EndTabItem();
+    }
+    if (ImGui::BeginTabItem("Tile8")) {
+
+      ImGui::EndTabItem();
+    }
+    ImGui::EndTabBar();
+  }
+}
+
+} // namespace Editor
+} // namespace Application
+} // namespace yaze

src/Application/Editor/OverworldEditor.h

@@ -0,0 +1,44 @@
+#ifndef YAZE_APPLICATION_EDITOR_OVERWORLDEDITOR_H
+#define YAZE_APPLICATION_EDITOR_OVERWORLDEDITOR_H
+
+#include "Core/Icons.h"
+#include "imgui/imgui.h"
+#include "imgui/misc/cpp/imgui_stdlib.h"
+
+namespace yaze {
+namespace Application {
+namespace Editor {
+class OverworldEditor {
+public:
+  void Update();
+
+private:
+  void DrawToolset();
+  void DrawOverworldMapSettings();
+  void DrawOverworldCanvas();
+  void DrawTileSelector();
+
+  ImGuiTableFlags toolset_table_flags = ImGuiTableFlags_SizingFixedFit;
+  ImGuiTableFlags ow_map_settings_flags = ImGuiTableFlags_Borders;
+  ImGuiTableFlags ow_edit_flags = ImGuiTableFlags_Reorderable | ImGuiTableFlags_Resizable | ImGuiTableFlags_SizingStretchSame;
+
+  float canvas_table_ratio = 30.f;
+
+  char map_gfx_[3] = "";
+  char map_palette_[3] = "";
+  char spr_gfx_[3] = "";
+  char spr_palette_[3] = "";
+  char message_id_[5] = "";
+
+  int current_world_ = 0;
+
+  constexpr static int kByteSize = 3;
+  constexpr static int kMessageIdSize = 5;
+  constexpr static float kInputFieldSize = 30.f;
+  bool opt_enable_grid = true;
+};
+} // namespace Editor
+} // namespace Application
+} // namespace yaze
+
+#endif