header cleanup

src/canvas.cpp

@@ -3,7 +3,6 @@
 #include <algorithm>
 #include <glm/ext/matrix_clip_space.hpp>
 #include <glm/ext/matrix_transform.hpp>
-#include <glm/gtc/matrix_inverse.hpp>
 #include <glm/gtc/type_ptr.hpp>
 
 #include "math.hpp"

src/clipboard.cpp

@@ -1,6 +1,7 @@
 #include "clipboard.hpp"
 
-#include <SDL3/SDL.h>
+#include <SDL3/SDL_clipboard.h>
+#include <SDL3/SDL_stdinc.h>
 
 namespace anm2ed
 {

src/document.cpp

@@ -5,7 +5,6 @@
 #include <cstdint>
 #include <limits>
 #include <new>
-#include <optional>
 #include <set>
 #include <string_view>
 #include <unordered_map>

src/imgui/actions.cpp

@@ -2,6 +2,9 @@
 
 #include <utility>
 
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
+
 namespace anm2ed::imgui
 {
   bool is_action_shortcut_valid(int shortcutType) { return shortcutType >= 0 && shortcutType < SHORTCUT_COUNT; }

src/imgui/actions.hpp

@@ -3,7 +3,8 @@
 #include <functional>
 #include <vector>
 
-#include "util/imgui/imgui.hpp"
+#include <imgui/imgui.h>
+
 #include "manager.hpp"
 #include "settings.hpp"
 

src/imgui/documents.cpp

@@ -8,6 +8,8 @@
 #include "strings.hpp"
 #include "time.hpp"
 #include "toast.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::types;

src/imgui/popup/autosave_restore.cpp

@@ -3,7 +3,7 @@
 #include <format>
 
 #include "path.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/layout.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::util;

src/imgui/popup/item_properties.cpp

@@ -2,7 +2,9 @@
 
 #include <format>
 
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::types;

src/imgui/taskbar.cpp

@@ -13,6 +13,8 @@
 #include "strings.hpp"
 #include "toast.hpp"
 #include "types.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::types;

src/imgui/taskbar.hpp

@@ -4,11 +4,11 @@
 
 #include "canvas.hpp"
 #include "dialog.hpp"
-#include "util/imgui/imgui.hpp"
 #include "manager.hpp"
 #include "resources.hpp"
 #include "settings.hpp"
 #include "strings.hpp"
+#include "util/imgui/popup.hpp"
 
 #include "wizard/about.hpp"
 #include "wizard/change_all_frame_properties.hpp"

src/imgui/toast.cpp

@@ -2,7 +2,6 @@
 
 #include <format>
 
-#include "log.hpp"
 #include <imgui/imgui.h>
 
 #include "types.hpp"

src/imgui/window/animation_preview.cpp

@@ -12,7 +12,6 @@
 #include <glm/gtc/type_ptr.hpp>
 
 #include "actions.hpp"
-#include "util/imgui/imgui.hpp"
 #include "log.hpp"
 #include "math.hpp"
 #include "path.hpp"
@@ -20,6 +19,11 @@
 #include "toast.hpp"
 #include "tool.hpp"
 #include "types.hpp"
+#include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 using namespace anm2ed::types;
 using namespace anm2ed::util;

src/imgui/window/frame_properties.cpp

@@ -8,7 +8,8 @@
 #include "math.hpp"
 #include "strings.hpp"
 #include "types.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
 
 using namespace anm2ed::util::math;
 using namespace anm2ed::types;

src/imgui/window/onionskin.cpp

@@ -2,8 +2,10 @@
 
 #include <glm/gtc/type_ptr.hpp>
 
-#include "util/imgui/imgui.hpp"
 #include "strings.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 using namespace anm2ed::types;
 using namespace glm;

src/imgui/window/spritesheet_editor.cpp

@@ -6,12 +6,16 @@
 #include <utility>
 
 #include "actions.hpp"
-#include "util/imgui/imgui.hpp"
 #include "imgui_internal.h"
 #include "math.hpp"
 #include "strings.hpp"
 #include "tool.hpp"
 #include "types.hpp"
+#include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 using namespace anm2ed::types;
 using namespace anm2ed::resource;

src/imgui/window/timeline.cpp

@@ -13,6 +13,10 @@
 #include "log.hpp"
 #include "toast.hpp"
 #include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 #include "vector.hpp"
 

src/imgui/window/tools.cpp

@@ -6,7 +6,8 @@
 #include "strings.hpp"
 #include "tool.hpp"
 #include "types.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::types;

src/imgui/window/welcome.cpp

@@ -5,6 +5,8 @@
 
 #include "path.hpp"
 #include "strings.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/selectable.hpp"
 
 using namespace anm2ed::util;
 using namespace anm2ed::resource;

src/imgui/window/window.cpp

@@ -13,6 +13,11 @@
 #include "path.hpp"
 #include "strings.hpp"
 #include "toast.hpp"
+#include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/tooltip.hpp"
 #include "vector.hpp"
 #include "working_directory.hpp"
 

src/imgui/window/window.hpp

@@ -7,11 +7,12 @@
 
 #include "clipboard.hpp"
 #include "dialog.hpp"
-#include "util/imgui/imgui.hpp"
 #include "manager.hpp"
 #include "resources.hpp"
 #include "settings.hpp"
 #include "storage.hpp"
+#include "util/imgui/popup.hpp"
+#include "util/imgui/selectable.hpp"
 
 namespace anm2ed::imgui
 {

src/imgui/wizard/change_all_frame_properties.cpp

@@ -7,7 +7,8 @@
 #include <vector>
 
 #include "math.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
 
 using namespace anm2ed::util::math;
 using namespace glm;

src/imgui/wizard/configure.cpp

@@ -1,9 +1,10 @@
 #include "configure.hpp"
 
-#include "log.hpp"
-#include "path.hpp"
 #include "sdl.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
+#include "util/imgui/theme.hpp"
 
 using namespace anm2ed::types;
 

src/imgui/wizard/generate_animation_from_grid.cpp

@@ -3,7 +3,9 @@
 #include <algorithm>
 #include "math.hpp"
 #include "types.hpp"
-#include "util/imgui/imgui.hpp"
+#include "util/imgui/draw.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
 
 using namespace anm2ed::types;
 using namespace anm2ed::util;

src/imgui/wizard/render_animation.cpp

@@ -3,11 +3,13 @@
 #include <ranges>
 #include <string>
 
-#include "util/imgui/imgui.hpp"
 #include "log.hpp"
 #include "path.hpp"
 #include "process.hpp"
 #include "toast.hpp"
+#include "util/imgui/input.hpp"
+#include "util/imgui/layout.hpp"
+#include "util/imgui/shortcut.hpp"
 
 using namespace anm2ed::resource;
 using namespace anm2ed::util;

src/loader.cpp

@@ -14,11 +14,10 @@
 #include "sdl.hpp"
 #include "texture.hpp"
 
-#include "util/imgui/imgui.hpp"
-
 #include "snapshots.hpp"
 #include "socket.hpp"
 
+#include "util/imgui/theme.hpp"
 #include "util/math.hpp"
 
 #ifdef _WIN32

src/log.cpp

@@ -6,7 +6,6 @@
 #include <print>
 
 #include "file.hpp"
-#include "path.hpp"
 #include "sdl.hpp"
 #include "strings.hpp"
 #include "time.hpp"

src/playback.cpp

@@ -1,6 +1,5 @@
 #include "playback.hpp"
 
-#include <algorithm>
 #include <cmath>
 
 #include <glm/common.hpp>

src/render.cpp

@@ -8,11 +8,15 @@
 #include <fstream>
 #include <string>
 
+#include <SDL3/SDL_timer.h>
+
 #include "log.hpp"
 #include "path.hpp"
 #include "process.hpp"
-#include "sdl.hpp"
+
+#if _WIN32
   #include "string.hpp"
+#endif
 
 using namespace anm2ed::util;
 

src/util/file.cpp

@@ -1,7 +1,6 @@
 #include "file.hpp"
 
 #include <array>
-#include <cstring>
 
 namespace anm2ed::util
 {
@@ -16,7 +15,8 @@ namespace anm2ed::util
 #ifdef _WIN32
     std::wstring wideMode{};
     if (mode)
-      wideMode.assign(mode, mode + std::strlen(mode));
+      for (auto character = mode; *character; ++character)
+        wideMode.push_back((wchar_t)*character);
     else
       wideMode = L"rb";
     handle = _wfopen(path.native().c_str(), wideMode.c_str());

src/util/imgui/imgui.hpp

@@ -1,12 +0,0 @@
-#pragma once
-
-#include "constants.hpp"
-#include "draw.hpp"
-#include "input.hpp"
-#include "layout.hpp"
-#include "multiselect.hpp"
-#include "popup.hpp"
-#include "selectable.hpp"
-#include "shortcut.hpp"
-#include "theme.hpp"
-#include "tooltip.hpp"

src/util/imgui/popup.cpp

@@ -1,6 +1,5 @@
 #include "popup.hpp"
 
-#include <glm/glm.hpp>
 #include <imgui/imgui.h>
 
 #include "types.hpp"

src/util/path.cpp

@@ -1,7 +1,6 @@
 #include "path.hpp"
 
-#include <SDL3/SDL_filesystem.h>
-#include <SDL3/SDL_stdinc.h>
+#include <algorithm>
 #include <cctype>
 #include <cwctype>
 #include <filesystem>

src/util/sdl.cpp

@@ -1,6 +1,7 @@
 #include "sdl.hpp"
 
-#include <SDL3/SDL.h>
+#include <SDL3/SDL_filesystem.h>
+#include <SDL3/SDL_stdinc.h>
 
 #include "path.hpp"