Properly generate mesh insets

CURA-12250

Author: wawanbreton

CMakeLists.txt

@@ -130,6 +130,7 @@ set(engine_SRCS # Except main.cpp.
         include/print_operation/ContinuousExtruderMoveSequencePtr.h
         include/print_operation/ExtruderPlanPtr.h
         include/print_operation/FeatureExtrusionPtr.h
+        include/print_operation/LayerPlanPtr.h
         include/print_operation/PrintOperationPtr.h
         src/print_operation/ContinuousExtruderMoveSequence.cpp include/print_operation/ContinuousExtruderMoveSequence.h
         src/print_operation/ExtruderMove.cpp include/print_operation/ExtruderMove.h

include/feature_generation/FeatureGenerator.h

@@ -6,6 +6,7 @@
 #include <vector>
 
 #include "print_operation/ExtruderPlanPtr.h"
+#include "print_operation/LayerPlanPtr.h"
 
 namespace cura
 {
@@ -20,7 +21,7 @@ class FeatureGenerator
 
     virtual bool isActive() const = 0;
 
-    virtual void generateFeatures(const SliceDataStorage& storage, const LayerIndex& layer_index, const std::vector<ExtruderPlanPtr>& extruder_plans) const = 0;
+    virtual void generateFeatures(const SliceDataStorage& storage, const LayerPlanPtr& layer_plan, const std::vector<ExtruderPlanPtr>& extruder_plans) const = 0;
 };
 
 } // namespace cura

include/feature_generation/MeshFeatureGenerator.h

@@ -18,13 +18,13 @@ class MeshFeatureGenerator : public FeatureGenerator
 
     bool isActive() const override;
 
-    void generateFeatures(const SliceDataStorage& storage, const LayerIndex& layer_index, const std::vector<ExtruderPlanPtr>& extruder_plans) const final;
+    void generateFeatures(const SliceDataStorage& storage, const LayerPlanPtr& layer_plan, const std::vector<ExtruderPlanPtr>& extruder_plans) const final;
 
 protected:
     std::shared_ptr<SliceMeshStorage> getMesh() const;
 
     virtual void
-        generateFeatures(const SliceDataStorage& storage, const LayerIndex& layer_index, const std::vector<ExtruderPlanPtr>& extruder_plans, const SliceLayerPart& part) const
+        generateFeatures(const SliceDataStorage& storage, const LayerPlanPtr& layer_plan, const std::vector<ExtruderPlanPtr>& extruder_plans, const SliceLayerPart& part) const
         = 0;
 
 private:

include/feature_generation/MeshInsetsGenerator.h

@@ -18,7 +18,7 @@ class MeshInsetsGenerator : public MeshFeatureGenerator
     bool isActive() const override;
 
 protected:
-    void generateFeatures(const SliceDataStorage& storage, const LayerIndex& layer_index, const std::vector<ExtruderPlanPtr>& extruder_plans, const SliceLayerPart& part)
+    void generateFeatures(const SliceDataStorage& storage, const LayerPlanPtr& layer_plan, const std::vector<ExtruderPlanPtr>& extruder_plans, const SliceLayerPart& part)
         const override;
 };
 

include/print_operation/ContinuousExtruderMoveSequence.h

@@ -1,8 +1,7 @@
 // Copyright (c) 2024 UltiMaker
 // CuraEngine is released under the terms of the AGPLv3 or higher
 
-#ifndef PATHPLANNING_CONTINUOUSEXTRUDERMOVESEQUENCE_H
-#define PATHPLANNING_CONTINUOUSEXTRUDERMOVESEQUENCE_H
+#pragma once
 
 #include "GCodePathConfig.h"
 #include "SpaceFillType.h"
@@ -25,16 +24,10 @@ class ContinuousExtruderMoveSequence : public PrintOperationSequence
 public:
     explicit ContinuousExtruderMoveSequence(bool closed, const Point3LL& start_position = Point3LL());
 
-    void appendExtruderMove(const Point3LL& position, const Ratio& line_width_ratio = 1.0_r);
+    void appendExtruderMove(const std::shared_ptr<ExtruderMove>& extruder_move);
 
     std::optional<Point3LL> findStartPosition() const override;
 
-    coord_t getZOffset() const;
-
-    const Ratio& getSpeedFactor() const;
-
-    const Ratio& getSpeedBackPressureFactor() const;
-
     bool isClosed() const;
 
     void reorderToEndWith(const std::shared_ptr<ExtruderMove>& extruder_move);
@@ -43,15 +36,7 @@ class ContinuousExtruderMoveSequence : public PrintOperationSequence
 
 private:
     Point3LL start_position_;
-    bool closed_;
-    coord_t z_offset_{ 0 }; //<! Vertical offset from 'full' layer height, applied to the whole path (can be different from the one in the config)
-    std::shared_ptr<const SliceMeshStorage> mesh_; //!< Which mesh this path belongs to, if any. If it's not part of any mesh, the mesh should be nullptr;
-    SpaceFillType space_fill_type_{ SpaceFillType::None }; //!< The type of space filling of which this path is a part
-    Ratio speed_factor_{ 1.0 }; //!< A speed factor that is multiplied with the travel speed. This factor can be used to change the travel speed.
-    Ratio speed_back_pressure_factor_{ 1.0 }; // <! The factor the (non-travel) speed should be multiplied with as a consequence of back pressure compensation.
-    double fan_speed_{ GCodePathConfig::FAN_SPEED_DEFAULT }; //!< fan speed override for this path, value should be within range 0-100 (inclusive) and ignored otherwise
+    const bool closed_;
 };
 
 } // namespace cura
