foo

6 files changed, 47 insertions, 20 deletions

diff --git a/main/app.cpp b/main/app.cpp
index a9523548..92ac68dc 100644
--- a/main/app.cpp
+++ b/main/app.cpp
@@ -79,7 +79,7 @@ app::app(const Arguments& arguments, app_settings opts):
 void app::recalc_viewport(Vector2i size)
 {
     _shader.set_scale(Vector2(size));
-    _imgui.relayout(Vector2{ size }, size, size);
+    _imgui.relayout(Vector2{size}, size, size);
 
     _cursor_pixel = std::nullopt;
     recalc_cursor_tile();
diff --git a/main/imgui.cpp b/main/imgui.cpp
index ea64cd85..db4f321b 100644
--- a/main/imgui.cpp
+++ b/main/imgui.cpp
@@ -88,7 +88,7 @@ void app::draw_editor_pane(tile_type& type, float main_menu_height)
     {
         ImGui::SetNextWindowPos({0, main_menu_height+style.WindowPadding.y});
         ImGui::SetNextFrameWantCaptureKeyboard(false);
-        ImGui::SetNextWindowSize({440, windowSize()[1] - main_menu_height - style.WindowPadding.y});
+        ImGui::SetNextWindowSize({420, windowSize()[1] - main_menu_height - style.WindowPadding.y});
         if (const auto flags = ImGuiWindowFlags_(ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings);
             auto b = begin_window({}, flags))
         {
@@ -124,7 +124,7 @@ void app::draw_editor_pane(tile_type& type, float main_menu_height)
                             push_style_color(ImGuiCol_ButtonHovered, color_hover),
                         };
                         const bool perm_selected = ed ? ed->is_permutation_selected(v) : false;
-                        constexpr std::size_t per_row = 5;
+                        constexpr std::size_t per_row = 8;
                         for (std::size_t i = 0; i < N; i++)
                         {
                             const bool selected = ed ? ed->is_tile_selected(v, i) : false;
diff --git a/main/precomp.hpp b/main/precomp.hpp
index b38f46f9..1dc47507 100644
--- a/main/precomp.hpp
+++ b/main/precomp.hpp
@@ -1,3 +1,19 @@
 #pragma once
 #include "src/precomp.hpp"
-#include "app.hpp"
+
+#include <Corrade/Utility/Arguments.h>
+#include <Corrade/Utility/DebugStl.h>
+
+#include <Magnum/ImageFlags.h>
+#include <Magnum/ImageView.h>
+#include <Magnum/PixelFormat.h>
+#include <Magnum/PixelStorage.h>
+#include <Magnum/Timeline.h>
+
+#include <Magnum/GL/DebugOutput.h>
+#include <Magnum/GL/DefaultFramebuffer.h>
+#include <Magnum/GL/Framebuffer.h>
+#include <Magnum/GL/MultisampleTexture.h>
+#include <Magnum/GL/TextureFormat.h>
+#include <Magnum/ImGuiIntegration/Context.h>
+#include <Magnum/Platform/Sdl2Application.h>
diff --git a/shaders/tile-shader.cpp b/shaders/tile-shader.cpp
index 11dc7c49..50444cc8 100644
--- a/shaders/tile-shader.cpp
+++ b/shaders/tile-shader.cpp
@@ -1,9 +1,6 @@
 #include "shaders/tile-shader.hpp"
 #include "loader.hpp"
 #include "compat/assert.hpp"
-#include <algorithm>
-#include <Corrade/Containers/Reference.h>
-#include <Corrade/Utility/Resource.h>
 #include <Magnum/Math/Vector4.h>
 #include <Magnum/GL/Context.h>
 #include <Magnum/GL/Shader.h>
diff --git a/src/precomp.hpp b/src/precomp.hpp
index 2a19a1b7..ceeeca70 100644
--- a/src/precomp.hpp
+++ b/src/precomp.hpp
@@ -3,25 +3,37 @@
 #include "compat/prelude.hpp"
 #include "compat/defs.hpp"
 #include "compat/assert.hpp"
-#include "src/tile-defs.hpp"
-#include "src/tile.hpp"
-#include "src/tile-atlas.hpp"
-#include "src/tile-iterator.hpp"
-#include "src/chunk.hpp"
-#include "src/global-coords.hpp"
-#include "shaders/tile-shader.hpp"
-#include "serialize/json-helper.hpp"
+
 #include <cstddef>
-#include <type_traits>
+#include <cstdint>
 #include <cmath>
-#include <array>
-#include <optional>
+#include <cstdlib>
+#include <concepts>
+#include <type_traits>
 #include <limits>
+
 #include <tuple>
+#include <array>
+#include <optional>
+#include <vector>
+#include <memory>
 #include <utility>
 #include <filesystem>
+
+#include <Corrade/Containers/StringStlView.h>
+#include <Corrade/Containers/Array.h>
+#include <Corrade/Containers/ArrayViewStl.h>
+#include <Corrade/Utility/DebugStl.h>
+
 #include <Magnum/Magnum.h>
 #include <Magnum/Math/Vector2.h>
 #include <Magnum/Math/Vector3.h>
 #include <Magnum/Math/Vector4.h>
+#include <Magnum/Math/Color.h>
+#include <Magnum/GL/AbstractShaderProgram.h>
+#include <Magnum/GL/Buffer.h>
+#include <Magnum/GL/Mesh.h>
+#include <Magnum/GL/Renderer.h>
+#include <Magnum/GL/Texture.h>
+#include <Magnum/Trade/ImageData.h>
 #include <nlohmann/json.hpp>
diff --git a/src/tile-defs.hpp b/src/tile-defs.hpp
index df26fe8e..51b04259 100644
--- a/src/tile-defs.hpp
+++ b/src/tile-defs.hpp
@@ -1,11 +1,13 @@
 #pragma once
 #include <cstddef>
+#include <cstdint>
+#include <type_traits>
 
 namespace floormat {
 
 constexpr inline std::size_t TILE_MAX_DIM = 16;
 constexpr inline std::size_t TILE_COUNT = TILE_MAX_DIM*TILE_MAX_DIM;
-constexpr inline float TILE_SIZE[3] = { 128, 128, 384 };
-constexpr inline double dTILE_SIZE[3] = { 128, 128, 384 };
+constexpr inline float TILE_SIZE[3] = { 64, 64, 64 };
+constexpr inline double dTILE_SIZE[3] = { 64, 64, 64 };
 
 } // namespace floormat