Set lightning generator as a member of infill generator

CURA-12250

Author: wawanbreton

include/FffGcodeWriter.h

@@ -375,58 +375,6 @@ class FffGcodeWriter : public NoCopy
         const SliceLayerPart& part,
         LayerPlan& gcode_layer) const;
 
-    /*!
-     * \brief Add infill for a given part in a layer plan.
-     *
-     * \param gcodeLayer The initial planning of the gcode of the layer.
-     * \param mesh The mesh for which to add to the layer plan \p gcodeLayer.
-     * \param extruder_nr The extruder for which to print all features of the
-     * mesh which should be printed with this extruder.
-     * \param mesh_config the line config with which to print a print feature.
-     * \param part The part for which to create gcode.
-     * \return Whether this function added anything to the layer plan.
-     */
-    bool processInfill(
-        const SliceDataStorage& storage,
-        LayerPlan& gcodeLayer,
-        const SliceMeshStorage& mesh,
-        const size_t extruder_nr,
-        const MeshPathConfigs& mesh_config,
-        const SliceLayerPart& part) const;
-
-    /*!
-     * \brief Add thicker (multiple layers) sparse infill for a given part in a
-     * layer plan.
-     *
-     * \param gcodeLayer The initial planning of the gcode of the layer.
-     * \param mesh The mesh for which to add to the layer plan \p gcodeLayer.
-     * \param extruder_nr The extruder for which to print all features of the
-     * mesh which should be printed with this extruder.
-     * \param mesh_config The line config with which to print a print feature.
-     * \param part The part for which to create gcode.
-     * \return Whether this function added anything to the layer plan.
-     */
-    bool processMultiLayerInfill(LayerPlan& gcodeLayer, const SliceMeshStorage& mesh, const size_t extruder_nr, const MeshPathConfigs& mesh_config, const SliceLayerPart& part)
-        const;
-
-    /*!
-     * \brief Add normal sparse infill for a given part in a layer.
-     * \param gcodeLayer The initial planning of the gcode of the layer.
-     * \param mesh The mesh for which to add to the layer plan \p gcodeLayer.
-     * \param extruder_nr The extruder for which to print all features of the
-     * mesh which should be printed with this extruder
-     * \param mesh_config The line config with which to print a print feature.
-     * \param part The part for which to create gcode.
-     * \return Whether this function added anything to the layer plan.
-     */
-    bool processSingleLayerInfill(
-        const SliceDataStorage& storage,
-        LayerPlan& gcodeLayer,
-        const SliceMeshStorage& mesh,
-        const size_t extruder_nr,
-        const MeshPathConfigs& mesh_config,
-        const SliceLayerPart& part) const;
-
     /*!
      * Generate the insets for the walls of a given layer part.
      * \param[in] storage where the slice data is stored.

include/feature_generation/FeatureGenerator.h

@@ -21,6 +21,8 @@ class FeatureGenerator
 
     virtual bool isActive() const = 0;
 
+    virtual void preCalculateData() {};
+
     virtual void generateFeatures(const SliceDataStorage& storage, const LayerPlanPtr& layer_plan, const std::vector<ExtruderPlanPtr>& extruder_plans) const = 0;
 };
 

include/feature_generation/MeshInfillGenerator.h

@@ -10,13 +10,16 @@
 namespace cura
 {
 
+class LightningGenerator;
 class Shape;
 
 class MeshInfillGenerator : public MeshFeatureGenerator
 {
 public:
     explicit MeshInfillGenerator(const std::shared_ptr<SliceMeshStorage>& mesh);
 
+    void preCalculateData() override;
+
     bool isActive() const override;
 
 protected:
@@ -55,6 +58,7 @@ class MeshInfillGenerator : public MeshFeatureGenerator
 
 private:
     const coord_t infill_line_distance_;
+    std::shared_ptr<LightningGenerator> lightning_generator_; //!< Pre-computed structure for Lightning type infill
 };
 
 } // namespace cura

include/infill/LightningGenerator.h

@@ -43,7 +43,7 @@ class LightningGenerator // "Just like Nicola used to make!"
      * already be calculated at this point.
      * \param mesh The mesh to generate infill for.
      */
-    LightningGenerator(const SliceMeshStorage& mesh);
+    LightningGenerator(const std::shared_ptr<SliceMeshStorage>& mesh);
 
     /*!
      * Get a tree of paths generated for a certain layer of the mesh.
@@ -65,12 +65,12 @@ class LightningGenerator // "Just like Nicola used to make!"
      * only when support is generated. For this pattern, we also need to
      * generate overhang areas for the inside of the model.
      */
-    void generateInitialInternalOverhangs(const SliceMeshStorage& mesh);
+    void generateInitialInternalOverhangs(const std::shared_ptr<SliceMeshStorage>& mesh);
 
     /*!
      * Calculate the tree structure of all layers.
      */
-    void generateTrees(const SliceMeshStorage& mesh);
+    void generateTrees(const std::shared_ptr<SliceMeshStorage>& mesh);
 
     /*!
      * How far each piece of infill can support skin in the layer above.

include/sliceDataStorage.h

@@ -30,7 +30,6 @@ namespace cura
 
 class Mesh;
 class SierpinskiFillProvider;
-class LightningGenerator;
 class PrimeTower;
 
 /*!
@@ -321,8 +320,6 @@ class SliceMeshStorage
     std::shared_ptr<SubDivCube> base_subdiv_cube;
     std::shared_ptr<SierpinskiFillProvider> cross_fill_provider; //!< the fractal pattern for the cross (3d) filling pattern
 
-    std::shared_ptr<LightningGenerator> lightning_generator; //!< Pre-computed structure for Lightning type infill
-
     RetractionAndWipeConfig retraction_wipe_config; //!< Per-Object retraction and wipe settings.
     std::shared_ptr<ZSeamConfig> seam_config;