Move matrix related types to base target

albin-johansson · Jul 10, 2024 · c9578c3 · c9578c3
1 parent 81e25ee
commit c9578c3
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 76 deletions.
diff --git a/source/base/CMakeLists.txt b/source/base/CMakeLists.txt
@@ -58,6 +58,8 @@ target_sources(tactile-base
                "${PROJECT_SOURCE_DIR}/inc/tactile/base/util/concepts.hpp"
                "${PROJECT_SOURCE_DIR}/inc/tactile/base/util/format.hpp"
                "${PROJECT_SOURCE_DIR}/inc/tactile/base/util/hash.hpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/base/util/matrix_extent.hpp"
+               "${PROJECT_SOURCE_DIR}/inc/tactile/base/util/matrix_index.hpp"
                "${PROJECT_SOURCE_DIR}/inc/tactile/base/util/strong_type.hpp"
                "${PROJECT_SOURCE_DIR}/inc/tactile/base/id.hpp"
                "${PROJECT_SOURCE_DIR}/inc/tactile/base/int.hpp"

diff --git a/...e/inc/tactile/core/util/matrix_extent.hpp → ...e/inc/tactile/base/util/matrix_extent.hpp b/...e/inc/tactile/core/util/matrix_extent.hpp → ...e/inc/tactile/base/util/matrix_extent.hpp
@@ -2,8 +2,7 @@
 
 #pragma once
 
-#include <format>   // formatter, format_to, formattable
-#include <ostream>  // ostream
+#include <format>  // formatter, format_to, formattable
 
 #include "tactile/base/int.hpp"
 #include "tactile/base/prelude.hpp"
@@ -27,18 +26,6 @@ struct MatrixExtent final
   auto operator==(const MatrixExtent&) const noexcept -> bool = default;
 };
 
-/**
- * Outputs a matrix extent to a stream.
- *
- * \param stream The output stream.
- * \param extent The matrix extent to emit.
- *
- * \return
- * The provided stream.
- */
-auto operator<<(std::ostream& stream,
-                const MatrixExtent& extent) -> std::ostream&;
-
 }  // namespace tactile
 
 template <>

diff --git a/...re/inc/tactile/core/util/matrix_index.hpp → ...se/inc/tactile/base/util/matrix_index.hpp b/...re/inc/tactile/core/util/matrix_index.hpp → ...se/inc/tactile/base/util/matrix_index.hpp
@@ -5,7 +5,6 @@
 #include <cstddef>     // size_t
 #include <format>      // formatter, format_to, formattable
 #include <functional>  // hash
-#include <ostream>     // ostream
 
 #include "tactile/base/int.hpp"
 #include "tactile/base/prelude.hpp"
@@ -30,18 +29,6 @@ struct MatrixIndex final
       -> bool = default;
 };
 
-/**
- * Outputs a matrix index to a stream.
- *
- * \param stream The output stream.
- * \param index  The matrix index to emit.
- *
- * \return
- * The provided stream.
- */
-auto operator<<(std::ostream& stream,
-                const MatrixIndex& index) -> std::ostream&;
-
 }  // namespace tactile
 
 template <>

diff --git a/source/base/test/CMakeLists.txt b/source/base/test/CMakeLists.txt
@@ -12,6 +12,8 @@ target_sources(tactile-base-test
                "${PROJECT_SOURCE_DIR}/src/numeric/vec_test.cpp"
                "${PROJECT_SOURCE_DIR}/src/util/buffer_test.cpp"
                "${PROJECT_SOURCE_DIR}/src/util/format_test.cpp"
+               "${PROJECT_SOURCE_DIR}/src/util/matrix_extent_test.cpp"
+               "${PROJECT_SOURCE_DIR}/src/util/matrix_index_test.cpp"
                "${PROJECT_SOURCE_DIR}/src/main.cpp"
                )
 

diff --git a/...core/test/src/util/matrix_extent_test.cpp → ...base/test/src/util/matrix_extent_test.cpp b/...core/test/src/util/matrix_extent_test.cpp → ...base/test/src/util/matrix_extent_test.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/core/util/matrix_extent.hpp"
+#include "tactile/base/util/matrix_extent.hpp"
 
 #include <format>  // format
 

