fix(CMake): add unity build

Author: BotellaA

cmake/CppTargets.cmake

@@ -99,6 +99,7 @@ function(add_geode_library)
             OUTPUT_NAME ${PROJECT_NAME}_${GEODE_LIB_NAME}
             DEFINE_SYMBOL ${project_name}_${GEODE_LIB_NAME}_EXPORTS
             FOLDER "Libraries"
+            UNITY_BUILD ON
     )
     source_group("Public Header Files" FILES "${ABSOLUTE_GEODE_LIB_PUBLIC_HEADERS}")
     source_group("Advanced Header Files" FILES "${ABSOLUTE_GEODE_LIB_ADVANCED_HEADERS}")

include/geode/basic/detail/disable_debug_logger.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2019 - 2024 Geode-solutions
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <geode/basic/logger.h>
+
+#undef DEBUG
+#undef SDEBUG
+#define DEBUG( a ) geode_unused( a );
+#define SDEBUG( a ) geode_unused( a );

include/geode/basic/detail/enable_debug_logger.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2019 - 2024 Geode-solutions
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <geode/basic/logger.h>
+
+#undef DEBUG
+#undef SDEBUG
+#define DEBUG( a ) geode::Logger::debug( #a, " = ", a )
+#define SDEBUG( a ) geode::Logger::debug( #a, " = ", a.string() )

include/geode/basic/logger.h

@@ -108,11 +108,10 @@ namespace geode
     };
 } // namespace geode
 
-#define DEBUG( a ) geode::Logger::debug( #a, " = ", a )
-#define SDEBUG( a ) geode::Logger::debug( #a, " = ", a.string() )
+#include <geode/basic/detail/enable_debug_logger.h>
 
 #ifdef OPENGEODE_DEBUG
 #    define DEBUG_LOGGER( ... ) geode::Logger::debug( __VA_ARGS__ )
 #else
 #    define DEBUG_LOGGER( ... )
-#endif
+#endif

include/geode/mesh/helpers/detail/component_identifier.h

@@ -21,6 +21,8 @@
  *
  */
 
+#pragma once
+
 #include <absl/container/fixed_array.h>
 
 #include <geode/basic/pimpl.h>

include/geode/mesh/helpers/detail/debug.h

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2019 - 2024 Geode-solutions
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#pragma once
+
+#include <absl/strings/string_view.h>
+
+#include <geode/mesh/common.h>
+
+namespace geode
+{
+    FORWARD_DECLARATION_DIMENSION_CLASS( Segment );
+    FORWARD_DECLARATION_DIMENSION_CLASS( Triangle );
+    FORWARD_DECLARATION_DIMENSION_CLASS( TetrahedralSolid );
+    ALIAS_3D( TetrahedralSolid );
+    class Tetrahedron;
+} // namespace geode
+
+namespace geode
+{
+    namespace detail
+    {
+        template < index_t dimension >
+        void save_segment(
+            const Segment< dimension >& segment, absl::string_view suffix );
+
+        template < index_t dimension >
+        void save_triangle(
+            const Triangle< dimension >& triangle, absl::string_view suffix );
+
+        void opengeode_mesh_api save_tetrahedron(
+            const Tetrahedron& tetrahedron, absl::string_view suffix );
+
+        void opengeode_mesh_api save_tetrahedra(
+            const TetrahedralSolid3D& solid,
+            absl::Span< const index_t > ids,
+            absl::string_view suffix );
+    } // namespace detail
+} // namespace geode

include/geode/model/representation/core/private/helpers.h

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2019 - 2024 Geode-solutions
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#pragma once
+
+#include <geode/geometry/bounding_box.h>
+
+#include <geode/model/common.h>
+#include <geode/model/mixin/core/relationships.h>
+
+namespace geode
+{
+    namespace detail
+    {
+        template < typename Filter, typename Iterator >
+        void next_filtered_internal_iterator( Iterator& iterator )
+        {
+            while( iterator.operator!=( iterator )
+                   && iterator.Relationships::InternalRangeIterator::operator*()
+                              .type()
+                          != Filter::component_type_static() )
+            {
+                iterator.Relationships::InternalRangeIterator::operator++();
+            }
+        }
+
+        template < typename Filter, typename Iterator >
+        void next_filtered_embedding_iterator( Iterator& iterator )
+        {
+            while(
+                iterator.operator!=( iterator )
+                && iterator.Relationships::EmbeddingRangeIterator::operator*()
+                           .type()
+                       != Filter::component_type_static() )
+            {
+                iterator.Relationships::EmbeddingRangeIterator::operator++();
+            }
+        }
+
+        template < index_t dimension, typename MeshComponentRange >
+        BoundingBox< dimension > meshes_bounding_box( MeshComponentRange range )
+        {
+            BoundingBox< dimension > box;
+            for( const auto& component : range )
+            {
+                box.add_box( component.mesh().bounding_box() );
+            }
+            return box;
+        }
+    } // namespace detail
+} // namespace geode

