Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2018-01-08 14:17:39 +0300
committerEnrico Turri <enricoturri@seznam.cz>2018-01-08 14:17:39 +0300
commitdfcb502ef46df5f18aa64c7e3ca6a06fb0ca1e05 (patch)
tree161216979d44a82b6e0bb8e2d8722d71d4d0a225 /xs/src/libslic3r
parentad5fcce6e4fd172cb105a71b9ef658338d742f56 (diff)
GCodeTimeEstimator - Fixed square roots of negative numbers
Diffstat (limited to 'xs/src/libslic3r')
-rw-r--r--xs/src/libslic3r/GCodeTimeEstimator.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/xs/src/libslic3r/GCodeTimeEstimator.cpp b/xs/src/libslic3r/GCodeTimeEstimator.cpp
index 2edbfeac5..b65ff555b 100644
--- a/xs/src/libslic3r/GCodeTimeEstimator.cpp
+++ b/xs/src/libslic3r/GCodeTimeEstimator.cpp
@@ -56,7 +56,9 @@ namespace Slic3r {
float GCodeTimeEstimator::Block::Trapezoid::speed_from_distance(float initial_feedrate, float distance, float acceleration)
{
- return ::sqrt(sqr(initial_feedrate) + 2.0f * acceleration * distance);
+ // to avoid invalid negative numbers due to numerical imprecision
+ float value = std::max(0.0f, sqr(initial_feedrate) + 2.0f * acceleration * distance);
+ return ::sqrt(value);
}
float GCodeTimeEstimator::Block::move_length() const
@@ -122,7 +124,9 @@ namespace Slic3r {
float GCodeTimeEstimator::Block::max_allowable_speed(float acceleration, float target_velocity, float distance)
{
- return ::sqrt(sqr(target_velocity) - 2.0f * acceleration * distance);
+ // to avoid invalid negative numbers due to numerical imprecision
+ float value = std::max(0.0f, sqr(target_velocity) - 2.0f * acceleration * distance);
+ return ::sqrt(value);
}
float GCodeTimeEstimator::Block::estimate_acceleration_distance(float initial_rate, float target_rate, float acceleration)