Makes willCollide() take Mesh argument

Author: tobbelobb

Diff for: build/root.build

@@ -1,11 +1,17 @@
 cxx.std = latest
+# We don't have modules yet
+#cxx.std = experimental
 
 using cxx
 
+# We don't have modules yet
+#assert $cxx.features.modules 'compiler does not support modules'
+
 hxx{*}: extension = h++
 ixx{*}: extension = i++
 txx{*}: extension = t++
 cxx{*}: extension = c++
+mxx{*}: extension = m++
 
 # The test target for cross-testing (running tests under Wine, etc).
 #

Diff for: linc/linc.c++

@@ -1,6 +1,6 @@
 #include <linc/linc.h++>
 
-auto willCollide(Stl const &mesh, Pivots const &pivots,
+auto willCollide(Mesh const &mesh, Pivots const &pivots,
                  SI::milli_metre_t<double> const &layerHeight) -> bool {
   (void)pivots;
   (void)mesh;

Diff for: linc/linc.h++

@@ -2,6 +2,6 @@
 #include <SI/length.h>
 
 #include <linc/params.h++>
-#include <linc/stl.h++>
+#include <linc/mesh.h++>
 
-[[nodiscard]] bool willCollide(Stl const &, Pivots const &, Millimeter const &);
+[[nodiscard]] bool willCollide(Mesh const &, Pivots const &, Millimeter const &);

Diff for: linc/main.c++

@@ -13,7 +13,7 @@ using namespace SI::literals;
 auto main(int argc, char *argv[]) -> int {
 
   // Parse the arguments...
-  if (not(std::set<int>{{3, 4}}.contains(argc))) {
+  if (not(argc == 3 or argc == 4)) {
     std::cerr << "Usage:\n"
               << *argv << " <3d-model> <params> [layer-height (mm)]\n";
     return 1;
@@ -25,11 +25,12 @@ auto main(int argc, char *argv[]) -> int {
   auto const layerHeight =
       Millimeter((argc > 3) ? std::stod(gsl::at(args, 3)) : 1.0);
 
-  Stl mesh{modelFileName};
-  if (not mesh.m_initialized) {
+  Stl const stl{modelFileName};
+  if (not stl.m_initialized) {
     std::cerr << "Failed to load " << modelFileName << '\n';
     return 1;
   }
+  Mesh const mesh{stl};
 
   if (not validateParamsFile(paramsFileName)) {
     std::cerr << "Validation of " << paramsFileName << " failed\n";

Diff for: linc/mesh.c++

@@ -2,8 +2,6 @@
 
 #include <linc/mesh.h++>
 
-using namespace mesh;
-
 Mesh::Mesh(Stl const &stl) {
   // Save vertices
   for (const auto &facet : stl.m_facets) {

Diff for: linc/mesh.h++

@@ -7,7 +7,6 @@
 #include <linc/mesh-types.h++>
 #include <linc/stl.h++>
 
-namespace mesh {
 // Describing an edge by indexing into a sequence of vertices.
 // An edge must have exactly two endpoints.
 using EdgeByVertexIterators = std::array<std::set<Vertex>::iterator, 2>;
@@ -95,4 +94,3 @@ public:
 
   Mesh(Stl const &stl);
 };
-} // namespace mesh

Diff for: linc/mesh.test.c++

@@ -4,8 +4,6 @@
 
 #include <linc/mesh.h++>
 
-using namespace mesh;
-
 auto main() -> int {
   try {
     {