zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

AP_Math: minor format fix to SCurve::advance_target_along_track

c415-sdk
Leonard Hall 4 years ago committed by Randy Mackay
parent
36f3fb316a
commit
3530d9121f
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libraries/AP_Math/SCurve.cpp

4
libraries/AP_Math/SCurve.cpp
Unescape View File

@ -493,8 +493,8 @@ bool SCurve::advance_target_along_track(SCurve &prev_leg, SCurve &next_leg, floa @@ -493,8 +493,8 @@ bool SCurve::advance_target_along_track(SCurve &prev_leg, SCurve &next_leg, floa
const float speed_min = MIN(get_speed_along_track(), next_leg.get_speed_along_track());
const float accel_min = MIN(get_accel_along_track(), next_leg.get_accel_along_track());
if ((get_time_remaining() < next_leg.time_end() * 0.5f) && (turn_pos.length() < wp_radius) &&
(Vector2f(turn_vel.x, turn_vel.y).length() < speed_min) &&
(Vector2f(turn_accel.x, turn_accel.y).length() < 2.0f*accel_min)) {
(Vector2f{turn_vel.x, turn_vel.y}.length() < speed_min) &&
(Vector2f{turn_accel.x, turn_accel.y}.length() < 2.0f*accel_min)) {
next_leg.move_from_pos_vel_accel(dt, target_pos, target_vel, target_accel);
}
} else if (!is_zero(next_leg.get_time_elapsed())) {

Write Preview
Loading…
Cancel
Save