Negative diameter circle turtle support

This commit is contained in:
Joachim LF
2020-04-14 13:37:12 +02:00
committed by EmilieNumworks
parent dcfabf754d
commit c15bb3d893

View File

@@ -73,7 +73,7 @@ void Turtle::left(mp_float_t angle) {
void Turtle::circle(mp_int_t radius, mp_float_t angle) {
mp_float_t oldHeading = heading();
mp_float_t length = (angle > 0 ? 1 : -1) * angle * k_headingScale * radius;
mp_float_t length = (angle > 0 ? 1 : -1) * angle * k_headingScale * (radius > 0 ? 1 : -1) * radius;
if (length > 1) {
for (int i = 1; i < length; i++) {
mp_float_t progress = i / length;
@@ -82,7 +82,7 @@ void Turtle::circle(mp_int_t radius, mp_float_t angle) {
// Keyboard interruption. Return now to let MicroPython process it.
return;
}
setHeadingPrivate(oldHeading+angle*progress);
setHeadingPrivate(oldHeading+angle*progress*((radius>0) ? 1 : -1));
}
forward(1);
setHeading(oldHeading+angle);