diff options
| -rw-r--r-- | editor/draw.cpp | 2 | ||||
| -rw-r--r-- | shaders/shader.hpp | 2 | ||||
| -rw-r--r-- | src/chunk-scenery.hpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/editor/draw.cpp b/editor/draw.cpp index bae3dffb..2751360c 100644 --- a/editor/draw.cpp +++ b/editor/draw.cpp @@ -134,7 +134,7 @@ void app::draw_collision_boxes() const auto* rtree = c.rtree(); rtree->Search(min2f, max2f, [&](object_id data, const rect_type& rect) { [[maybe_unused]] auto x = std::bit_cast<collision_data>(data); -#if 0 +#if 0 // todo! if (x.tag == (uint64_t)collision_type::geometry) return true; #else diff --git a/shaders/shader.hpp b/shaders/shader.hpp index a7716229..7f58e276 100644 --- a/shaders/shader.hpp +++ b/shaders/shader.hpp @@ -66,7 +66,7 @@ private: bool _enable_lightmap : 1 = false; Int _sampler = 0, _real_sampler; - enum { + enum : Int { ScaleUniform = 0, OffsetUniform = 1, TintUniform = 2, EnableLightmapUniform = 3, SamplerUniform = 4, LightmapSamplerUniform = 5, diff --git a/src/chunk-scenery.hpp b/src/chunk-scenery.hpp index 85bddd7a..6ba830a2 100644 --- a/src/chunk-scenery.hpp +++ b/src/chunk-scenery.hpp @@ -1,7 +1,7 @@ #pragma once #include "chunk.hpp" -#include <Corrade/Containers/Array.h> -#include <Magnum/Math/Vector2.h> +#include <cr/ArrayView.h> +#include <mg/Vector2.h> namespace floormat { |