Fix stuff according to PR #293

TheOpenSpaceProgram · Jun 20, 2024 · b4141b7 · b4141b7
1 parent 4ef82be
commit b4141b7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/src/osp/core/array_view.h b/src/osp/core/array_view.h
@@ -27,6 +27,7 @@
 // IWYU pragma: begin_exports
 #include <Corrade/Containers/ArrayView.h>
 #include <Corrade/Containers/StridedArrayView.h>
+#include <Corrade/Containers/StridedArrayViewStl.h>
 // IWYU pragma: end_exports
 
 #include <iterator>

diff --git a/src/osp/core/buffer_format.h b/src/osp/core/buffer_format.h
@@ -90,7 +90,7 @@ class BufferFormatBuilder
     }
 
     /**
-     * @brief Insert interleved attribute data
+     * @brief Insert interleaved attribute data
      *
      * To make the buffer format [XYZXYZXYZXYZ...] for example, use:
      *
@@ -104,13 +104,13 @@ class BufferFormatBuilder
      * @param count [in] Number of elements
      */
     template <typename ... T>
-    constexpr void insert_interleave(std::size_t count, BufAttribFormat<T>& ... rInterleve)
+    constexpr void insert_interleave(std::size_t count, BufAttribFormat<T>& ... rInterleave)
     {
         constexpr std::size_t stride = (sizeof(T) + ...);
 
-        (rInterleve.m_stride = ... = stride);
+        (rInterleave.m_stride = ... = stride);
 
-        interleave_aux(m_totalSize, rInterleve ...);
+        interleave_aux(m_totalSize, rInterleave ...);
 
         m_totalSize += stride * count;
     }
@@ -123,13 +123,13 @@ class BufferFormatBuilder
 private:
 
     template <typename FIRST_T, typename ... T>
-    constexpr void interleave_aux(std::size_t const pos, BufAttribFormat<FIRST_T>& rInterleveFirst, BufAttribFormat<T>& ... rInterleve)
+    constexpr void interleave_aux(std::size_t const pos, BufAttribFormat<FIRST_T>& rInterleaveFirst, BufAttribFormat<T>& ... rInterleave)
     {
-        rInterleveFirst.m_offset = pos;
+        rInterleaveFirst.m_offset = pos;
 
         if constexpr (sizeof...(T) != 0)
         {
-            interleave_aux(pos + sizeof(FIRST_T), rInterleve ...);
+            interleave_aux(pos + sizeof(FIRST_T), rInterleave ...);
         }
     }
 

diff --git a/src/osp/drawing_gl/rendergl.h b/src/osp/drawing_gl/rendergl.h
@@ -26,6 +26,7 @@
 
 #include "FullscreenTriShader.h"
 
+#include "../core/strong_id.h"
 #include "../drawing/drawing_fn.h"
 
 #include <Magnum/GL/Mesh.h>
@@ -41,8 +42,8 @@
 namespace osp::draw
 {
 
-enum class TexGlId : uint32_t { };
-enum class MeshGlId : uint32_t { };
+using TexGlId  = osp::StrongId<std::uint32_t, struct DummyForTexGLId>;
+using MeshGlId = osp::StrongId<std::uint32_t, struct DummyForMeshGlId>;
 
 using TexGlStorage_t    = Storage_t<TexGlId, Magnum::GL::Texture2D>;
 using MeshGlStorage_t   = Storage_t<MeshGlId, Magnum::GL::Mesh>;