fix manifold stuff (without geometry cache changes) (openscad#4993)

CMakeLists.txt

@@ -55,6 +55,7 @@ option(ENABLE_TBB "Enable support for oneAPI Threading Building Blocks." ON)
 option(ENABLE_CGAL "Enable CGAL." ON)
 option(ALLOW_BUNDLED_HIDAPI "Allow usage of bundled HIDAPI library (Windows only)." OFF)
 option(ENABLE_PYTHON "Enable experimental Python Interpreter" OFF)
+option(BUILD_SHARED_LIBS "Build shared library" OFF)
 include(CMakeDependentOption)
 cmake_dependent_option(APPLE_UNIX "Build OpenSCAD in Unix mode in MacOS X instead of an Apple Bundle" OFF "APPLE" OFF)
 cmake_dependent_option(ENABLE_QTDBUS "Enable DBus input driver for Qt5." ON "NOT HEADLESS" OFF)

src/geometry/GeometryEvaluator.cc

@@ -37,7 +37,6 @@
 #include <CGAL/Point_2.h>
 #endif
 #ifdef ENABLE_MANIFOLD
-#include "ManifoldGeometry.h"
 #include "manifoldutils.h"
 #endif
 

src/geometry/PolySetUtils.cc

@@ -4,7 +4,6 @@
 #include "Polygon2d.h"
 #include "printutils.h"
 #include "GeometryUtils.h"
-#include "Reindexer.h"
 #ifdef ENABLE_CGAL
 #include "cgalutils.h"
 #include "CGALHybridPolyhedron.h"
@@ -160,8 +159,8 @@ std::shared_ptr<const PolySet> getGeometryAsPolySet(const std::shared_ptr<const
   if (auto N = std::dynamic_pointer_cast<const CGAL_Nef_polyhedron>(geom)) {
     if (!N->isEmpty()) {
       if (auto ps = CGALUtils::createPolySetFromNefPolyhedron3(*N->p3)) {
-	ps->setConvexity(N->getConvexity());
-	return ps;
+        ps->setConvexity(N->getConvexity());
+        return ps;
       }
       LOG(message_group::Error, "Nef->PolySet failed.");
     }

src/geometry/boolean_utils.cc

@@ -23,14 +23,9 @@
 #include "progress.h"
 #include "node.h"
 
-#include "memory.h"
 #include "Reindexer.h"
 #include "GeometryUtils.h"
 
-#include <map>
-#include <queue>
-#include <unordered_set>
-
 #ifdef ENABLE_CGAL
 std::unique_ptr<PolySet> applyHull(const Geometry::Geometries& children)
 {

src/geometry/manifold/ManifoldGeometry.cc

@@ -5,7 +5,6 @@
 #include "PolySetUtils.h"
 #include "manifoldutils.h"
 #ifdef ENABLE_CGAL
-#include "cgal.h"
 #include "cgalutils.h"
 #endif
 
@@ -25,14 +24,13 @@ ManifoldGeometry::ManifoldGeometry(const std::shared_ptr<manifold::Manifold>& ma
   if (!manifold_) clear();
 }
 
-ManifoldGeometry::ManifoldGeometry(const ManifoldGeometry& other) : manifold_(other.manifold_) {}
-
 std::unique_ptr<Geometry> ManifoldGeometry::copy() const
 {
   return std::make_unique<ManifoldGeometry>(*this);
 }
 
 ManifoldGeometry& ManifoldGeometry::operator=(const ManifoldGeometry& other) {
+  if (this == &other) return *this;
   manifold_ = other.manifold_;
   return *this;
 }

src/geometry/manifold/ManifoldGeometry.h

@@ -17,7 +17,7 @@ class ManifoldGeometry : public Geometry
 
   ManifoldGeometry();
   ManifoldGeometry(const std::shared_ptr<manifold::Manifold>& object);
-  ManifoldGeometry(const ManifoldGeometry& other);
+  ManifoldGeometry(const ManifoldGeometry& other) = default;
   ManifoldGeometry& operator=(const ManifoldGeometry& other);
 
   [[nodiscard]] bool isEmpty() const override;

src/geometry/manifold/manifold-applyops-minkowski.cc

@@ -43,9 +43,9 @@ std::shared_ptr<const Geometry> applyMinkowskiManifold(const Geometry::Geometrie
     throw 0;
   };
 
-  CGAL::Timer t, t_tot;
   assert(children.size() >= 2);
   auto it = children.begin();
+  CGAL::Timer t_tot;
   t_tot.start();
   std::vector<std::shared_ptr<const Geometry>> operands = {it->second, std::shared_ptr<const Geometry>()};
 
@@ -81,7 +81,7 @@ std::shared_ptr<const Geometry> applyMinkowskiManifold(const Geometry::Geometrie
           part_points.emplace_back(getHullPoints(*poly));
         } else {
           Nef decomposed_nef(*poly);
-
+          CGAL::Timer t;
           t.start();
           CGAL::convex_decomposition_3(decomposed_nef);
 
@@ -186,6 +186,7 @@ std::shared_ptr<const Geometry> applyMinkowskiManifold(const Geometry::Geometrie
 
       if (it != std::next(children.begin())) operands[0].reset();
 
+      CGAL::Timer t;
       t.start();
       PRINTDB("Minkowski: Computing union of %d parts", result_parts.size());
       Geometry::Geometries fake_children;

src/geometry/manifold/manifold-applyops.cc

@@ -9,8 +9,6 @@
 #include "progress.h"
 #include "printutils.h"
 
-#include <queue>
-
 namespace ManifoldUtils {
 
 Location getLocation(const std::shared_ptr<const AbstractNode>& node)