-
-#endif // PATHPLANNING_CONTINUOUSEXTRUDERMOVESEQUENCE_H

include/print_operation/ExtrusionMove.h

@@ -1,27 +1,28 @@
 // Copyright (c) 2024 UltiMaker
 // CuraEngine is released under the terms of the AGPLv3 or higher
 
-#ifndef PATHPLANNING_EXTRUSIONMOVE_H
-#define PATHPLANNING_EXTRUSIONMOVE_H
+#pragma once
+
+#include <settings/types/Ratio.h>
+#include <settings/types/Velocity.h>
 
 #include "print_operation/ExtruderMove.h"
-#include "settings/types/Ratio.h"
 
 namespace cura
 {
 
 class ExtrusionMove : public ExtruderMove
 {
 public:
-    explicit ExtrusionMove(const Point3LL& position, const coord_t line_width_start, const std::optional<coord_t>& line_width_end = std::nullopt);
+    explicit ExtrusionMove(const Point3LL& position, const coord_t line_width_start, const Velocity& speed, const std::optional<coord_t>& line_width_end = std::nullopt);
 
     void write(PlanExporter& exporter) const override;
 
 private:
     coord_t line_width_start_{ 0 };
     coord_t line_width_end_{ 0 };
+    Velocity speed_;
+    Ratio flow_ratio_{ 1.0_r };
 };
 
 } // namespace cura
-
-#endif // PATHPLANNING_EXTRUSIONMOVE_H

include/print_operation/FeatureExtrusion.h

@@ -5,7 +5,6 @@
 #define PATHPLANNING_FEATUREEXTRUSION_H
 
 #include "GCodePathConfig.h"
-#include "geometry/Point3LL.h"
 #include "print_operation/ContinuousExtruderMoveSequencePtr.h"
 #include "print_operation/PrintOperationSequence.h"
 
@@ -15,27 +14,17 @@ namespace cura
 class FeatureExtrusion : public PrintOperationSequence
 {
 public:
-    explicit FeatureExtrusion(const GCodePathConfig& config);
+    explicit FeatureExtrusion(const PrintFeatureType type, const coord_t nominal_line_width);
 
     void appendExtruderMoveSequence(const ContinuousExtruderMoveSequencePtr& extruder_move_sequence, bool check_non_empty = true);
 
-    const Velocity& getSpeed() const;
+    PrintFeatureType getType() const;
 
-    double getExtrusionMM3perMM() const;
-
-    PrintFeatureType getPrintFeatureType() const;
-
-    coord_t getLineWidth() const;
-
-private:
-    const Ratio& getFlow() const;
-
-    const Ratio& getWidthFactor() const;
+    coord_t getNominalLineWidth() const;
 
 private:
-    GCodePathConfig config_; //!< The configuration settings of the path.
-    Ratio flow_{ 1.0 }; //!< A type-independent flow configuration
-    Ratio width_factor_{ 1.0 }; //!< Adjustment to the line width. Similar to flow, but causes the speed_back_pressure_factor to be adjusted.
+    const PrintFeatureType type_;
+    const coord_t nominal_line_width_;
 };
 
 } // namespace cura

include/print_operation/LayerPlan.h

@@ -27,11 +27,11 @@ class LayerPlan : public PrintOperationSequence
 
     coord_t getThickness() const;
 
-    void write(PlanExporter& exporter) const override;
+    const std::shared_ptr<PathConfigStorage>& getConfigsStorage() const;
 
-    std::optional<Point3LL> findExtruderStartPosition() const;
+    void write(PlanExporter& exporter) const override;
 
-    Point3LL getAbsolutePosition(const ContinuousExtruderMoveSequence& move_sequence, const Point3LL& relative_position) const;
+    Point3LL getAbsolutePosition(const Point3LL& relative_position) const;
 
 private:
     const LayerIndex layer_index_;

include/print_operation/LayerPlanPtr.h

@@ -0,0 +1,16 @@
+// Copyright (c) 2024 UltiMaker
+// CuraEngine is released under the terms of the AGPLv3 or higher
+
+#pragma once
+
+#include <memory>
+
+namespace cura
+{
+
+class LayerPlan;
+
+using LayerPlanPtr = std::shared_ptr<LayerPlan>;
+using ConstLayerPlanPtr = std::shared_ptr<const LayerPlan>;
+
+} // namespace cura

include/print_operation/MeshFeatureExtrusion.h

@@ -12,7 +12,7 @@ namespace cura
 class MeshFeatureExtrusion : public FeatureExtrusion
 {
 public:
-    explicit MeshFeatureExtrusion(const GCodePathConfig& config, const std::shared_ptr<const SliceMeshStorage>& mesh);
+    explicit MeshFeatureExtrusion(const PrintFeatureType type, const coord_t nominal_line_width, const std::shared_ptr<const SliceMeshStorage>& mesh);
 
     const std::shared_ptr<const SliceMeshStorage>& getMesh() const;