NP 207 conan wasm package (#2084)

.github/workflows/conan-package.yml

@@ -54,24 +54,32 @@ jobs:
 
   conan-package-create-macos:
     needs: [ conan-recipe-version, conan-package-export ]
-    if: ${{ ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || github.event_name == 'pull_request') }}
+    if: ${{ ((github.event_name == 'push' && (github.ref_name == 'main' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || github.event_name == 'pull_request') }}
     uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-macos.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
 
   conan-package-create-windows:
     needs: [ conan-recipe-version, conan-package-export ]
-    if: ${{ ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || github.event_name == 'pull_request') }}
+    if: ${{ ((github.event_name == 'push' && (github.ref_name == 'main' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || github.event_name == 'pull_request') }}
     uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-windows.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
 
   conan-package-create-linux:
     needs: [ conan-recipe-version, conan-package-export ]
-    if: ${{ ((github.event_name == 'push' && (github.ref_name == 'main' || github.ref_name == 'master' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || github.event_name == 'pull_request') }}
+    if: ${{ ((github.event_name == 'push' && (github.ref_name == 'main' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) || github.event_name == 'pull_request') }}
     uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-linux.yml@main
     with:
       recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
     secrets: inherit
+
+  conan-package-create-wasm:
+    needs: [ conan-recipe-version, conan-package-export ]
+    if: ${{ (github.event_name == 'push' && (github.ref_name == 'main' || needs.conan-recipe-version.outputs.is_release_branch == 'true')) }}
+    uses: ultimaker/cura-workflows/.github/workflows/conan-package-create-wasm.yml@main
+    with:
+      recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }}
+    secrets: inherit

conanfile.py

@@ -217,6 +217,9 @@ def build(self):
                 self.run(f"sentry-cli --auth-token {os.environ['SENTRY_TOKEN']} releases set-commits -o {sentry_org} -p {sentry_project} --commit \"Ultimaker/CuraEngine@{self.conan_data['commit']}\" {self.version}")
                 self.run(f"sentry-cli --auth-token {os.environ['SENTRY_TOKEN']} releases finalize -o {sentry_org} -p {sentry_project} {self.version}")
 
+    def deploy(self):
+        copy(self, "CuraEngine*", src=os.path.join(self.package_folder, "bin"), dst=self.install_folder)
+
     def package(self):
         match self.settings.os:
             case "Windows":

include/BeadingStrategy/LimitedBeadingStrategy.h

@@ -35,7 +35,7 @@ class LimitedBeadingStrategy : public BeadingStrategy
     coord_t getOptimalThickness(coord_t bead_count) const override;
     coord_t getTransitionThickness(coord_t lower_bead_count) const override;
     coord_t getOptimalBeadCount(coord_t thickness) const override;
-    virtual std::string toString() const override;
+    std::string toString() const override;
 
     coord_t getTransitioningLength(coord_t lower_bead_count) const override;
 

include/BeadingStrategy/OuterWallInsetBeadingStrategy.h

@@ -25,7 +25,7 @@ class OuterWallInsetBeadingStrategy : public BeadingStrategy
     coord_t getOptimalBeadCount(coord_t thickness) const override;
     coord_t getTransitioningLength(coord_t lower_bead_count) const override;
 
-    virtual std::string toString() const;
+    std::string toString() const override;
 
 private:
     BeadingStrategyPtr parent_;

include/BeadingStrategy/RedistributeBeadingStrategy.h

@@ -45,7 +45,7 @@ class RedistributeBeadingStrategy : public BeadingStrategy
     coord_t getTransitioningLength(coord_t lower_bead_count) const override;
     double getTransitionAnchorPos(coord_t lower_bead_count) const override;
 
-    virtual std::string toString() const;
+    std::string toString() const override;
 
 protected:
     /*!

include/BeadingStrategy/WideningBeadingStrategy.h

@@ -27,14 +27,14 @@ class WideningBeadingStrategy : public BeadingStrategy
 
     virtual ~WideningBeadingStrategy() override = default;
 
-    virtual Beading compute(coord_t thickness, coord_t bead_count) const override;
-    virtual coord_t getOptimalThickness(coord_t bead_count) const override;
-    virtual coord_t getTransitionThickness(coord_t lower_bead_count) const override;
-    virtual coord_t getOptimalBeadCount(coord_t thickness) const override;
-    virtual coord_t getTransitioningLength(coord_t lower_bead_count) const override;
-    virtual double getTransitionAnchorPos(coord_t lower_bead_count) const override;
-    virtual std::vector<coord_t> getNonlinearThicknesses(coord_t lower_bead_count) const override;
-    virtual std::string toString() const override;
+    Beading compute(coord_t thickness, coord_t bead_count) const override;
+    coord_t getOptimalThickness(coord_t bead_count) const override;
+    coord_t getTransitionThickness(coord_t lower_bead_count) const override;
+    coord_t getOptimalBeadCount(coord_t thickness) const override;
+    coord_t getTransitioningLength(coord_t lower_bead_count) const override;
+    double getTransitionAnchorPos(coord_t lower_bead_count) const override;
+    std::vector<coord_t> getNonlinearThicknesses(coord_t lower_bead_count) const override;
+    std::string toString() const override;
 
 protected:
     BeadingStrategyPtr parent_;

src/BeadingStrategy/BeadingStrategyFactory.cpp

@@ -41,22 +41,22 @@ BeadingStrategyPtr BeadingStrategyFactory::makeStrategy(
         wall_add_middle_threshold,
         inward_distributed_center_wall_count);
     spdlog::debug("Applying the Redistribute meta-strategy with outer-wall width = {}, inner-wall width = {}", preferred_bead_width_outer, preferred_bead_width_inner);
-    ret = make_unique<RedistributeBeadingStrategy>(preferred_bead_width_outer, minimum_variable_line_ratio, move(ret));
+    ret = make_unique<RedistributeBeadingStrategy>(preferred_bead_width_outer, minimum_variable_line_ratio, std::move(ret));
 
     if (print_thin_walls)
     {
         spdlog::debug("Applying the Widening Beading meta-strategy with minimum input width {} and minimum output width {}.", min_feature_size, min_bead_width);
-        ret = make_unique<WideningBeadingStrategy>(move(ret), min_feature_size, min_bead_width);
+        ret = make_unique<WideningBeadingStrategy>(std::move(ret), min_feature_size, min_bead_width);
     }
     if (outer_wall_offset > 0)
     {
         spdlog::debug("Applying the OuterWallOffset meta-strategy with offset = {}", outer_wall_offset);
-        ret = make_unique<OuterWallInsetBeadingStrategy>(outer_wall_offset, move(ret));
+        ret = make_unique<OuterWallInsetBeadingStrategy>(outer_wall_offset, std::move(ret));
     }
 
     // Apply the LimitedBeadingStrategy last, since that adds a 0-width marker wall which other beading strategies shouldn't touch.
     spdlog::debug("Applying the Limited Beading meta-strategy with maximum bead count = {}", max_bead_count);
-    ret = make_unique<LimitedBeadingStrategy>(max_bead_count, move(ret));
+    ret = make_unique<LimitedBeadingStrategy>(max_bead_count, std::move(ret));
     return ret;
 }
 } // namespace cura

src/slicer.cpp

@@ -13,6 +13,7 @@
 #include "Application.h"
 #include "Slice.h"
 #include "geometry/OpenPolyline.h"
+#include "geometry/SingleShape.h" // Needed in order to call splitIntoParts()
 #include "plugins/slots.h"
 #include "raft.h"
 #include "settings/AdaptiveLayerHeights.h"