Skip to content

Commit

Permalink
Applied clang-format.
Browse files Browse the repository at this point in the history
  • Loading branch information
wawanbreton authored and github-actions[bot] committed Oct 10, 2023
1 parent 1f8df4c commit 90f8a8f
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 45 deletions.
4 changes: 2 additions & 2 deletions include/PrimeTower.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ class PrimeTower
void subtractFromSupport(SliceDataStorage& storage);

private:
ExtrusionMoves generatePaths_base(const Polygons &outer_poly, coord_t extra_radius, coord_t line_width);
ExtrusionMoves generatePaths_base(const Polygons& outer_poly, coord_t extra_radius, coord_t line_width);

ExtrusionMoves generatePaths_inset(const Polygons &outer_poly, coord_t line_width, coord_t initial_inset);
ExtrusionMoves generatePaths_inset(const Polygons& outer_poly, coord_t line_width, coord_t initial_inset);

/*!
* \see WipeTower::generatePaths
Expand Down
82 changes: 39 additions & 43 deletions include/SkirtBrim.h
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
//Copyright (c) 2023 UltiMaker
//CuraEngine is released under the terms of the AGPLv3 or higher.
// Copyright (c) 2023 UltiMaker
// CuraEngine is released under the terms of the AGPLv3 or higher.

#ifndef SKIRT_BRIM_H
#define SKIRT_BRIM_H

#include "utils/Coord_t.h"
#include "ExtruderTrain.h"
#include "settings/EnumSettings.h"
#include "sliceDataStorage.h"
#include "utils/Coord_t.h"

#include <variant>

namespace cura
namespace cura
{

class Polygons;
Expand All @@ -27,26 +27,25 @@ class SkirtBrim
*/
struct Offset
{
Offset
(
Offset(
const std::variant<Polygons*, int>& reference_outline_or_index,
const bool external_only,
const coord_t offset_value,
const coord_t total_offset,
const size_t inset_idx,
const int extruder_nr,
const bool is_last
) :
reference_outline_or_index(reference_outline_or_index),
external_only(external_only),
offset_value(offset_value),
total_offset(total_offset),
inset_idx(inset_idx),
extruder_nr(extruder_nr),
is_last(is_last)
{}

std::variant<Polygons*, int> reference_outline_or_index;
const bool is_last)
: reference_outline_or_index(reference_outline_or_index)
, external_only(external_only)
, offset_value(offset_value)
, total_offset(total_offset)
, inset_idx(inset_idx)
, extruder_nr(extruder_nr)
, is_last(is_last)
{
}

std::variant<Polygons*, int> reference_outline_or_index;
bool external_only; //!< Wether to only offset outward from the reference polygons
coord_t offset_value; //!< Distance by which to offset from the reference
coord_t total_offset; //!< Total distance from the model
Expand All @@ -58,15 +57,12 @@ class SkirtBrim
/*!
* Defines an order on offsets (potentially from different extruders) based on how far the offset is from the original outline.
*/
static inline const auto OffsetSorter
{
[](const Offset& a, const Offset& b)
{
// Use extruder_nr in case both extruders have the same offset settings.
return a.total_offset != b.total_offset ? a.total_offset < b.total_offset : a.extruder_nr < b.extruder_nr;
}
};

static inline const auto OffsetSorter{ [](const Offset& a, const Offset& b)
{
// Use extruder_nr in case both extruders have the same offset settings.
return a.total_offset != b.total_offset ? a.total_offset < b.total_offset : a.extruder_nr < b.extruder_nr;
} };

SliceDataStorage& storage; //!< Where to retrieve settings and store brim lines.
const EPlatformAdhesion adhesion_type; //!< Whether we are generating brim, skirt, or raft
const bool has_ooze_shield; //!< Whether the meshgroup has an ooze shield
Expand All @@ -85,17 +81,17 @@ class SkirtBrim
public:
/*!
* Precomputes some values used in several functions when calling \ref generate
*
*
* \param storage Storage containing the parts at the first layer.
*/
SkirtBrim(SliceDataStorage& storage);

/*!
* Generate skirt or brim (depending on parameters).
*
*
* When \p distance > 0 and \p count == 1 a skirt is generated, which has
* slightly different configuration. Otherwise, a brim is generated.
*
*
* \param storage Storage containing the parts at the first layer.
* \param first_layer_outline The outline to generate skirt or brim around.
* \param distance The distance of the first outset from the parts at the first
Expand All @@ -108,7 +104,7 @@ class SkirtBrim
private:
/*!
* Plan the offsets which we will be going to perform and put them in the right order.
*
*
* In order for brims of different materials to grow toward the middle,
* we need to perform the offsets alternatingly.
* We therefore first create all planned Offset objects,
Expand All @@ -120,7 +116,7 @@ class SkirtBrim

/*!
* Generate the primary skirt/brim of the one skirt_brim_extruder or of all extruders simultaneously.
*
*
* \param[in,out] all_brim_offsets The offsets to perform. Adjusted when the minimal length constraint isn't met yet.
* \param[in,out] covered_area The area of the first layer covered by model or generated brim lines.
* \param[in,out] allowed_areas_per_extruder The difference between the machine bed area (offsetted by the nozzle offset) and the covered_area.
Expand All @@ -130,9 +126,9 @@ class SkirtBrim

/*!
* Generate the brim inside the ooze shield and draft shield
*
*
* \warning Adjusts brim_covered_area
*
*
* \param storage Storage containing the parts at the first layer.
* \param[in,out] brim_covered_area The area that was covered with brim before (in) and after (out) adding the shield brims
* \param[in,out] allowed_areas_per_extruder The difference between the machine areas and the \p covered_area
Expand All @@ -154,10 +150,10 @@ class SkirtBrim

/*!
* The disallowed area around the internal holes of parts with other parts inside which would get an external brim.
*
*
* In order to prevent the external_only brim of a part inside another part to overlap with the internal holes of the outer part,
* we generate a disallowed area around those internal hole polygons.
*
*
* \param outline The full layer outlines
* \param extruder_nr The extruder for which to compute disallowed areas
* \return The disallowed areas
Expand All @@ -166,9 +162,9 @@ class SkirtBrim

/*!
* Generate a brim line with offset parameters given by \p offset from the \p starting_outlines and store it in the \ref storage.
*
*
* \warning Has side effects on \p covered_area, \p allowed_areas_per_extruder and \p total_length
*
*
* \param offset The parameters with which to perform the offset
* \param[in,out] covered_area The total area covered by the brims (and models) on the first layer.
* \param[in,out] allowed_areas_per_extruder The difference between the machine areas and the \p covered_area
Expand All @@ -179,11 +175,11 @@ class SkirtBrim

/*!
* Generate a skirt of extruders which don't yet comply with the minimum length requirement.
*
*
* This skirt goes directly adjacent to all primary brims.
*
*
* The skirt is stored in storage.skirt_brim.
*
*
* \param[in,out] covered_area The total area covered by the brims (and models) on the first layer.
* \param[in,out] allowed_areas_per_extruder The difference between the machine areas and the \p covered_area
* \param[in,out] total_length The total length of the brim lines for each extruder.
Expand All @@ -196,6 +192,6 @@ class SkirtBrim
*/
void generateSupportBrim();
};
}//namespace cura
} // namespace cura

#endif //SKIRT_BRIM_H
#endif // SKIRT_BRIM_H

0 comments on commit 90f8a8f

Please sign in to comment.