|
@ -290,8 +290,8 @@ void GcodeSuite::G2_G3(const bool clockwise) { |
|
|
len = d2.magnitude(), // Distance to mid-point of move from current
|
|
|
len = d2.magnitude(), // Distance to mid-point of move from current
|
|
|
h2 = (r - len) * (r + len), // factored to reduce rounding error
|
|
|
h2 = (r - len) * (r + len), // factored to reduce rounding error
|
|
|
h = (h2 >= 0) ? SQRT(h2) : 0.0f; // Distance to the arc pivot-point from midpoint
|
|
|
h = (h2 >= 0) ? SQRT(h2) : 0.0f; // Distance to the arc pivot-point from midpoint
|
|
|
const xy_pos_t s = { -d2.y, d2.x } / len; // Unit vector along perpendicular bisector
|
|
|
const xy_pos_t s = { -d2.y, d2.x }; // Perpendicular bisector. (Divide by len for unit vector.)
|
|
|
arc_offset = d2 + s * e * h; // The calculated offset (mid-point if |r| <= len)
|
|
|
arc_offset = d2 + s / len * e * h; // The calculated offset (mid-point if |r| <= len)
|
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|