src/geode/basic/CMakeLists.txt

@@ -87,6 +87,8 @@ add_geode_library(
         "zip_file.h"
     ADVANCED_HEADERS
         "detail/bitsery_archive.h"
+        "detail/disable_debug_logger.h"
+        "detail/enable_debug_logger.h"
         "detail/geode_input_impl.h"
         "detail/geode_output_impl.h"
         "detail/mapping_after_deletion.h"

src/geode/mesh/CMakeLists.txt

@@ -113,11 +113,12 @@ add_geode_library(
         "helpers/tetrahedral_solid_scalar_function.cpp"
         "helpers/triangulated_surface_point_function.cpp"
         "helpers/triangulated_surface_scalar_function.cpp"
+        "helpers/detail/component_identifier.cpp"
         "helpers/detail/curve_merger.cpp"
+        "helpers/detail/debug.cpp"
         "helpers/detail/solid_merger.cpp"
         "helpers/detail/surface_merger.cpp"
         "helpers/detail/vertex_merger.cpp"
-        "helpers/detail/component_identifier.cpp"
         "helpers/private/copy.cpp"
         "helpers/private/regular_grid_shape_function.cpp"
         "io/edged_curve_input.cpp"
@@ -293,10 +294,11 @@ add_geode_library(
         "core/detail/geode_elements.h"
         "core/detail/vertex_cycle.h"
         "helpers/detail/curve_merger.h"
+        "helpers/detail/component_identifier.h"
+        "helpers/detail/debug.h"
         "helpers/detail/solid_merger.h"
         "helpers/detail/surface_merger.h"
         "helpers/detail/vertex_merger.h"
-        "helpers/detail/component_identifier.h"
     PRIVATE_HEADERS
         "core/private/edges_impl.h"
         "core/private/facet_edges_impl.h"

src/geode/mesh/core/geode/geode_regular_grid_solid.cpp

@@ -39,13 +39,14 @@
 namespace
 {
     static constexpr std::array< std::array< geode::local_index_t, 3 >, 8 >
-        cell_vertices_translations{ { { 0, 0, 0 }, { 1, 0, 0 }, { 0, 1, 0 },
-            { 1, 1, 0 }, { 0, 0, 1 }, { 1, 0, 1 }, { 0, 1, 1 }, { 1, 1, 1 } } };
+        solid_cell_vertices_translations{ { { 0, 0, 0 }, { 1, 0, 0 },
+            { 0, 1, 0 }, { 1, 1, 0 }, { 0, 0, 1 }, { 1, 0, 1 }, { 0, 1, 1 },
+            { 1, 1, 1 } } };
 
     // -X +X -Y +Y -Z +Z
     static constexpr std::array< std::array< geode::local_index_t, 4 >, 6 >
-        cell_facet_vertices{ { { 0, 2, 6, 4 }, { 1, 5, 7, 3 }, { 0, 4, 5, 1 },
-            { 2, 3, 7, 6 }, { 0, 1, 3, 2 }, { 4, 6, 7, 5 } } };
+        solid_cell_facet_vertices{ { { 0, 2, 6, 4 }, { 1, 5, 7, 3 },
+            { 0, 4, 5, 1 }, { 2, 3, 7, 6 }, { 0, 1, 3, 2 }, { 4, 6, 7, 5 } } };
 } // namespace
 
 namespace geode
@@ -81,7 +82,8 @@ namespace geode
             for( const auto d : LRange{ 3 } )
             {
                 cell_vertex[d] +=
-                    cell_vertices_translations[polyhedron_vertex.vertex_id][d];
+                    solid_cell_vertices_translations[polyhedron_vertex
+                                                         .vertex_id][d];
             }
             return vertex_index( grid, cell_vertex );
         }
@@ -91,8 +93,8 @@ namespace geode
         {
             const auto& facet = polyhedron_facet_vertex.polyhedron_facet;
             const auto vertex =
-                cell_facet_vertices[facet.facet_id]
-                                   [polyhedron_facet_vertex.vertex_id];
+                solid_cell_facet_vertices[facet.facet_id]
+                                         [polyhedron_facet_vertex.vertex_id];
             return { facet.polyhedron_id, vertex };
         }