diff --git a/.../core/test/src/util/matrix_index_test.cpp → .../base/test/src/util/matrix_index_test.cpp b/.../core/test/src/util/matrix_index_test.cpp → .../base/test/src/util/matrix_index_test.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2024 Albin Johansson (GNU General Public License v3.0)
 
-#include "tactile/core/util/matrix_index.hpp"
+#include "tactile/base/util/matrix_index.hpp"
 
 #include <format>  // format
 

diff --git a/source/core/CMakeLists.txt b/source/core/CMakeLists.txt
@@ -223,10 +223,6 @@ target_sources(tactile-core
                "${PROJECT_SOURCE_DIR}/inc/tactile/core/ui/widget_manager.hpp"
                "${PROJECT_SOURCE_DIR}/src/tactile/core/ui/widget_manager.cpp"
                "${PROJECT_SOURCE_DIR}/inc/tactile/core/util/lookup.hpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/core/util/matrix_extent.hpp"
-               "${PROJECT_SOURCE_DIR}/src/tactile/core/util/matrix_extent.cpp"
-               "${PROJECT_SOURCE_DIR}/inc/tactile/core/util/matrix_index.hpp"
-               "${PROJECT_SOURCE_DIR}/src/tactile/core/util/matrix_index.cpp"
                "${PROJECT_SOURCE_DIR}/inc/tactile/core/util/scope_guard.hpp"
                "${PROJECT_SOURCE_DIR}/inc/tactile/core/util/string_conv.hpp"
                "${PROJECT_SOURCE_DIR}/src/tactile/core/util/string_conv.cpp"

diff --git a/source/core/inc/tactile/core/layer/dense_tile_matrix.hpp b/source/core/inc/tactile/core/layer/dense_tile_matrix.hpp
@@ -5,9 +5,9 @@
 #include "tactile/base/container/vector.hpp"
 #include "tactile/base/id.hpp"
 #include "tactile/base/prelude.hpp"
+#include "tactile/base/util/matrix_extent.hpp"
+#include "tactile/base/util/matrix_index.hpp"
 #include "tactile/core/layer/tile_matrix.hpp"
-#include "tactile/core/util/matrix_extent.hpp"
-#include "tactile/core/util/matrix_index.hpp"
 
 namespace tactile {
 

diff --git a/source/core/inc/tactile/core/layer/sparse_tile_matrix.hpp b/source/core/inc/tactile/core/layer/sparse_tile_matrix.hpp
@@ -5,9 +5,9 @@
 #include "tactile/base/container/hash_map.hpp"
 #include "tactile/base/id.hpp"
 #include "tactile/base/prelude.hpp"
+#include "tactile/base/util/matrix_extent.hpp"
+#include "tactile/base/util/matrix_index.hpp"
 #include "tactile/core/layer/tile_matrix.hpp"
-#include "tactile/core/util/matrix_extent.hpp"
-#include "tactile/core/util/matrix_index.hpp"
 
 namespace tactile {
 

diff --git a/source/core/inc/tactile/core/layer/tile_layer.hpp b/source/core/inc/tactile/core/layer/tile_layer.hpp
@@ -4,11 +4,11 @@
 
 #include "tactile/base/container/variant.hpp"
 #include "tactile/base/prelude.hpp"
+#include "tactile/base/util/matrix_extent.hpp"
+#include "tactile/base/util/matrix_index.hpp"
 #include "tactile/core/entity/entity.hpp"
 #include "tactile/core/layer/dense_tile_matrix.hpp"
 #include "tactile/core/layer/sparse_tile_matrix.hpp"
-#include "tactile/core/util/matrix_extent.hpp"
-#include "tactile/core/util/matrix_index.hpp"
 
 namespace tactile {
 

diff --git a/source/core/inc/tactile/core/map/map.hpp b/source/core/inc/tactile/core/map/map.hpp
@@ -12,8 +12,8 @@
 #include "tactile/base/layer/tile_orientation.hpp"
 #include "tactile/base/numeric/vec.hpp"
 #include "tactile/base/prelude.hpp"
+#include "tactile/base/util/matrix_extent.hpp"
 #include "tactile/core/entity/entity.hpp"
-#include "tactile/core/util/matrix_extent.hpp"
 
 namespace tactile {
 

diff --git a/source/core/inc/tactile/core/map/map_spec.hpp b/source/core/inc/tactile/core/map/map_spec.hpp
@@ -5,7 +5,7 @@
 #include "tactile/base/layer/tile_orientation.hpp"
 #include "tactile/base/numeric/vec.hpp"
 #include "tactile/base/prelude.hpp"
-#include "tactile/core/util/matrix_extent.hpp"
+#include "tactile/base/util/matrix_extent.hpp"
 
 namespace tactile {
 

diff --git a/source/core/inc/tactile/core/tile/tileset.hpp b/source/core/inc/tactile/core/tile/tileset.hpp
@@ -9,8 +9,8 @@
 #include "tactile/base/id.hpp"
 #include "tactile/base/numeric/vec.hpp"
 #include "tactile/base/prelude.hpp"
+#include "tactile/base/util/matrix_extent.hpp"
 #include "tactile/core/entity/entity.hpp"
-#include "tactile/core/util/matrix_extent.hpp"
 #include "tactile/core/util/uuid.hpp"
 
 namespace tactile {

diff --git a/source/core/inc/tactile/core/ui/canvas_renderer.hpp b/source/core/inc/tactile/core/ui/canvas_renderer.hpp
@@ -5,9 +5,9 @@
 #include "tactile/base/int.hpp"
 #include "tactile/base/numeric/vec.hpp"
 #include "tactile/base/prelude.hpp"
+#include "tactile/base/util/matrix_extent.hpp"
+#include "tactile/base/util/matrix_index.hpp"
 #include "tactile/core/entity/entity.hpp"
-#include "tactile/core/util/matrix_extent.hpp"
-#include "tactile/core/util/matrix_index.hpp"
 
 struct ImDrawList;
 

diff --git a/source/core/inc/tactile/core/ui/render/hexagon_info.hpp b/source/core/inc/tactile/core/ui/render/hexagon_info.hpp
@@ -5,7 +5,7 @@
 #include "tactile/base/container/span.hpp"
 #include "tactile/base/numeric/vec.hpp"
 #include "tactile/base/prelude.hpp"
-#include "tactile/core/util/matrix_index.hpp"
+#include "tactile/base/util/matrix_index.hpp"
 
 namespace tactile::ui {
 

diff --git a/source/core/src/tactile/core/util/matrix_extent.cpp b/source/core/src/tactile/core/util/matrix_extent.cpp
diff --git a/source/core/src/tactile/core/util/matrix_index.cpp b/source/core/src/tactile/core/util/matrix_index.cpp
diff --git a/source/core/test/CMakeLists.txt b/source/core/test/CMakeLists.txt
@@ -35,8 +35,6 @@ target_sources(tactile-core-test
                "${PROJECT_SOURCE_DIR}/src/ui/imgui_compat_test.cpp"
                "${PROJECT_SOURCE_DIR}/src/ui/viewport_test.cpp"
                "${PROJECT_SOURCE_DIR}/src/util/lookup_test.cpp"
-               "${PROJECT_SOURCE_DIR}/src/util/matrix_extent_test.cpp"
-               "${PROJECT_SOURCE_DIR}/src/util/matrix_index_test.cpp"
                "${PROJECT_SOURCE_DIR}/src/util/scope_guard_test.cpp"
                "${PROJECT_SOURCE_DIR}/src/util/string_conv_test.cpp"
                "${PROJECT_SOURCE_DIR}/src/util/string_ops_test.cpp"

diff --git a/source/core/test/src/layer/tile_matrix_test.cpp b/source/core/test/src/layer/tile_matrix_test.cpp
@@ -17,7 +17,7 @@ void _validate_tiles(const ITileMatrix& tile_matrix,
   for (MatrixExtent::value_type row = 0; row < expected_extent.rows; ++row) {
     for (MatrixExtent::value_type col = 0; col < expected_extent.cols; ++col) {
       const MatrixIndex index {row, col};
-      EXPECT_TRUE(tile_matrix.is_valid(index)) << "index is " << index;
+      EXPECT_TRUE(tile_matrix.is_valid(index));
     }
   }
 }
@@ -130,7 +130,7 @@ TYPED_TEST(TileMatrixTest, SubscriptOperator)
   const auto assign_and_check = [&](const MatrixIndex& index,
                                     const TileID tile_id) {
     tile_matrix[index] = tile_id;
-    EXPECT_EQ(tile_matrix[index], tile_id) << "index is " << index;
+    EXPECT_EQ(tile_matrix[index], tile_id);
   };
 
   assign_and_check({0, 0}, TileID {0});