From df48bd0a4dc5cefc3b2eebe9a4533c81f248fe6f Mon Sep 17 00:00:00 2001 From: MelchiorSchuh Date: Fri, 5 Jul 2024 17:46:26 +0200 Subject: [PATCH 1/4] fix(explicit constructor): Added explicit constructors and updated with those in OpenGeode. --- include/geode/inspector/brep_inspector.h | 2 +- .../adjacency/brep_meshes_adjacency.h | 2 +- .../adjacency/section_meshes_adjacency.h | 6 +- .../criterion/adjacency/solid_adjacency.h | 2 +- .../criterion/adjacency/surface_adjacency.h | 2 +- .../criterion/brep_meshes_inspector.h | 2 +- .../colocation/component_meshes_colocation.h | 2 +- .../colocation/edgedcurve_colocation.h | 2 +- .../colocation/pointset_colocation.h | 2 +- .../criterion/colocation/solid_colocation.h | 2 +- .../criterion/colocation/surface_colocation.h | 2 +- .../colocation/unique_vertices_colocation.h | 2 +- .../degeneration/brep_meshes_degeneration.h | 6 +- .../degeneration/edgedcurve_degeneration.h | 2 +- .../section_meshes_degeneration.h | 6 +- .../degeneration/solid_degeneration.h | 2 +- .../degeneration/surface_degeneration.h | 3 +- .../intersections/model_intersections.h | 6 +- .../surface_curve_intersections.h | 2 +- .../intersections/surface_intersections.h | 2 +- .../criterion/manifold/brep_meshes_manifold.h | 2 +- .../manifold/section_meshes_manifold.h | 6 +- .../criterion/manifold/solid_edge_manifold.h | 2 +- .../criterion/manifold/solid_facet_manifold.h | 2 +- .../manifold/solid_vertex_manifold.h | 2 +- .../manifold/surface_edge_manifold.h | 3 +- .../manifold/surface_vertex_manifold.h | 3 +- .../criterion/private/colocation_impl.h | 2 +- .../private/component_meshes_adjacency.h | 2 +- .../private/component_meshes_degeneration.h | 2 +- .../private/component_meshes_manifold.h | 2 +- .../criterion/private/degeneration_impl.h | 2 +- .../criterion/section_meshes_inspector.h | 2 +- .../geode/inspector/edgedcurve_inspector.h | 2 +- .../geode/inspector/mixin/add_inspectors.h | 2 +- include/geode/inspector/pointset_inspector.h | 2 +- include/geode/inspector/section_inspector.h | 2 +- include/geode/inspector/solid_inspector.h | 2 +- include/geode/inspector/surface_inspector.h | 2 +- .../inspector/topology/brep_blocks_topology.h | 2 +- .../topology/brep_corners_topology.h | 2 +- .../inspector/topology/brep_lines_topology.h | 2 +- .../topology/brep_surfaces_topology.h | 6 +- .../geode/inspector/topology/brep_topology.h | 2 +- .../topology/section_corners_topology.h | 6 +- .../topology/section_lines_topology.h | 6 +- .../topology/section_surfaces_topology.h | 6 +- .../inspector/topology/section_topology.h | 2 +- .../criterion/adjacency/surface_adjacency.cpp | 3 +- .../manifold/brep_meshes_manifold.cpp | 2 +- .../inspector/test-edgedcurve-colocation.cpp | 47 ++++---- .../test-edgedcurve-degeneration.cpp | 25 +++-- tests/inspector/test-pointset.cpp | 47 ++++---- tests/inspector/test-solid-adjacency.cpp | 42 +++---- tests/inspector/test-solid-colocation.cpp | 27 ++--- tests/inspector/test-solid-degeneration.cpp | 29 ++--- tests/inspector/test-solid-manifold.cpp | 68 ++++++------ tests/inspector/test-surface-adjacency.cpp | 104 +++++++++--------- tests/inspector/test-surface-colocation.cpp | 47 ++++---- .../test-surface-curve-intersections.cpp | 70 ++++++------ tests/inspector/test-surface-degeneration.cpp | 45 ++++---- .../inspector/test-surface-intersections.cpp | 44 ++++---- tests/inspector/test-surface-manifold.cpp | 56 +++++----- 63 files changed, 404 insertions(+), 387 deletions(-) diff --git a/include/geode/inspector/brep_inspector.h b/include/geode/inspector/brep_inspector.h index 34927600..556fb1ed 100644 --- a/include/geode/inspector/brep_inspector.h +++ b/include/geode/inspector/brep_inspector.h @@ -56,7 +56,7 @@ namespace geode OPENGEODE_DISABLE_COPY( BRepInspector ); public: - BRepInspector( const BRep& brep ); + explicit BRepInspector( const BRep& brep ); BRepInspectionResult inspect_brep() const; }; diff --git a/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.h b/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.h index 3bd0ec3d..91497fcc 100644 --- a/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.h +++ b/include/geode/inspector/criterion/adjacency/brep_meshes_adjacency.h @@ -66,7 +66,7 @@ namespace geode OPENGEODE_DISABLE_COPY( BRepComponentMeshesAdjacency ); public: - BRepComponentMeshesAdjacency( const BRep& model ); + explicit BRepComponentMeshesAdjacency( const BRep& model ); ~BRepComponentMeshesAdjacency(); diff --git a/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.h b/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.h index 75f48806..cfd6e0fd 100644 --- a/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.h +++ b/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.h @@ -40,8 +40,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - SectionMeshesAdjacencyInspectionResult + struct + opengeode_inspector_inspector_api SectionMeshesAdjacencyInspectionResult { InspectionIssuesMap< PolygonEdge > surfaces_edges_with_wrong_adjacencies{ @@ -61,7 +61,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SectionComponentMeshesAdjacency ); public: - SectionComponentMeshesAdjacency( const Section& model ); + explicit SectionComponentMeshesAdjacency( const Section& model ); ~SectionComponentMeshesAdjacency(); diff --git a/include/geode/inspector/criterion/adjacency/solid_adjacency.h b/include/geode/inspector/criterion/adjacency/solid_adjacency.h index 590bfe52..45ec3cc0 100644 --- a/include/geode/inspector/criterion/adjacency/solid_adjacency.h +++ b/include/geode/inspector/criterion/adjacency/solid_adjacency.h @@ -45,7 +45,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SolidMeshAdjacency ); public: - SolidMeshAdjacency( const SolidMesh< dimension >& mesh ); + explicit SolidMeshAdjacency( const SolidMesh< dimension >& mesh ); ~SolidMeshAdjacency(); diff --git a/include/geode/inspector/criterion/adjacency/surface_adjacency.h b/include/geode/inspector/criterion/adjacency/surface_adjacency.h index ee35d953..9c7a88a0 100644 --- a/include/geode/inspector/criterion/adjacency/surface_adjacency.h +++ b/include/geode/inspector/criterion/adjacency/surface_adjacency.h @@ -45,7 +45,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SurfaceMeshAdjacency ); public: - SurfaceMeshAdjacency( const SurfaceMesh< dimension >& mesh ); + explicit SurfaceMeshAdjacency( const SurfaceMesh< dimension >& mesh ); ~SurfaceMeshAdjacency(); diff --git a/include/geode/inspector/criterion/brep_meshes_inspector.h b/include/geode/inspector/criterion/brep_meshes_inspector.h index edaf0d1a..f504aa9c 100644 --- a/include/geode/inspector/criterion/brep_meshes_inspector.h +++ b/include/geode/inspector/criterion/brep_meshes_inspector.h @@ -62,7 +62,7 @@ namespace geode OPENGEODE_DISABLE_COPY( BRepMeshesInspector ); public: - BRepMeshesInspector( const BRep& brep ); + explicit BRepMeshesInspector( const BRep& brep ); BRepMeshesInspectionResult inspect_brep_meshes() const; }; diff --git a/include/geode/inspector/criterion/colocation/component_meshes_colocation.h b/include/geode/inspector/criterion/colocation/component_meshes_colocation.h index 3ad0de29..762de456 100644 --- a/include/geode/inspector/criterion/colocation/component_meshes_colocation.h +++ b/include/geode/inspector/criterion/colocation/component_meshes_colocation.h @@ -59,7 +59,7 @@ namespace geode OPENGEODE_DISABLE_COPY( ComponentMeshesColocation ); public: - ComponentMeshesColocation( const Model& model ); + explicit ComponentMeshesColocation( const Model& model ); ~ComponentMeshesColocation(); diff --git a/include/geode/inspector/criterion/colocation/edgedcurve_colocation.h b/include/geode/inspector/criterion/colocation/edgedcurve_colocation.h index 83322fcd..38d13ec6 100644 --- a/include/geode/inspector/criterion/colocation/edgedcurve_colocation.h +++ b/include/geode/inspector/criterion/colocation/edgedcurve_colocation.h @@ -44,7 +44,7 @@ namespace geode OPENGEODE_DISABLE_COPY( EdgedCurveColocation ); public: - EdgedCurveColocation( const EdgedCurve< dimension >& mesh ); + explicit EdgedCurveColocation( const EdgedCurve< dimension >& mesh ); ~EdgedCurveColocation(); diff --git a/include/geode/inspector/criterion/colocation/pointset_colocation.h b/include/geode/inspector/criterion/colocation/pointset_colocation.h index 05ea629a..d3620dcb 100644 --- a/include/geode/inspector/criterion/colocation/pointset_colocation.h +++ b/include/geode/inspector/criterion/colocation/pointset_colocation.h @@ -44,7 +44,7 @@ namespace geode OPENGEODE_DISABLE_COPY( PointSetColocation ); public: - PointSetColocation( const PointSet< dimension >& mesh ); + explicit PointSetColocation( const PointSet< dimension >& mesh ); ~PointSetColocation(); diff --git a/include/geode/inspector/criterion/colocation/solid_colocation.h b/include/geode/inspector/criterion/colocation/solid_colocation.h index b09f8f38..12190568 100644 --- a/include/geode/inspector/criterion/colocation/solid_colocation.h +++ b/include/geode/inspector/criterion/colocation/solid_colocation.h @@ -45,7 +45,7 @@ namespace geode OPENGEODE_TEMPLATE_ASSERT_3D( dimension ); public: - SolidMeshColocation( const SolidMesh< dimension >& mesh ); + explicit SolidMeshColocation( const SolidMesh< dimension >& mesh ); ~SolidMeshColocation(); diff --git a/include/geode/inspector/criterion/colocation/surface_colocation.h b/include/geode/inspector/criterion/colocation/surface_colocation.h index e5c6cf7c..b6d279a4 100644 --- a/include/geode/inspector/criterion/colocation/surface_colocation.h +++ b/include/geode/inspector/criterion/colocation/surface_colocation.h @@ -44,7 +44,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SurfaceMeshColocation ); public: - SurfaceMeshColocation( const SurfaceMesh< dimension >& mesh ); + explicit SurfaceMeshColocation( const SurfaceMesh< dimension >& mesh ); ~SurfaceMeshColocation(); diff --git a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.h b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.h index e649f2f5..1fd69e27 100644 --- a/include/geode/inspector/criterion/colocation/unique_vertices_colocation.h +++ b/include/geode/inspector/criterion/colocation/unique_vertices_colocation.h @@ -62,7 +62,7 @@ namespace geode OPENGEODE_DISABLE_COPY( UniqueVerticesColocation ); public: - UniqueVerticesColocation( const Model& model ); + explicit UniqueVerticesColocation( const Model& model ); ~UniqueVerticesColocation(); diff --git a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.h b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.h index e7f1f5e9..08d2e3a3 100644 --- a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.h +++ b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.h @@ -38,8 +38,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - BRepMeshesDegenerationInspectionResult + struct + opengeode_inspector_inspector_api BRepMeshesDegenerationInspectionResult { InspectionIssuesMap< index_t > degenerated_edges{ "BRep component meshes with degenerated edges" @@ -65,7 +65,7 @@ namespace geode OPENGEODE_DISABLE_COPY( BRepComponentMeshesDegeneration ); public: - BRepComponentMeshesDegeneration( const BRep& brep ); + explicit BRepComponentMeshesDegeneration( const BRep& brep ); ~BRepComponentMeshesDegeneration(); diff --git a/include/geode/inspector/criterion/degeneration/edgedcurve_degeneration.h b/include/geode/inspector/criterion/degeneration/edgedcurve_degeneration.h index 2f321c0a..da514fb9 100644 --- a/include/geode/inspector/criterion/degeneration/edgedcurve_degeneration.h +++ b/include/geode/inspector/criterion/degeneration/edgedcurve_degeneration.h @@ -44,7 +44,7 @@ namespace geode OPENGEODE_DISABLE_COPY( EdgedCurveDegeneration ); public: - EdgedCurveDegeneration( const EdgedCurve< dimension >& mesh ); + explicit EdgedCurveDegeneration( const EdgedCurve< dimension >& mesh ); ~EdgedCurveDegeneration(); diff --git a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.h b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.h index dfe35bfa..15fecabb 100644 --- a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.h +++ b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.h @@ -38,8 +38,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - SectionMeshesDegenerationInspectionResult + struct + opengeode_inspector_inspector_api SectionMeshesDegenerationInspectionResult { InspectionIssuesMap< index_t > degenerated_edges{ "Section component meshes with degenerated edges" @@ -62,7 +62,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SectionComponentMeshesDegeneration ); public: - SectionComponentMeshesDegeneration( const Section& section ); + explicit SectionComponentMeshesDegeneration( const Section& section ); ~SectionComponentMeshesDegeneration(); diff --git a/include/geode/inspector/criterion/degeneration/solid_degeneration.h b/include/geode/inspector/criterion/degeneration/solid_degeneration.h index e80f9a58..a7ded1a2 100644 --- a/include/geode/inspector/criterion/degeneration/solid_degeneration.h +++ b/include/geode/inspector/criterion/degeneration/solid_degeneration.h @@ -45,7 +45,7 @@ namespace geode OPENGEODE_TEMPLATE_ASSERT_3D( dimension ); public: - SolidMeshDegeneration( const SolidMesh< dimension >& mesh ); + explicit SolidMeshDegeneration( const SolidMesh< dimension >& mesh ); ~SolidMeshDegeneration(); diff --git a/include/geode/inspector/criterion/degeneration/surface_degeneration.h b/include/geode/inspector/criterion/degeneration/surface_degeneration.h index 810854c8..208aa7b8 100644 --- a/include/geode/inspector/criterion/degeneration/surface_degeneration.h +++ b/include/geode/inspector/criterion/degeneration/surface_degeneration.h @@ -44,7 +44,8 @@ namespace geode OPENGEODE_DISABLE_COPY( SurfaceMeshDegeneration ); public: - SurfaceMeshDegeneration( const SurfaceMesh< dimension >& mesh ); + explicit SurfaceMeshDegeneration( + const SurfaceMesh< dimension >& mesh ); ~SurfaceMeshDegeneration(); diff --git a/include/geode/inspector/criterion/intersections/model_intersections.h b/include/geode/inspector/criterion/intersections/model_intersections.h index 4d9d33ef..cb0c144e 100644 --- a/include/geode/inspector/criterion/intersections/model_intersections.h +++ b/include/geode/inspector/criterion/intersections/model_intersections.h @@ -38,8 +38,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - ElementsIntersectionsInspectionResult + struct + opengeode_inspector_inspector_api ElementsIntersectionsInspectionResult { InspectionIssues< std::pair< ComponentMeshElement, ComponentMeshElement > > @@ -59,7 +59,7 @@ namespace geode OPENGEODE_DISABLE_COPY( ModelMeshesIntersections ); public: - ModelMeshesIntersections( const Model& model ); + explicit ModelMeshesIntersections( const Model& model ); ~ModelMeshesIntersections(); diff --git a/include/geode/inspector/criterion/intersections/surface_curve_intersections.h b/include/geode/inspector/criterion/intersections/surface_curve_intersections.h index bd79700c..3debc1e9 100644 --- a/include/geode/inspector/criterion/intersections/surface_curve_intersections.h +++ b/include/geode/inspector/criterion/intersections/surface_curve_intersections.h @@ -47,7 +47,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SurfaceCurveIntersections ); public: - SurfaceCurveIntersections( + explicit SurfaceCurveIntersections( const TriangulatedSurface< dimension >& surface, const EdgedCurve< dimension >& curve ); diff --git a/include/geode/inspector/criterion/intersections/surface_intersections.h b/include/geode/inspector/criterion/intersections/surface_intersections.h index f6bd1807..b24a2f84 100644 --- a/include/geode/inspector/criterion/intersections/surface_intersections.h +++ b/include/geode/inspector/criterion/intersections/surface_intersections.h @@ -46,7 +46,7 @@ namespace geode OPENGEODE_DISABLE_COPY( TriangulatedSurfaceIntersections ); public: - TriangulatedSurfaceIntersections( + explicit TriangulatedSurfaceIntersections( const TriangulatedSurface< dimension >& mesh ); ~TriangulatedSurfaceIntersections(); diff --git a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.h b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.h index a76f34fc..9138a057 100644 --- a/include/geode/inspector/criterion/manifold/brep_meshes_manifold.h +++ b/include/geode/inspector/criterion/manifold/brep_meshes_manifold.h @@ -78,7 +78,7 @@ namespace geode OPENGEODE_DISABLE_COPY( BRepComponentMeshesManifold ); public: - BRepComponentMeshesManifold( const BRep& brep ); + explicit BRepComponentMeshesManifold( const BRep& brep ); ~BRepComponentMeshesManifold(); diff --git a/include/geode/inspector/criterion/manifold/section_meshes_manifold.h b/include/geode/inspector/criterion/manifold/section_meshes_manifold.h index 0efccea0..8d472ac2 100644 --- a/include/geode/inspector/criterion/manifold/section_meshes_manifold.h +++ b/include/geode/inspector/criterion/manifold/section_meshes_manifold.h @@ -35,8 +35,8 @@ namespace geode { - struct opengeode_inspector_inspector_api - SectionMeshesManifoldInspectionResult + struct + opengeode_inspector_inspector_api SectionMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ "Section component meshes with non manifold vertices" @@ -59,7 +59,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SectionComponentMeshesManifold ); public: - SectionComponentMeshesManifold( const Section& section ); + explicit SectionComponentMeshesManifold( const Section& section ); ~SectionComponentMeshesManifold(); diff --git a/include/geode/inspector/criterion/manifold/solid_edge_manifold.h b/include/geode/inspector/criterion/manifold/solid_edge_manifold.h index bcd2fecd..2187a087 100644 --- a/include/geode/inspector/criterion/manifold/solid_edge_manifold.h +++ b/include/geode/inspector/criterion/manifold/solid_edge_manifold.h @@ -51,7 +51,7 @@ namespace geode OPENGEODE_TEMPLATE_ASSERT_3D( dimension ); public: - SolidMeshEdgeManifold( const SolidMesh< dimension >& mesh ); + explicit SolidMeshEdgeManifold( const SolidMesh< dimension >& mesh ); ~SolidMeshEdgeManifold(); diff --git a/include/geode/inspector/criterion/manifold/solid_facet_manifold.h b/include/geode/inspector/criterion/manifold/solid_facet_manifold.h index 70255c6b..7296299e 100644 --- a/include/geode/inspector/criterion/manifold/solid_facet_manifold.h +++ b/include/geode/inspector/criterion/manifold/solid_facet_manifold.h @@ -44,7 +44,7 @@ namespace geode OPENGEODE_TEMPLATE_ASSERT_3D( dimension ); public: - SolidMeshFacetManifold( const SolidMesh< dimension >& mesh ); + explicit SolidMeshFacetManifold( const SolidMesh< dimension >& mesh ); ~SolidMeshFacetManifold(); diff --git a/include/geode/inspector/criterion/manifold/solid_vertex_manifold.h b/include/geode/inspector/criterion/manifold/solid_vertex_manifold.h index 53b873d5..8ed3e591 100644 --- a/include/geode/inspector/criterion/manifold/solid_vertex_manifold.h +++ b/include/geode/inspector/criterion/manifold/solid_vertex_manifold.h @@ -45,7 +45,7 @@ namespace geode OPENGEODE_TEMPLATE_ASSERT_3D( dimension ); public: - SolidMeshVertexManifold( const SolidMesh< dimension >& mesh ); + explicit SolidMeshVertexManifold( const SolidMesh< dimension >& mesh ); ~SolidMeshVertexManifold(); diff --git a/include/geode/inspector/criterion/manifold/surface_edge_manifold.h b/include/geode/inspector/criterion/manifold/surface_edge_manifold.h index 7e79e167..88ae1c85 100644 --- a/include/geode/inspector/criterion/manifold/surface_edge_manifold.h +++ b/include/geode/inspector/criterion/manifold/surface_edge_manifold.h @@ -50,7 +50,8 @@ namespace geode OPENGEODE_DISABLE_COPY( SurfaceMeshEdgeManifold ); public: - SurfaceMeshEdgeManifold( const SurfaceMesh< dimension >& mesh ); + explicit SurfaceMeshEdgeManifold( + const SurfaceMesh< dimension >& mesh ); ~SurfaceMeshEdgeManifold(); diff --git a/include/geode/inspector/criterion/manifold/surface_vertex_manifold.h b/include/geode/inspector/criterion/manifold/surface_vertex_manifold.h index 56e4f9cb..e68f2337 100644 --- a/include/geode/inspector/criterion/manifold/surface_vertex_manifold.h +++ b/include/geode/inspector/criterion/manifold/surface_vertex_manifold.h @@ -44,7 +44,8 @@ namespace geode OPENGEODE_DISABLE_COPY( SurfaceMeshVertexManifold ); public: - SurfaceMeshVertexManifold( const SurfaceMesh< dimension >& mesh ); + explicit SurfaceMeshVertexManifold( + const SurfaceMesh< dimension >& mesh ); ~SurfaceMeshVertexManifold(); diff --git a/include/geode/inspector/criterion/private/colocation_impl.h b/include/geode/inspector/criterion/private/colocation_impl.h index e8743b08..9fa7a29b 100644 --- a/include/geode/inspector/criterion/private/colocation_impl.h +++ b/include/geode/inspector/criterion/private/colocation_impl.h @@ -39,7 +39,7 @@ namespace geode class ColocationImpl { protected: - ColocationImpl( const Mesh& mesh ); + explicit ColocationImpl( const Mesh& mesh ); public: bool mesh_has_colocated_points() const; diff --git a/include/geode/inspector/criterion/private/component_meshes_adjacency.h b/include/geode/inspector/criterion/private/component_meshes_adjacency.h index e7f3af91..10d11f67 100644 --- a/include/geode/inspector/criterion/private/component_meshes_adjacency.h +++ b/include/geode/inspector/criterion/private/component_meshes_adjacency.h @@ -50,7 +50,7 @@ namespace geode InspectionIssuesMap< PolygonEdge >& issues_map ) const; protected: - ComponentMeshesAdjacency( const Model& model ); + explicit ComponentMeshesAdjacency( const Model& model ); const Model& model() const; diff --git a/include/geode/inspector/criterion/private/component_meshes_degeneration.h b/include/geode/inspector/criterion/private/component_meshes_degeneration.h index a470fe8b..180b719e 100644 --- a/include/geode/inspector/criterion/private/component_meshes_degeneration.h +++ b/include/geode/inspector/criterion/private/component_meshes_degeneration.h @@ -53,7 +53,7 @@ namespace geode InspectionIssuesMap< index_t >& issues_map ) const; protected: - ComponentMeshesDegeneration( const Model& model ); + explicit ComponentMeshesDegeneration( const Model& model ); const Model& model() const; diff --git a/include/geode/inspector/criterion/private/component_meshes_manifold.h b/include/geode/inspector/criterion/private/component_meshes_manifold.h index eebbff81..387b2719 100644 --- a/include/geode/inspector/criterion/private/component_meshes_manifold.h +++ b/include/geode/inspector/criterion/private/component_meshes_manifold.h @@ -49,7 +49,7 @@ namespace geode InspectionIssuesMap< std::array< index_t, 2 > >& issues_map ) const; protected: - ComponentMeshesManifold( const Model& model ); + explicit ComponentMeshesManifold( const Model& model ); const Model& model() const; diff --git a/include/geode/inspector/criterion/private/degeneration_impl.h b/include/geode/inspector/criterion/private/degeneration_impl.h index 35dd152d..532ac18e 100644 --- a/include/geode/inspector/criterion/private/degeneration_impl.h +++ b/include/geode/inspector/criterion/private/degeneration_impl.h @@ -47,7 +47,7 @@ namespace geode bool edge_is_degenerated( index_t edge_index ) const; protected: - DegenerationImpl( const Mesh& mesh ); + explicit DegenerationImpl( const Mesh& mesh ); const Mesh& mesh() const; diff --git a/include/geode/inspector/criterion/section_meshes_inspector.h b/include/geode/inspector/criterion/section_meshes_inspector.h index a81a7eea..66d56b47 100644 --- a/include/geode/inspector/criterion/section_meshes_inspector.h +++ b/include/geode/inspector/criterion/section_meshes_inspector.h @@ -62,7 +62,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SectionMeshesInspector ); public: - SectionMeshesInspector( const Section& section ); + explicit SectionMeshesInspector( const Section& section ); SectionMeshesInspectionResult inspect_section_meshes() const; }; diff --git a/include/geode/inspector/edgedcurve_inspector.h b/include/geode/inspector/edgedcurve_inspector.h index b677fb8a..c8a59c8d 100644 --- a/include/geode/inspector/edgedcurve_inspector.h +++ b/include/geode/inspector/edgedcurve_inspector.h @@ -57,7 +57,7 @@ namespace geode OPENGEODE_DISABLE_COPY( EdgedCurveInspector ); public: - EdgedCurveInspector( const EdgedCurve< dimension >& mesh ); + explicit EdgedCurveInspector( const EdgedCurve< dimension >& mesh ); EdgedCurveInspectionResult inspect_edged_curve() const; }; diff --git a/include/geode/inspector/mixin/add_inspectors.h b/include/geode/inspector/mixin/add_inspectors.h index 2826482d..b9d9b9fd 100644 --- a/include/geode/inspector/mixin/add_inspectors.h +++ b/include/geode/inspector/mixin/add_inspectors.h @@ -38,7 +38,7 @@ namespace geode class AddInspectors : public Inspectors... { protected: - AddInspectors( const Mesh& mesh ) : Inspectors{ mesh }... {} + explicit AddInspectors( const Mesh& mesh ) : Inspectors{ mesh }... {} AddInspectors( AddInspectors&& ) = default; }; } // namespace geode diff --git a/include/geode/inspector/pointset_inspector.h b/include/geode/inspector/pointset_inspector.h index b1b825cd..44351862 100644 --- a/include/geode/inspector/pointset_inspector.h +++ b/include/geode/inspector/pointset_inspector.h @@ -51,7 +51,7 @@ namespace geode OPENGEODE_DISABLE_COPY( PointSetInspector ); public: - PointSetInspector( const PointSet< dimension >& mesh ); + explicit PointSetInspector( const PointSet< dimension >& mesh ); PointSetInspectionResult inspect_point_set() const; }; diff --git a/include/geode/inspector/section_inspector.h b/include/geode/inspector/section_inspector.h index b0f8aff1..087865e0 100644 --- a/include/geode/inspector/section_inspector.h +++ b/include/geode/inspector/section_inspector.h @@ -51,7 +51,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SectionInspector ); public: - SectionInspector( const Section& section ); + explicit SectionInspector( const Section& section ); SectionInspectionResult inspect_section() const; }; diff --git a/include/geode/inspector/solid_inspector.h b/include/geode/inspector/solid_inspector.h index 0b1e3758..bf95d7d3 100644 --- a/include/geode/inspector/solid_inspector.h +++ b/include/geode/inspector/solid_inspector.h @@ -82,7 +82,7 @@ namespace geode OPENGEODE_TEMPLATE_ASSERT_3D( dimension ); public: - SolidMeshInspector( const SolidMesh< dimension >& mesh ); + explicit SolidMeshInspector( const SolidMesh< dimension >& mesh ); SolidInspectionResult inspect_solid() const; }; ALIAS_3D( SolidMeshInspector ); diff --git a/include/geode/inspector/surface_inspector.h b/include/geode/inspector/surface_inspector.h index 71f28154..4978cd74 100644 --- a/include/geode/inspector/surface_inspector.h +++ b/include/geode/inspector/surface_inspector.h @@ -99,7 +99,7 @@ namespace geode TriangulatedSurfaceIntersections< dimension > > { public: - TriangulatedSurfaceInspector( + explicit TriangulatedSurfaceInspector( const TriangulatedSurface< dimension >& mesh ); virtual ~TriangulatedSurfaceInspector() {} diff --git a/include/geode/inspector/topology/brep_blocks_topology.h b/include/geode/inspector/topology/brep_blocks_topology.h index 8494023d..1c4998b7 100644 --- a/include/geode/inspector/topology/brep_blocks_topology.h +++ b/include/geode/inspector/topology/brep_blocks_topology.h @@ -73,7 +73,7 @@ namespace geode class opengeode_inspector_inspector_api BRepBlocksTopology { public: - BRepBlocksTopology( const BRep& brep ); + explicit BRepBlocksTopology( const BRep& brep ); bool brep_blocks_topology_is_valid( index_t unique_vertex_index ) const; diff --git a/include/geode/inspector/topology/brep_corners_topology.h b/include/geode/inspector/topology/brep_corners_topology.h index c5549657..a78a7d92 100644 --- a/include/geode/inspector/topology/brep_corners_topology.h +++ b/include/geode/inspector/topology/brep_corners_topology.h @@ -74,7 +74,7 @@ namespace geode class opengeode_inspector_inspector_api BRepCornersTopology { public: - BRepCornersTopology( const BRep& brep ); + explicit BRepCornersTopology( const BRep& brep ); /*! * Checks if the brep unique vertices are valid corners, i.e. diff --git a/include/geode/inspector/topology/brep_lines_topology.h b/include/geode/inspector/topology/brep_lines_topology.h index 15c84bf6..d6367259 100644 --- a/include/geode/inspector/topology/brep_lines_topology.h +++ b/include/geode/inspector/topology/brep_lines_topology.h @@ -79,7 +79,7 @@ namespace geode class opengeode_inspector_inspector_api BRepLinesTopology { public: - BRepLinesTopology( const BRep& brep ); + explicit BRepLinesTopology( const BRep& brep ); /*! * Checks if the brep unique vertices are parts of valid lines, i.e. diff --git a/include/geode/inspector/topology/brep_surfaces_topology.h b/include/geode/inspector/topology/brep_surfaces_topology.h index abbde1cf..50c0c6b0 100644 --- a/include/geode/inspector/topology/brep_surfaces_topology.h +++ b/include/geode/inspector/topology/brep_surfaces_topology.h @@ -36,8 +36,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - BRepSurfacesTopologyInspectionResult + struct + opengeode_inspector_inspector_api BRepSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ "uuids of surface without mesh." @@ -82,7 +82,7 @@ namespace geode class opengeode_inspector_inspector_api BRepSurfacesTopology { public: - BRepSurfacesTopology( const BRep& brep ); + explicit BRepSurfacesTopology( const BRep& brep ); /*! * Checks if the brep unique vertices are parts of valid surfaces, diff --git a/include/geode/inspector/topology/brep_topology.h b/include/geode/inspector/topology/brep_topology.h index 048642b6..1241fe4e 100644 --- a/include/geode/inspector/topology/brep_topology.h +++ b/include/geode/inspector/topology/brep_topology.h @@ -65,7 +65,7 @@ namespace geode OPENGEODE_DISABLE_COPY( BRepTopologyInspector ); public: - BRepTopologyInspector( const BRep& brep ); + explicit BRepTopologyInspector( const BRep& brep ); ~BRepTopologyInspector(); diff --git a/include/geode/inspector/topology/section_corners_topology.h b/include/geode/inspector/topology/section_corners_topology.h index f53a5cb9..af02b109 100644 --- a/include/geode/inspector/topology/section_corners_topology.h +++ b/include/geode/inspector/topology/section_corners_topology.h @@ -38,8 +38,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - SectionCornersTopologyInspectionResult + struct + opengeode_inspector_inspector_api SectionCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ "uuids of Corners without mesh." @@ -74,7 +74,7 @@ namespace geode class opengeode_inspector_inspector_api SectionCornersTopology { public: - SectionCornersTopology( const Section& section ); + explicit SectionCornersTopology( const Section& section ); /*! * Checks if the section unique vertices are valid corners, i.e. diff --git a/include/geode/inspector/topology/section_lines_topology.h b/include/geode/inspector/topology/section_lines_topology.h index 0dbfc47b..913835cc 100644 --- a/include/geode/inspector/topology/section_lines_topology.h +++ b/include/geode/inspector/topology/section_lines_topology.h @@ -35,8 +35,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - SectionLinesTopologyInspectionResult + struct + opengeode_inspector_inspector_api SectionLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ "uuids of Lines without mesh." @@ -76,7 +76,7 @@ namespace geode class opengeode_inspector_inspector_api SectionLinesTopology { public: - SectionLinesTopology( const Section& section ); + explicit SectionLinesTopology( const Section& section ); /*! * Checks if the section unique vertices are parts of valid lines, diff --git a/include/geode/inspector/topology/section_surfaces_topology.h b/include/geode/inspector/topology/section_surfaces_topology.h index 0d1b76c9..9937729d 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.h +++ b/include/geode/inspector/topology/section_surfaces_topology.h @@ -36,8 +36,8 @@ namespace geode namespace geode { - struct opengeode_inspector_inspector_api - SectionSurfacesTopologyInspectionResult + struct + opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ "uuids of Surfaces without mesh." @@ -67,7 +67,7 @@ namespace geode class opengeode_inspector_inspector_api SectionSurfacesTopology { public: - SectionSurfacesTopology( const Section& section ); + explicit SectionSurfacesTopology( const Section& section ); /*! * Checks if the section unique vertices are parts of valid diff --git a/include/geode/inspector/topology/section_topology.h b/include/geode/inspector/topology/section_topology.h index ecbb038a..255e5ca3 100644 --- a/include/geode/inspector/topology/section_topology.h +++ b/include/geode/inspector/topology/section_topology.h @@ -63,7 +63,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SectionTopologyInspector ); public: - SectionTopologyInspector( const Section& section ); + explicit SectionTopologyInspector( const Section& section ); ~SectionTopologyInspector(); /*! diff --git a/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp b/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp index 4531a340..410450d2 100644 --- a/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp +++ b/src/geode/inspector/criterion/adjacency/surface_adjacency.cpp @@ -93,7 +93,8 @@ namespace geode LRange{ mesh_.nb_polygon_edges( polygon_adj_id ) } ) { const PolygonEdge adj_edge{ polygon_adj_id, edge_id }; - const auto adj_v0 = mesh_.polygon_vertex( adj_edge ); + const auto adj_v0 = + mesh_.polygon_vertex( PolygonVertex{ adj_edge } ); if( adj_v0 == v1 ) { const auto adj_v1 = diff --git a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp index 73118658..d845f774 100644 --- a/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp +++ b/src/geode/inspector/criterion/manifold/brep_meshes_manifold.cpp @@ -158,7 +158,7 @@ namespace geode vertices[e == vertices.size() - 1 ? 0 : e + 1] } ); const auto info = edges.try_emplace( - std::array< index_t, 2 >{ v0, v1 }, + Edge{ std::array< index_t, 2 >{ v0, v1 } }, std::vector< uuid >{ surface.id() } ); if( !info.second ) { diff --git a/tests/inspector/test-edgedcurve-colocation.cpp b/tests/inspector/test-edgedcurve-colocation.cpp index 7d9a0cc0..e895fbd7 100644 --- a/tests/inspector/test-edgedcurve-colocation.cpp +++ b/tests/inspector/test-edgedcurve-colocation.cpp @@ -35,10 +35,10 @@ void check_non_colocation2D() auto curve = geode::EdgedCurve2D::create(); auto builder = geode::EdgedCurveBuilder2D::create( *curve ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 0. } } ); - builder->set_point( 2, { { 1., 4. } } ); - builder->set_point( 3, { { 3., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 1., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 3. } } ); const geode::EdgedCurveColocation2D colocation_inspector{ *curve }; OPENGEODE_EXCEPTION( !colocation_inspector.mesh_has_colocated_points(), @@ -53,13 +53,15 @@ void check_colocation2D() auto curve = geode::EdgedCurve2D::create(); auto builder = geode::EdgedCurveBuilder2D::create( *curve ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 0., 2. } } ); - builder->set_point( 2, { { 0., 0. } } ); - builder->set_point( 3, { { 2., 0. } } ); - builder->set_point( 4, { { 1., 4. } } ); - builder->set_point( 5, { { 2., geode::global_epsilon / 2 } } ); - builder->set_point( 6, { { geode::global_epsilon / 1.1, 2. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 2, geode::Point2D{ { 0., 0. } } ); + builder->set_point( 3, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 4, geode::Point2D{ { 1., 4. } } ); + builder->set_point( + 5, geode::Point2D{ { 2., geode::global_epsilon / 2 } } ); + builder->set_point( + 6, geode::Point2D{ { geode::global_epsilon / 1.1, 2. } } ); const geode::EdgedCurveColocation2D colocation_inspector{ *curve }; OPENGEODE_EXCEPTION( colocation_inspector.mesh_has_colocated_points(), @@ -91,10 +93,10 @@ void check_non_colocation3D() auto curve = geode::EdgedCurve3D::create(); auto builder = geode::EdgedCurveBuilder3D::create( *curve ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2., 0. } } ); - builder->set_point( 1, { { 2., 0., 0.5 } } ); - builder->set_point( 2, { { 1., 4., 1. } } ); - builder->set_point( 3, { { 3., 3., 2. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 2., 0., 0.5 } } ); + builder->set_point( 2, geode::Point3D{ { 1., 4., 1. } } ); + builder->set_point( 3, geode::Point3D{ { 3., 3., 2. } } ); const geode::EdgedCurveColocation3D colocation_inspector{ *curve }; OPENGEODE_EXCEPTION( !colocation_inspector.mesh_has_colocated_points(), @@ -110,14 +112,15 @@ void check_colocation3D() auto curve = geode::EdgedCurve3D::create(); auto builder = geode::EdgedCurveBuilder3D::create( *curve ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 0., 2., 1. } } ); - builder->set_point( 1, { { 0., 2., 1. } } ); - builder->set_point( 2, { { 0., 0., 0. } } ); - builder->set_point( 3, { { 2., 0., 0. } } ); - builder->set_point( 4, { { 1., 4., 3. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 1. } } ); + builder->set_point( 1, geode::Point3D{ { 0., 2., 1. } } ); + builder->set_point( 2, geode::Point3D{ { 0., 0., 0. } } ); + builder->set_point( 3, geode::Point3D{ { 2., 0., 0. } } ); + builder->set_point( 4, geode::Point3D{ { 1., 4., 3. } } ); + builder->set_point( 5, geode::Point3D{ { 2., geode::global_epsilon / 2, + geode::global_epsilon / 2 } } ); builder->set_point( - 5, { { 2., geode::global_epsilon / 2, geode::global_epsilon / 2 } } ); - builder->set_point( 6, { { geode::global_epsilon / 1.1, 2., 1. } } ); + 6, geode::Point3D{ { geode::global_epsilon / 1.1, 2., 1. } } ); const geode::EdgedCurveColocation3D colocation_inspector{ *curve }; OPENGEODE_EXCEPTION( colocation_inspector.mesh_has_colocated_points(), diff --git a/tests/inspector/test-edgedcurve-degeneration.cpp b/tests/inspector/test-edgedcurve-degeneration.cpp index 9ed2cabc..5e720a9f 100644 --- a/tests/inspector/test-edgedcurve-degeneration.cpp +++ b/tests/inspector/test-edgedcurve-degeneration.cpp @@ -35,9 +35,9 @@ void check_non_degeneration2D() auto curve = geode::EdgedCurve2D::create(); auto builder = geode::EdgedCurveBuilder2D::create( *curve ); builder->create_vertices( 3 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 0. } } ); - builder->set_point( 2, { { 1., 4. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 1., 4. } } ); builder->create_edge( 0, 1 ); builder->create_edge( 1, 2 ); @@ -56,9 +56,10 @@ void check_degeneration_by_colocalisation2D() auto curve = geode::EdgedCurve2D::create(); auto builder = geode::EdgedCurveBuilder2D::create( *curve ); builder->create_vertices( 3 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 0. } } ); - builder->set_point( 2, { { 2., geode::global_epsilon / 2 } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 0. } } ); + builder->set_point( + 2, geode::Point2D{ { 2., geode::global_epsilon / 2 } } ); builder->create_edge( 0, 1 ); builder->create_edge( 0, 2 ); @@ -80,9 +81,9 @@ void check_non_degeneration3D() auto curve = geode::EdgedCurve3D::create(); auto builder = geode::EdgedCurveBuilder3D::create( *curve ); builder->create_vertices( 3 ); - builder->set_point( 0, { { 0., 2., 0. } } ); - builder->set_point( 1, { { 2., 0., 0.5 } } ); - builder->set_point( 2, { { 1., 4., 1. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 2., 0., 0.5 } } ); + builder->set_point( 2, geode::Point3D{ { 1., 4., 1. } } ); builder->create_edge( 0, 1 ); builder->create_edge( 1, 2 ); @@ -101,9 +102,9 @@ void check_degeneration_by_colocalisation3D() auto curve = geode::EdgedCurve3D::create(); auto builder = geode::EdgedCurveBuilder3D::create( *curve ); builder->create_vertices( 3 ); - builder->set_point( 0, { { 0., 2., 0. } } ); - builder->set_point( 1, { { 2., 0., 0.5 } } ); - builder->set_point( 2, { { 2., geode::global_epsilon / 2, + builder->set_point( 0, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 2., 0., 0.5 } } ); + builder->set_point( 2, geode::Point3D{ { 2., geode::global_epsilon / 2, 0.5 + geode::global_epsilon / 2 } } ); builder->create_edge( 0, 1 ); diff --git a/tests/inspector/test-pointset.cpp b/tests/inspector/test-pointset.cpp index 34e8656d..68460742 100644 --- a/tests/inspector/test-pointset.cpp +++ b/tests/inspector/test-pointset.cpp @@ -35,10 +35,10 @@ void check_non_colocation2D() auto pointset = geode::PointSet2D::create(); auto builder = geode::PointSetBuilder2D::create( *pointset ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 0. } } ); - builder->set_point( 2, { { 1., 4. } } ); - builder->set_point( 3, { { 3., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 1., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 3. } } ); const geode::PointSetInspector2D inspector{ *pointset }; OPENGEODE_EXCEPTION( !inspector.mesh_has_colocated_points(), @@ -52,13 +52,15 @@ void check_colocation2D() auto pointset = geode::PointSet2D::create(); auto builder = geode::PointSetBuilder2D::create( *pointset ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 0., 2. } } ); - builder->set_point( 2, { { 0., 0. } } ); - builder->set_point( 3, { { 2., 0. } } ); - builder->set_point( 4, { { 1., 4. } } ); - builder->set_point( 5, { { 2., geode::global_epsilon / 2 } } ); - builder->set_point( 6, { { geode::global_epsilon / 1.1, 2. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 2, geode::Point2D{ { 0., 0. } } ); + builder->set_point( 3, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 4, geode::Point2D{ { 1., 4. } } ); + builder->set_point( + 5, geode::Point2D{ { 2., geode::global_epsilon / 2 } } ); + builder->set_point( + 6, geode::Point2D{ { geode::global_epsilon / 1.1, 2. } } ); const geode::PointSetInspector2D inspector{ *pointset }; OPENGEODE_EXCEPTION( inspector.mesh_has_colocated_points(), @@ -89,10 +91,10 @@ void check_non_colocation3D() auto pointset = geode::PointSet3D::create(); auto builder = geode::PointSetBuilder3D::create( *pointset ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2., 0. } } ); - builder->set_point( 1, { { 2., 0., 0.5 } } ); - builder->set_point( 2, { { 1., 4., 1. } } ); - builder->set_point( 3, { { 3., 3., 2. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 2., 0., 0.5 } } ); + builder->set_point( 2, geode::Point3D{ { 1., 4., 1. } } ); + builder->set_point( 3, geode::Point3D{ { 3., 3., 2. } } ); const geode::PointSetInspector3D inspector{ *pointset }; OPENGEODE_EXCEPTION( !inspector.mesh_has_colocated_points(), @@ -106,14 +108,15 @@ void check_colocation3D() auto pointset = geode::PointSet3D::create(); auto builder = geode::PointSetBuilder3D::create( *pointset ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 0., 2., 1. } } ); - builder->set_point( 1, { { 0., 2., 1. } } ); - builder->set_point( 2, { { 0., 0., 0. } } ); - builder->set_point( 3, { { 2., 0., 0. } } ); - builder->set_point( 4, { { 1., 4., 3. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 1. } } ); + builder->set_point( 1, geode::Point3D{ { 0., 2., 1. } } ); + builder->set_point( 2, geode::Point3D{ { 0., 0., 0. } } ); + builder->set_point( 3, geode::Point3D{ { 2., 0., 0. } } ); + builder->set_point( 4, geode::Point3D{ { 1., 4., 3. } } ); + builder->set_point( 5, geode::Point3D{ { 2., geode::global_epsilon / 2, + geode::global_epsilon / 2 } } ); builder->set_point( - 5, { { 2., geode::global_epsilon / 2, geode::global_epsilon / 2 } } ); - builder->set_point( 6, { { geode::global_epsilon / 1.1, 2., 1. } } ); + 6, geode::Point3D{ { geode::global_epsilon / 1.1, 2., 1. } } ); const geode::PointSetInspector3D inspector{ *pointset }; OPENGEODE_EXCEPTION( inspector.mesh_has_colocated_points(), diff --git a/tests/inspector/test-solid-adjacency.cpp b/tests/inspector/test-solid-adjacency.cpp index 8474ce01..fa7b2a37 100644 --- a/tests/inspector/test-solid-adjacency.cpp +++ b/tests/inspector/test-solid-adjacency.cpp @@ -37,11 +37,11 @@ void check_adjacency() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 1, 4, 2, 3 } ); builder->set_polyhedron_adjacent( { 0, 0 }, 1 ); @@ -60,12 +60,12 @@ void check_non_adjacency_no_bijection() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 6 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); - builder->set_point( 5, { { 4., 3., -.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); + builder->set_point( 5, geode::Point3D{ { 4., 3., -.5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 1, 4, 2, 3 } ); builder->create_tetrahedron( { 1, 5, 2, 3 } ); @@ -93,11 +93,11 @@ void check_non_adjacency_wrong_facet() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 1, 4, 2, 3 } ); builder->set_polyhedron_adjacent( { 0, 0 }, 1 ); @@ -129,11 +129,11 @@ void check_non_adjacency_inversed_tetrahedron() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 1, 4, 3, 2 } ); builder->set_polyhedron_adjacent( { 0, 0 }, 1 ); diff --git a/tests/inspector/test-solid-colocation.cpp b/tests/inspector/test-solid-colocation.cpp index 0b0f2b00..a973425c 100644 --- a/tests/inspector/test-solid-colocation.cpp +++ b/tests/inspector/test-solid-colocation.cpp @@ -35,11 +35,11 @@ void check_non_colocation() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 0. } } ); - builder->set_point( 1, { { 3., 3., -0.5 } } ); - builder->set_point( 2, { { -0.5, 4., -1. } } ); - builder->set_point( 3, { { 1., 3., 3. } } ); - builder->set_point( 4, { { 1., 2., -3. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 3., 3., -0.5 } } ); + builder->set_point( 2, geode::Point3D{ { -0.5, 4., -1. } } ); + builder->set_point( 3, geode::Point3D{ { 1., 3., 3. } } ); + builder->set_point( 4, geode::Point3D{ { 1., 2., -3. } } ); const geode::SolidMeshColocation3D colocation_inspector{ *solid }; OPENGEODE_EXCEPTION( !colocation_inspector.mesh_has_colocated_points(), @@ -54,14 +54,15 @@ void check_colocation() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 5., 2., 1. } } ); - builder->set_point( 1, { { 5., 2., 1. } } ); - builder->set_point( 2, { { 0.5, 0., 0.5 } } ); - builder->set_point( 3, { { 5., 2., 0. } } ); - builder->set_point( 4, { { 1., 4., 3. } } ); - builder->set_point( 5, - { { 5., 2. + geode::global_epsilon / 2, geode::global_epsilon / 2 } } ); - builder->set_point( 6, { { 5. + geode::global_epsilon / 1.1, 2., 1. } } ); + builder->set_point( 0, geode::Point3D{ { 5., 2., 1. } } ); + builder->set_point( 1, geode::Point3D{ { 5., 2., 1. } } ); + builder->set_point( 2, geode::Point3D{ { 0.5, 0., 0.5 } } ); + builder->set_point( 3, geode::Point3D{ { 5., 2., 0. } } ); + builder->set_point( 4, geode::Point3D{ { 1., 4., 3. } } ); + builder->set_point( 5, geode::Point3D{ { 5., 2. + geode::global_epsilon / 2, + geode::global_epsilon / 2 } } ); + builder->set_point( + 6, geode::Point3D{ { 5. + geode::global_epsilon / 1.1, 2., 1. } } ); const geode::SolidMeshColocation3D colocation_inspector{ *solid }; OPENGEODE_EXCEPTION( colocation_inspector.mesh_has_colocated_points(), diff --git a/tests/inspector/test-solid-degeneration.cpp b/tests/inspector/test-solid-degeneration.cpp index ced2eb75..1bac9dba 100644 --- a/tests/inspector/test-solid-degeneration.cpp +++ b/tests/inspector/test-solid-degeneration.cpp @@ -36,11 +36,11 @@ void check_non_degeneration() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 0. } } ); - builder->set_point( 1, { { 3., 3., -0.5 } } ); - builder->set_point( 2, { { -0.5, 4., -1. } } ); - builder->set_point( 3, { { 1., 3., 3. } } ); - builder->set_point( 4, { { 1., 2., -3. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 3., 3., -0.5 } } ); + builder->set_point( 2, geode::Point3D{ { -0.5, 4., -1. } } ); + builder->set_point( 3, geode::Point3D{ { 1., 3., 3. } } ); + builder->set_point( 4, geode::Point3D{ { 1., 2., -3. } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 0, 1, 4, 2 } ); @@ -58,11 +58,12 @@ void check_degeneration_by_colocalisation() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 0. } } ); - builder->set_point( 1, { { 3., 3., 0. } } ); - builder->set_point( 2, { { -0.5, 4., -1. } } ); - builder->set_point( 3, { { 1., 3., 3. } } ); - builder->set_point( 4, { { 3., 3., -geode::global_epsilon / 2 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 3., 3., 0. } } ); + builder->set_point( 2, geode::Point3D{ { -0.5, 4., -1. } } ); + builder->set_point( 3, geode::Point3D{ { 1., 3., 3. } } ); + builder->set_point( + 4, geode::Point3D{ { 3., 3., -geode::global_epsilon / 2 } } ); builder->create_tetrahedron( { 0, 1, 3, 2 } ); builder->create_tetrahedron( { 0, 1, 4, 2 } ); @@ -84,10 +85,10 @@ void check_degeneration_by_point_multiple_presence() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 0. } } ); - builder->set_point( 1, { { 3., 3., -0.5 } } ); - builder->set_point( 2, { { -0.5, 4., -1. } } ); - builder->set_point( 3, { { 1., 3., 3. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 3., 3., -0.5 } } ); + builder->set_point( 2, geode::Point3D{ { -0.5, 4., -1. } } ); + builder->set_point( 3, geode::Point3D{ { 1., 3., 3. } } ); builder->create_tetrahedron( { 0, 1, 3, 2 } ); builder->create_tetrahedron( { 0, 1, 1, 2 } ); diff --git a/tests/inspector/test-solid-manifold.cpp b/tests/inspector/test-solid-manifold.cpp index fac8fa2c..f6de7cca 100644 --- a/tests/inspector/test-solid-manifold.cpp +++ b/tests/inspector/test-solid-manifold.cpp @@ -37,11 +37,11 @@ void check_vertex_manifold() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 1, 4, 2, 3 } ); builder->set_polyhedron_adjacent( { 0, 0 }, 1 ); @@ -60,13 +60,13 @@ void check_vertex_non_manifold() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); - builder->set_point( 5, { { 3., .5, 0. } } ); - builder->set_point( 6, { { .5, 3., .5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); + builder->set_point( 5, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 6, geode::Point3D{ { .5, 3., .5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 5, 4, 6, 3 } ); @@ -86,11 +86,11 @@ void check_edge_manifold() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 1, 4, 2, 3 } ); builder->set_polyhedron_adjacent( { 0, 0 }, 1 ); @@ -109,12 +109,12 @@ void check_edge_non_manifold() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 6 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); - builder->set_point( 5, { { 3., .5, 0. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); + builder->set_point( 5, geode::Point3D{ { 3., .5, 0. } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 5, 4, 2, 3 } ); @@ -135,11 +135,11 @@ void check_facet_manifold() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 1, 4, 2, 3 } ); @@ -156,12 +156,12 @@ void check_facet_non_manifold() auto solid = geode::TetrahedralSolid3D::create(); auto builder = geode::TetrahedralSolidBuilder3D::create( *solid ); builder->create_vertices( 6 ); - builder->set_point( 0, { { 0., 0., 2. } } ); - builder->set_point( 1, { { 3., .5, 0. } } ); - builder->set_point( 2, { { .5, 3., .5 } } ); - builder->set_point( 3, { { 2., 1.5, 3. } } ); - builder->set_point( 4, { { 3.5, 2.5, -.5 } } ); - builder->set_point( 5, { { 4., 3., -.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 2. } } ); + builder->set_point( 1, geode::Point3D{ { 3., .5, 0. } } ); + builder->set_point( 2, geode::Point3D{ { .5, 3., .5 } } ); + builder->set_point( 3, geode::Point3D{ { 2., 1.5, 3. } } ); + builder->set_point( 4, geode::Point3D{ { 3.5, 2.5, -.5 } } ); + builder->set_point( 5, geode::Point3D{ { 4., 3., -.5 } } ); builder->create_tetrahedron( { 0, 1, 2, 3 } ); builder->create_tetrahedron( { 1, 4, 2, 3 } ); builder->create_tetrahedron( { 1, 5, 2, 3 } ); diff --git a/tests/inspector/test-surface-adjacency.cpp b/tests/inspector/test-surface-adjacency.cpp index 75d2a2f4..f8333187 100644 --- a/tests/inspector/test-surface-adjacency.cpp +++ b/tests/inspector/test-surface-adjacency.cpp @@ -35,14 +35,14 @@ void check_adjacency2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 1. } } ); - builder->set_point( 1, { { 3., 0. } } ); - builder->set_point( 2, { { 2., 4. } } ); - builder->set_point( 3, { { 5., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 1. } } ); + builder->set_point( 1, geode::Point2D{ { 3., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 2., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 5., 3. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); const geode::SurfaceMeshAdjacency2D adjacency_inspector{ *surface }; OPENGEODE_EXCEPTION( !adjacency_inspector.mesh_has_wrong_adjacencies(), @@ -58,17 +58,17 @@ void check_non_adjacency_no_bijection2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 1. } } ); - builder->set_point( 1, { { 3., 0. } } ); - builder->set_point( 2, { { 2., 4. } } ); - builder->set_point( 3, { { 5., 3. } } ); - builder->set_point( 4, { { 1., 4. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 1. } } ); + builder->set_point( 1, geode::Point2D{ { 3., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 2., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 5., 3. } } ); + builder->set_point( 4, geode::Point2D{ { 1., 4. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); builder->create_triangle( { 4, 1, 2 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); - builder->set_polygon_adjacent( { { 2, 1 } }, 1 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); + builder->set_polygon_adjacent( { 2, 1 }, 1 ); const geode::SurfaceMeshAdjacency2D adjacency_inspector{ *surface }; OPENGEODE_EXCEPTION( adjacency_inspector.mesh_has_wrong_adjacencies(), @@ -90,14 +90,14 @@ void check_non_adjacency_wrong_edge2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 1. } } ); - builder->set_point( 1, { { 3., 0. } } ); - builder->set_point( 2, { { 2., 4. } } ); - builder->set_point( 3, { { 5., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 1. } } ); + builder->set_point( 1, geode::Point2D{ { 3., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 2., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 5., 3. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 1 } }, 0 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 1 }, 0 ); const geode::SurfaceMeshAdjacency2D adjacency_inspector{ *surface }; OPENGEODE_EXCEPTION( adjacency_inspector.mesh_has_wrong_adjacencies(), @@ -125,14 +125,14 @@ void check_non_adjacency_inversed_triangle2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 1. } } ); - builder->set_point( 1, { { 3., 0. } } ); - builder->set_point( 2, { { 2., 4. } } ); - builder->set_point( 3, { { 5., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 1. } } ); + builder->set_point( 1, geode::Point2D{ { 3., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 2., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 5., 3. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 1, 2, 3 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); const geode::SurfaceMeshAdjacency2D adjacency_inspector{ *surface }; OPENGEODE_EXCEPTION( adjacency_inspector.mesh_has_wrong_adjacencies(), @@ -162,14 +162,14 @@ void check_adjacency3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 1., 0. } } ); - builder->set_point( 1, { { 3., 0., 1. } } ); - builder->set_point( 2, { { 2., 4., 2. } } ); - builder->set_point( 3, { { 5., 3., 0. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 1., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 3., 0., 1. } } ); + builder->set_point( 2, geode::Point3D{ { 2., 4., 2. } } ); + builder->set_point( 3, geode::Point3D{ { 5., 3., 0. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); const geode::SurfaceMeshAdjacency3D adjacency_inspector{ *surface }; OPENGEODE_EXCEPTION( !adjacency_inspector.mesh_has_wrong_adjacencies(), @@ -186,17 +186,17 @@ void check_non_adjacency_no_bijection3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 1., 0. } } ); - builder->set_point( 1, { { 3., 0., 1. } } ); - builder->set_point( 2, { { 2., 4., 2. } } ); - builder->set_point( 3, { { 5., 3., 0. } } ); - builder->set_point( 4, { { 1., 4., 4. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 1., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 3., 0., 1. } } ); + builder->set_point( 2, geode::Point3D{ { 2., 4., 2. } } ); + builder->set_point( 3, geode::Point3D{ { 5., 3., 0. } } ); + builder->set_point( 4, geode::Point3D{ { 1., 4., 4. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); builder->create_triangle( { 4, 1, 2 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); - builder->set_polygon_adjacent( { { 2, 1 } }, 1 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); + builder->set_polygon_adjacent( { 2, 1 }, 1 ); const geode::SurfaceMeshAdjacency3D adjacency_inspector{ *surface }; OPENGEODE_EXCEPTION( adjacency_inspector.mesh_has_wrong_adjacencies(), @@ -219,14 +219,14 @@ void check_non_adjacency_wrong_edge3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 1., 0. } } ); - builder->set_point( 1, { { 3., 0., 1. } } ); - builder->set_point( 2, { { 2., 4., 2. } } ); - builder->set_point( 3, { { 5., 3., 0. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 1., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 3., 0., 1. } } ); + builder->set_point( 2, geode::Point3D{ { 2., 4., 2. } } ); + builder->set_point( 3, geode::Point3D{ { 5., 3., 0. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 1 } }, 0 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 1 }, 0 ); const geode::SurfaceMeshAdjacency3D adjacency_inspector{ *surface }; OPENGEODE_EXCEPTION( adjacency_inspector.mesh_has_wrong_adjacencies(), @@ -254,14 +254,14 @@ void check_non_adjacency_inversed_triangle3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 1., 0. } } ); - builder->set_point( 1, { { 3., 0., 1. } } ); - builder->set_point( 2, { { 2., 4., 2. } } ); - builder->set_point( 3, { { 5., 3., 0. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 1., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 3., 0., 1. } } ); + builder->set_point( 2, geode::Point3D{ { 2., 4., 2. } } ); + builder->set_point( 3, geode::Point3D{ { 5., 3., 0. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 1, 2, 3 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); const geode::SurfaceMeshAdjacency3D adjacency_inspector{ *surface }; OPENGEODE_EXCEPTION( adjacency_inspector.mesh_has_wrong_adjacencies(), diff --git a/tests/inspector/test-surface-colocation.cpp b/tests/inspector/test-surface-colocation.cpp index fed6fc09..6647264e 100644 --- a/tests/inspector/test-surface-colocation.cpp +++ b/tests/inspector/test-surface-colocation.cpp @@ -35,10 +35,10 @@ void check_non_colocation2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 0. } } ); - builder->set_point( 2, { { 1., 4. } } ); - builder->set_point( 3, { { 3., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 1., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 3. } } ); const geode::SurfaceMeshColocation2D colocation_inspector{ *surface }; OPENGEODE_EXCEPTION( !colocation_inspector.mesh_has_colocated_points(), @@ -53,13 +53,15 @@ void check_colocation2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 0., 2. } } ); - builder->set_point( 2, { { 0., 0. } } ); - builder->set_point( 3, { { 2., 0. } } ); - builder->set_point( 4, { { 1., 4. } } ); - builder->set_point( 5, { { 2., geode::global_epsilon / 2 } } ); - builder->set_point( 6, { { geode::global_epsilon / 1.1, 2. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 2, geode::Point2D{ { 0., 0. } } ); + builder->set_point( 3, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 4, geode::Point2D{ { 1., 4. } } ); + builder->set_point( + 5, geode::Point2D{ { 2., geode::global_epsilon / 2 } } ); + builder->set_point( + 6, geode::Point2D{ { geode::global_epsilon / 1.1, 2. } } ); const geode::SurfaceMeshColocation2D colocation_inspector{ *surface }; OPENGEODE_EXCEPTION( colocation_inspector.mesh_has_colocated_points(), @@ -92,10 +94,10 @@ void check_non_colocation3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2., 0. } } ); - builder->set_point( 1, { { 2., 0., 0.5 } } ); - builder->set_point( 2, { { 1., 4., 1. } } ); - builder->set_point( 3, { { 3., 3., 2. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 2., 0., 0.5 } } ); + builder->set_point( 2, geode::Point3D{ { 1., 4., 1. } } ); + builder->set_point( 3, geode::Point3D{ { 3., 3., 2. } } ); const geode::SurfaceMeshColocation3D colocation_inspector{ *surface }; OPENGEODE_EXCEPTION( !colocation_inspector.mesh_has_colocated_points(), @@ -110,14 +112,15 @@ void check_colocation3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 0., 2., 1. } } ); - builder->set_point( 1, { { 0., 2., 1. } } ); - builder->set_point( 2, { { 0., 0., 0. } } ); - builder->set_point( 3, { { 2., 0., 0. } } ); - builder->set_point( 4, { { 1., 4., 3. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 1. } } ); + builder->set_point( 1, geode::Point3D{ { 0., 2., 1. } } ); + builder->set_point( 2, geode::Point3D{ { 0., 0., 0. } } ); + builder->set_point( 3, geode::Point3D{ { 2., 0., 0. } } ); + builder->set_point( 4, geode::Point3D{ { 1., 4., 3. } } ); + builder->set_point( 5, geode::Point3D{ { 2., geode::global_epsilon / 2, + geode::global_epsilon / 2 } } ); builder->set_point( - 5, { { 2., geode::global_epsilon / 2, geode::global_epsilon / 2 } } ); - builder->set_point( 6, { { geode::global_epsilon / 1.1, 2., 1. } } ); + 6, geode::Point3D{ { geode::global_epsilon / 1.1, 2., 1. } } ); const geode::SurfaceMeshColocation3D colocation_inspector{ *surface }; OPENGEODE_EXCEPTION( colocation_inspector.mesh_has_colocated_points(), diff --git a/tests/inspector/test-surface-curve-intersections.cpp b/tests/inspector/test-surface-curve-intersections.cpp index ae19997a..359e6a8b 100644 --- a/tests/inspector/test-surface-curve-intersections.cpp +++ b/tests/inspector/test-surface-curve-intersections.cpp @@ -39,30 +39,30 @@ void check_intersections2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0. } } ); - builder->set_point( 1, { { 3., -1. } } ); - builder->set_point( 2, { { 3., 3. } } ); - builder->set_point( 3, { { 0., -3. } } ); - builder->set_point( 4, { { 3., -3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 0. } } ); + builder->set_point( 1, geode::Point2D{ { 3., -1. } } ); + builder->set_point( 2, geode::Point2D{ { 3., 3. } } ); + builder->set_point( 3, geode::Point2D{ { 0., -3. } } ); + builder->set_point( 4, geode::Point2D{ { 3., -3. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 0, 1, 3 } ); builder->create_triangle( { 1, 3, 4 } ); - builder->set_polygon_adjacent( { { 0, 0 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); - builder->set_polygon_adjacent( { { 1, 1 } }, 2 ); - builder->set_polygon_adjacent( { { 2, 0 } }, 1 ); + builder->set_polygon_adjacent( { 0, 0 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); + builder->set_polygon_adjacent( { 1, 1 }, 2 ); + builder->set_polygon_adjacent( { 2, 0 }, 1 ); auto curve = geode::EdgedCurve2D::create(); auto curve_builder = geode::EdgedCurveBuilder2D::create( *curve ); curve_builder->create_vertices( 8 ); - curve_builder->set_point( 0, { { 5., 0. } } ); - curve_builder->set_point( 1, { { 3., 0. } } ); - curve_builder->set_point( 2, { { 2., 0. } } ); - curve_builder->set_point( 3, { { 1., 0. } } ); - curve_builder->set_point( 4, { { -1., 0. } } ); - curve_builder->set_point( 5, { { 0., -3. } } ); - curve_builder->set_point( 6, { { 3., -3. } } ); - curve_builder->set_point( 7, { { 1.5, -2. } } ); + curve_builder->set_point( 0, geode::Point2D{ { 5., 0. } } ); + curve_builder->set_point( 1, geode::Point2D{ { 3., 0. } } ); + curve_builder->set_point( 2, geode::Point2D{ { 2., 0. } } ); + curve_builder->set_point( 3, geode::Point2D{ { 1., 0. } } ); + curve_builder->set_point( 4, geode::Point2D{ { -1., 0. } } ); + curve_builder->set_point( 5, geode::Point2D{ { 0., -3. } } ); + curve_builder->set_point( 6, geode::Point2D{ { 3., -3. } } ); + curve_builder->set_point( 7, geode::Point2D{ { 1.5, -2. } } ); curve_builder->create_edge( 0, 1 ); curve_builder->create_edge( 1, 2 ); curve_builder->create_edge( 2, 3 ); @@ -98,31 +98,31 @@ void check_intersections3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0., 0 } } ); - builder->set_point( 1, { { 3., -1., 0 } } ); - builder->set_point( 2, { { 3., 3., 0 } } ); - builder->set_point( 3, { { 0., -3., 0 } } ); - builder->set_point( 4, { { 3., -3., 0 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 0 } } ); + builder->set_point( 1, geode::Point3D{ { 3., -1., 0 } } ); + builder->set_point( 2, geode::Point3D{ { 3., 3., 0 } } ); + builder->set_point( 3, geode::Point3D{ { 0., -3., 0 } } ); + builder->set_point( 4, geode::Point3D{ { 3., -3., 0 } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 0, 1, 3 } ); builder->create_triangle( { 1, 3, 4 } ); - builder->set_polygon_adjacent( { { 0, 0 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); - builder->set_polygon_adjacent( { { 1, 1 } }, 2 ); - builder->set_polygon_adjacent( { { 2, 0 } }, 1 ); + builder->set_polygon_adjacent( { 0, 0 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); + builder->set_polygon_adjacent( { 1, 1 }, 2 ); + builder->set_polygon_adjacent( { 2, 0 }, 1 ); auto curve = geode::EdgedCurve3D::create(); auto curve_builder = geode::EdgedCurveBuilder3D::create( *curve ); curve_builder->create_vertices( 9 ); - curve_builder->set_point( 0, { { 5., 0., 1 } } ); - curve_builder->set_point( 1, { { 3., 0., 0 } } ); - curve_builder->set_point( 2, { { 2., 0., 0 } } ); - curve_builder->set_point( 3, { { 1., 0., 0 } } ); - curve_builder->set_point( 4, { { -1., 0., 0 } } ); - curve_builder->set_point( 5, { { 0., -3., 0 } } ); - curve_builder->set_point( 6, { { 3., -3., 0 } } ); - curve_builder->set_point( 7, { { 1.5, -2., 2 } } ); - curve_builder->set_point( 8, { { 2, -2., -2 } } ); + curve_builder->set_point( 0, geode::Point3D{ { 5., 0., 1 } } ); + curve_builder->set_point( 1, geode::Point3D{ { 3., 0., 0 } } ); + curve_builder->set_point( 2, geode::Point3D{ { 2., 0., 0 } } ); + curve_builder->set_point( 3, geode::Point3D{ { 1., 0., 0 } } ); + curve_builder->set_point( 4, geode::Point3D{ { -1., 0., 0 } } ); + curve_builder->set_point( 5, geode::Point3D{ { 0., -3., 0 } } ); + curve_builder->set_point( 6, geode::Point3D{ { 3., -3., 0 } } ); + curve_builder->set_point( 7, geode::Point3D{ { 1.5, -2., 2 } } ); + curve_builder->set_point( 8, geode::Point3D{ { 2, -2., -2 } } ); curve_builder->create_edge( 0, 1 ); curve_builder->create_edge( 1, 2 ); curve_builder->create_edge( 2, 3 ); diff --git a/tests/inspector/test-surface-degeneration.cpp b/tests/inspector/test-surface-degeneration.cpp index d4b4ec60..14901b21 100644 --- a/tests/inspector/test-surface-degeneration.cpp +++ b/tests/inspector/test-surface-degeneration.cpp @@ -36,10 +36,10 @@ void check_non_degeneration2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 0. } } ); - builder->set_point( 2, { { 1., 4. } } ); - builder->set_point( 3, { { 3., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 1., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 3. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); @@ -57,10 +57,11 @@ void check_degeneration_by_colocalisation2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 0. } } ); - builder->set_point( 2, { { 1., 4. } } ); - builder->set_point( 3, { { 2., geode::global_epsilon / 2 } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 1., 4. } } ); + builder->set_point( + 3, geode::Point2D{ { 2., geode::global_epsilon / 2 } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); @@ -82,9 +83,9 @@ void check_degeneration_by_point_multiple_presence2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 0. } } ); - builder->set_point( 2, { { 1., 4. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 1., 4. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 1, 2, 1 } ); @@ -105,10 +106,10 @@ void check_non_degeneration3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2., 0. } } ); - builder->set_point( 1, { { 2., 0., 0.5 } } ); - builder->set_point( 2, { { 1., 4., 1. } } ); - builder->set_point( 3, { { 3., 3., 2. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 2., 0., 0.5 } } ); + builder->set_point( 2, geode::Point3D{ { 1., 4., 1. } } ); + builder->set_point( 3, geode::Point3D{ { 3., 3., 2. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 2, 1, 3 } ); @@ -126,10 +127,10 @@ void check_degeneration_by_colocalisation3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2., 0. } } ); - builder->set_point( 1, { { 2., 0., 0.5 } } ); - builder->set_point( 2, { { 1., 4., 1. } } ); - builder->set_point( 3, { { 2., geode::global_epsilon / 2, + builder->set_point( 0, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 2., 0., 0.5 } } ); + builder->set_point( 2, geode::Point3D{ { 1., 4., 1. } } ); + builder->set_point( 3, geode::Point3D{ { 2., geode::global_epsilon / 2, 0.5 + geode::global_epsilon / 2 } } ); builder->create_triangle( { 0, 1, 2 } ); @@ -152,9 +153,9 @@ void check_degeneration_by_point_multiple_presence3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 3 ); - builder->set_point( 0, { { 0., 2., 0. } } ); - builder->set_point( 1, { { 2., 0., 0.5 } } ); - builder->set_point( 2, { { 1., 4., 1. } } ); + builder->set_point( 0, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 2., 0., 0.5 } } ); + builder->set_point( 2, geode::Point3D{ { 1., 4., 1. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 1, 2, 1 } ); diff --git a/tests/inspector/test-surface-intersections.cpp b/tests/inspector/test-surface-intersections.cpp index 1afa3a2d..a8f2d564 100644 --- a/tests/inspector/test-surface-intersections.cpp +++ b/tests/inspector/test-surface-intersections.cpp @@ -35,18 +35,18 @@ void check_intersections2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 0. } } ); - builder->set_point( 1, { { 3., 0. } } ); - builder->set_point( 2, { { 0., 4. } } ); - builder->set_point( 3, { { 3., 4. } } ); - builder->set_point( 4, { { -1., 2. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 0. } } ); + builder->set_point( 1, geode::Point2D{ { 3., 0. } } ); + builder->set_point( 2, geode::Point2D{ { 0., 4. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 4. } } ); + builder->set_point( 4, geode::Point2D{ { -1., 2. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 0, 1, 3 } ); builder->create_triangle( { 1, 3, 4 } ); - builder->set_polygon_adjacent( { { 0, 0 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); - builder->set_polygon_adjacent( { { 1, 1 } }, 2 ); - builder->set_polygon_adjacent( { { 2, 0 } }, 1 ); + builder->set_polygon_adjacent( { 0, 0 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); + builder->set_polygon_adjacent( { 1, 1 }, 2 ); + builder->set_polygon_adjacent( { 2, 0 }, 1 ); const geode::TriangulatedSurfaceIntersections2D intersections_inspector{ *surface @@ -74,24 +74,24 @@ void check_intersections3D() auto surface = geode::TriangulatedSurface3D::create(); auto builder = geode::TriangulatedSurfaceBuilder3D::create( *surface ); builder->create_vertices( 7 ); - builder->set_point( 0, { { 0., 0., 0. } } ); - builder->set_point( 1, { { 0., 0., 3. } } ); - builder->set_point( 2, { { 0., 2., 0. } } ); - builder->set_point( 3, { { 2., 0., 0. } } ); - builder->set_point( 4, { { 5., 0., 1.5 } } ); - builder->set_point( 5, { { 2., 0.5, 2. } } ); - builder->set_point( 6, { { 0., 0., 1.5 } } ); + builder->set_point( 0, geode::Point3D{ { 0., 0., 0. } } ); + builder->set_point( 1, geode::Point3D{ { 0., 0., 3. } } ); + builder->set_point( 2, geode::Point3D{ { 0., 2., 0. } } ); + builder->set_point( 3, geode::Point3D{ { 2., 0., 0. } } ); + builder->set_point( 4, geode::Point3D{ { 5., 0., 1.5 } } ); + builder->set_point( 5, geode::Point3D{ { 2., 0.5, 2. } } ); + builder->set_point( 6, geode::Point3D{ { 0., 0., 1.5 } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 0, 2, 3 } ); builder->create_triangle( { 3, 5, 2 } ); builder->create_triangle( { 5, 2, 4 } ); builder->create_triangle( { 4, 2, 6 } ); - builder->set_polygon_adjacent( { { 0, 2 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 0 ); - builder->set_polygon_adjacent( { { 1, 1 } }, 2 ); - builder->set_polygon_adjacent( { { 2, 2 } }, 1 ); - builder->set_polygon_adjacent( { { 2, 1 } }, 3 ); - builder->set_polygon_adjacent( { { 3, 0 } }, 2 ); + builder->set_polygon_adjacent( { 0, 2 }, 1 ); + builder->set_polygon_adjacent( { 1, 0 }, 0 ); + builder->set_polygon_adjacent( { 1, 1 }, 2 ); + builder->set_polygon_adjacent( { 2, 2 }, 1 ); + builder->set_polygon_adjacent( { 2, 1 }, 3 ); + builder->set_polygon_adjacent( { 3, 0 }, 2 ); const geode::TriangulatedSurfaceIntersections3D intersections_inspector{ *surface diff --git a/tests/inspector/test-surface-manifold.cpp b/tests/inspector/test-surface-manifold.cpp index f51ad7b7..b21e3244 100644 --- a/tests/inspector/test-surface-manifold.cpp +++ b/tests/inspector/test-surface-manifold.cpp @@ -37,14 +37,14 @@ void check_vertex_manifold2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 4 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 2. } } ); - builder->set_point( 2, { { 2., 5. } } ); - builder->set_point( 3, { { 3., 0. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 2. } } ); + builder->set_point( 2, geode::Point2D{ { 2., 5. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 0. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 1, 3, 2 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 2 } }, 0 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 2 }, 0 ); const geode::SurfaceMeshVertexManifold2D manifold_inspector{ *surface }; OPENGEODE_EXCEPTION( manifold_inspector.mesh_vertices_are_manifold(), @@ -59,11 +59,11 @@ void check_vertex_non_manifold2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 2. } } ); - builder->set_point( 2, { { 2., 5. } } ); - builder->set_point( 3, { { 3., 0. } } ); - builder->set_point( 4, { { 5., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 2. } } ); + builder->set_point( 2, geode::Point2D{ { 2., 5. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 0. } } ); + builder->set_point( 4, geode::Point2D{ { 5., 3. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 1, 3, 4 } ); @@ -83,18 +83,18 @@ void check_edge_manifold2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 2. } } ); - builder->set_point( 2, { { 2., 5. } } ); - builder->set_point( 3, { { 3., 0. } } ); - builder->set_point( 4, { { 5., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 2. } } ); + builder->set_point( 2, geode::Point2D{ { 2., 5. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 0. } } ); + builder->set_point( 4, geode::Point2D{ { 5., 3. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 1, 4, 2 } ); builder->create_triangle( { 1, 3, 4 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 2 } }, 0 ); - builder->set_polygon_adjacent( { { 1, 0 } }, 2 ); - builder->set_polygon_adjacent( { { 2, 2 } }, 1 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 2 }, 0 ); + builder->set_polygon_adjacent( { 1, 0 }, 2 ); + builder->set_polygon_adjacent( { 2, 2 }, 1 ); const geode::SurfaceMeshEdgeManifold2D manifold_inspector{ *surface }; OPENGEODE_EXCEPTION( manifold_inspector.mesh_edges_are_manifold(), @@ -109,17 +109,17 @@ void check_edge_non_manifold2D() auto surface = geode::TriangulatedSurface2D::create(); auto builder = geode::TriangulatedSurfaceBuilder2D::create( *surface ); builder->create_vertices( 5 ); - builder->set_point( 0, { { 0., 2. } } ); - builder->set_point( 1, { { 2., 2. } } ); - builder->set_point( 2, { { 2., 5. } } ); - builder->set_point( 3, { { 3., 0. } } ); - builder->set_point( 4, { { 5., 3. } } ); + builder->set_point( 0, geode::Point2D{ { 0., 2. } } ); + builder->set_point( 1, geode::Point2D{ { 2., 2. } } ); + builder->set_point( 2, geode::Point2D{ { 2., 5. } } ); + builder->set_point( 3, geode::Point2D{ { 3., 0. } } ); + builder->set_point( 4, geode::Point2D{ { 5., 3. } } ); builder->create_triangle( { 0, 1, 2 } ); builder->create_triangle( { 1, 4, 2 } ); builder->create_triangle( { 1, 3, 2 } ); - builder->set_polygon_adjacent( { { 0, 1 } }, 1 ); - builder->set_polygon_adjacent( { { 1, 2 } }, 0 ); - builder->set_polygon_adjacent( { { 2, 2 } }, 0 ); + builder->set_polygon_adjacent( { 0, 1 }, 1 ); + builder->set_polygon_adjacent( { 1, 2 }, 0 ); + builder->set_polygon_adjacent( { 2, 2 }, 0 ); const geode::SurfaceMeshEdgeManifold2D manifold_inspector{ *surface }; OPENGEODE_EXCEPTION( !manifold_inspector.mesh_edges_are_manifold(), From eb0da232d01c7ff1278768cb3f8fa18d54be3653 Mon Sep 17 00:00:00 2001 From: MelchiorSchuh Date: Mon, 8 Jul 2024 08:09:20 +0000 Subject: [PATCH 2/4] Apply prepare changes --- .../inspector/criterion/adjacency/section_meshes_adjacency.h | 4 ++-- .../criterion/degeneration/brep_meshes_degeneration.h | 4 ++-- .../criterion/degeneration/section_meshes_degeneration.h | 4 ++-- .../inspector/criterion/intersections/model_intersections.h | 4 ++-- .../criterion/intersections/surface_curve_intersections.h | 2 +- .../inspector/criterion/manifold/section_meshes_manifold.h | 4 ++-- include/geode/inspector/section_inspector.h | 2 +- include/geode/inspector/topology/brep_surfaces_topology.h | 4 ++-- include/geode/inspector/topology/section_corners_topology.h | 4 ++-- include/geode/inspector/topology/section_lines_topology.h | 4 ++-- include/geode/inspector/topology/section_surfaces_topology.h | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.h b/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.h index cfd6e0fd..f144acb3 100644 --- a/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.h +++ b/include/geode/inspector/criterion/adjacency/section_meshes_adjacency.h @@ -40,8 +40,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api SectionMeshesAdjacencyInspectionResult + struct opengeode_inspector_inspector_api + SectionMeshesAdjacencyInspectionResult { InspectionIssuesMap< PolygonEdge > surfaces_edges_with_wrong_adjacencies{ diff --git a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.h b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.h index 08d2e3a3..e1d6784a 100644 --- a/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.h +++ b/include/geode/inspector/criterion/degeneration/brep_meshes_degeneration.h @@ -38,8 +38,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api BRepMeshesDegenerationInspectionResult + struct opengeode_inspector_inspector_api + BRepMeshesDegenerationInspectionResult { InspectionIssuesMap< index_t > degenerated_edges{ "BRep component meshes with degenerated edges" diff --git a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.h b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.h index 15fecabb..e53095e1 100644 --- a/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.h +++ b/include/geode/inspector/criterion/degeneration/section_meshes_degeneration.h @@ -38,8 +38,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api SectionMeshesDegenerationInspectionResult + struct opengeode_inspector_inspector_api + SectionMeshesDegenerationInspectionResult { InspectionIssuesMap< index_t > degenerated_edges{ "Section component meshes with degenerated edges" diff --git a/include/geode/inspector/criterion/intersections/model_intersections.h b/include/geode/inspector/criterion/intersections/model_intersections.h index cb0c144e..8b24be40 100644 --- a/include/geode/inspector/criterion/intersections/model_intersections.h +++ b/include/geode/inspector/criterion/intersections/model_intersections.h @@ -38,8 +38,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api ElementsIntersectionsInspectionResult + struct opengeode_inspector_inspector_api + ElementsIntersectionsInspectionResult { InspectionIssues< std::pair< ComponentMeshElement, ComponentMeshElement > > diff --git a/include/geode/inspector/criterion/intersections/surface_curve_intersections.h b/include/geode/inspector/criterion/intersections/surface_curve_intersections.h index 3debc1e9..e085d5a8 100644 --- a/include/geode/inspector/criterion/intersections/surface_curve_intersections.h +++ b/include/geode/inspector/criterion/intersections/surface_curve_intersections.h @@ -47,7 +47,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SurfaceCurveIntersections ); public: - explicit SurfaceCurveIntersections( + explicit SurfaceCurveIntersections( const TriangulatedSurface< dimension >& surface, const EdgedCurve< dimension >& curve ); diff --git a/include/geode/inspector/criterion/manifold/section_meshes_manifold.h b/include/geode/inspector/criterion/manifold/section_meshes_manifold.h index 8d472ac2..26f6c85d 100644 --- a/include/geode/inspector/criterion/manifold/section_meshes_manifold.h +++ b/include/geode/inspector/criterion/manifold/section_meshes_manifold.h @@ -35,8 +35,8 @@ namespace geode { - struct - opengeode_inspector_inspector_api SectionMeshesManifoldInspectionResult + struct opengeode_inspector_inspector_api + SectionMeshesManifoldInspectionResult { InspectionIssuesMap< index_t > meshes_non_manifold_vertices{ "Section component meshes with non manifold vertices" diff --git a/include/geode/inspector/section_inspector.h b/include/geode/inspector/section_inspector.h index 087865e0..30c734d3 100644 --- a/include/geode/inspector/section_inspector.h +++ b/include/geode/inspector/section_inspector.h @@ -51,7 +51,7 @@ namespace geode OPENGEODE_DISABLE_COPY( SectionInspector ); public: - explicit SectionInspector( const Section& section ); + explicit SectionInspector( const Section& section ); SectionInspectionResult inspect_section() const; }; diff --git a/include/geode/inspector/topology/brep_surfaces_topology.h b/include/geode/inspector/topology/brep_surfaces_topology.h index 4b42e41d..7c1b1c56 100644 --- a/include/geode/inspector/topology/brep_surfaces_topology.h +++ b/include/geode/inspector/topology/brep_surfaces_topology.h @@ -36,8 +36,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api BRepSurfacesTopologyInspectionResult + struct opengeode_inspector_inspector_api + BRepSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ "uuids of surface without mesh." diff --git a/include/geode/inspector/topology/section_corners_topology.h b/include/geode/inspector/topology/section_corners_topology.h index 42a4fed4..39c03b36 100644 --- a/include/geode/inspector/topology/section_corners_topology.h +++ b/include/geode/inspector/topology/section_corners_topology.h @@ -37,8 +37,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api SectionCornersTopologyInspectionResult + struct opengeode_inspector_inspector_api + SectionCornersTopologyInspectionResult { InspectionIssues< uuid > corners_not_meshed{ "uuids of Corners without mesh." diff --git a/include/geode/inspector/topology/section_lines_topology.h b/include/geode/inspector/topology/section_lines_topology.h index df30c7d8..242e21f8 100644 --- a/include/geode/inspector/topology/section_lines_topology.h +++ b/include/geode/inspector/topology/section_lines_topology.h @@ -35,8 +35,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api SectionLinesTopologyInspectionResult + struct opengeode_inspector_inspector_api + SectionLinesTopologyInspectionResult { InspectionIssues< uuid > lines_not_meshed{ "uuids of Lines without mesh." diff --git a/include/geode/inspector/topology/section_surfaces_topology.h b/include/geode/inspector/topology/section_surfaces_topology.h index 3a4e3d5b..9c8f24e4 100644 --- a/include/geode/inspector/topology/section_surfaces_topology.h +++ b/include/geode/inspector/topology/section_surfaces_topology.h @@ -36,8 +36,8 @@ namespace geode namespace geode { - struct - opengeode_inspector_inspector_api SectionSurfacesTopologyInspectionResult + struct opengeode_inspector_inspector_api + SectionSurfacesTopologyInspectionResult { InspectionIssues< uuid > surfaces_not_meshed{ "uuids of Surfaces without mesh." From b8db9041b21183c8949978235f7f50c7488eebac Mon Sep 17 00:00:00 2001 From: benoitTHEBAULT Date: Wed, 10 Jul 2024 11:14:38 +0200 Subject: [PATCH 3/4] fix(ABI): update ABI From ef81a71164c23f8e96a048556c4ba53e0646ebb1 Mon Sep 17 00:00:00 2001 From: benoitTHEBAULT Date: Wed, 10 Jul 2024 11:18:56 +0200 Subject: [PATCH 4/4] fix(ABI): update ABI