mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-07-23 06:33:57 -06:00
b83e16dbdd
* Fix calls to depreciated wxPen constructor * Fix use of wxTimerEvent * Fix unrecognized character escape sequence * Fix signed/unsigned mismatch At least as much as possible without significantly altering parts of the application * Clean unreferenced variables * fix mistyped namespace selector * Update deprecated calls * Fix preprocessor statement * Remove empty switch statements * Change int vector used as bool to bool vector * Remove empty control statements and related unused code * Change multi character constant to string constant * Fix discarded return value json::parse was being called on the object, rather than statically like it should be. Also, the value was not being captured. * Rename ICON_SIZE def used by MultiMachine By having the definition in the header, it causes issues when other files define ICON_SIZE. By renaming it to MM_ICON_SIZE, this lessens the issue. It would probably be ideal to have the definitions in the respective .cpp that use them, but it would make it less convenient to update the values if needed in the future. * Remove unused includes * Fix linux/macOS compilation * Hide unused-function errors on non-Windows systems * Disable signed/unsigned comparison mismatch error * Remove/Disable more unused variables Still TODO: check double for loop in Print.cpp * Remove unused variable that was missed * Remove unused variables in libraries in the src folder * Apply temporary fix for subobject linkage error * Remove/Disable last set of unused variables reported by GCC * remove redundant for loop * fix misspelled ifdef check * Update message on dialog * Fix hard-coded platform specific modifier keys * Remove duplicate for loop * Disable -Wmisleading-indentation warning * disable -Wswitch warning * Remove unused local typedefs * Fix -Wunused-value * Fix pragma error on Windows from subobject linkage fix * Fix -Waddress * Fix null conversions (-Wconversion-null) --------- Co-authored-by: SoftFever <softfeverever@gmail.com>
78 lines
2.5 KiB
C++
78 lines
2.5 KiB
C++
//Copyright (c) 2022 Ultimaker B.V.
|
|
//CuraEngine is released under the terms of the AGPLv3 or higher.
|
|
|
|
|
|
#include "BeadingStrategy.hpp"
|
|
#include "Point.hpp"
|
|
|
|
namespace Slic3r::Arachne
|
|
{
|
|
|
|
BeadingStrategy::BeadingStrategy(coord_t optimal_width, double wall_split_middle_threshold, double wall_add_middle_threshold, coord_t default_transition_length, float transitioning_angle)
|
|
: optimal_width(optimal_width)
|
|
, wall_split_middle_threshold(wall_split_middle_threshold)
|
|
, wall_add_middle_threshold(wall_add_middle_threshold)
|
|
, default_transition_length(default_transition_length)
|
|
, transitioning_angle(transitioning_angle)
|
|
{
|
|
name = "Unknown";
|
|
}
|
|
|
|
BeadingStrategy::BeadingStrategy(const BeadingStrategy &other)
|
|
: optimal_width(other.optimal_width)
|
|
, wall_split_middle_threshold(other.wall_split_middle_threshold)
|
|
, wall_add_middle_threshold(other.wall_add_middle_threshold)
|
|
, default_transition_length(other.default_transition_length)
|
|
, transitioning_angle(other.transitioning_angle)
|
|
, name(other.name)
|
|
{}
|
|
|
|
coord_t BeadingStrategy::getTransitioningLength(coord_t lower_bead_count) const
|
|
{
|
|
if (lower_bead_count == 0)
|
|
return scaled<coord_t>(0.01);
|
|
return default_transition_length;
|
|
}
|
|
|
|
float BeadingStrategy::getTransitionAnchorPos(coord_t lower_bead_count) const
|
|
{
|
|
coord_t lower_optimum = getOptimalThickness(lower_bead_count);
|
|
coord_t transition_point = getTransitionThickness(lower_bead_count);
|
|
coord_t upper_optimum = getOptimalThickness(lower_bead_count + 1);
|
|
return 1.0 - float(transition_point - lower_optimum) / float(upper_optimum - lower_optimum);
|
|
}
|
|
|
|
std::vector<coord_t> BeadingStrategy::getNonlinearThicknesses(coord_t lower_bead_count) const
|
|
{
|
|
return {};
|
|
}
|
|
|
|
std::string BeadingStrategy::toString() const
|
|
{
|
|
return name;
|
|
}
|
|
|
|
double BeadingStrategy::getSplitMiddleThreshold() const
|
|
{
|
|
return wall_split_middle_threshold;
|
|
}
|
|
|
|
double BeadingStrategy::getTransitioningAngle() const
|
|
{
|
|
return transitioning_angle;
|
|
}
|
|
|
|
coord_t BeadingStrategy::getOptimalThickness(coord_t bead_count) const
|
|
{
|
|
return optimal_width * bead_count;
|
|
}
|
|
|
|
coord_t BeadingStrategy::getTransitionThickness(coord_t lower_bead_count) const
|
|
{
|
|
const coord_t lower_ideal_width = getOptimalThickness(lower_bead_count);
|
|
const coord_t higher_ideal_width = getOptimalThickness(lower_bead_count + 1);
|
|
const double threshold = lower_bead_count % 2 == 1 ? wall_split_middle_threshold : wall_add_middle_threshold;
|
|
return lower_ideal_width + threshold * (higher_ideal_width - lower_ideal_width);
|
|
}
|
|
|
|
} // namespace Slic3r::Arachne
|