]> rtime.felk.cvut.cz Git - hubacji1/iamcar.git/commitdiff
Simplify final pose getter for forward parking
authorJiri Vlasak <hubacji1@fel.cvut.cz>
Mon, 27 May 2019 15:24:48 +0000 (17:24 +0200)
committerJiri Vlasak <hubacji1@fel.cvut.cz>
Mon, 27 May 2019 15:24:49 +0000 (17:24 +0200)
decision_control/slotplanner.cc

index 5026bbe5f9e3eabfa8dd4febd521379fd5059208..e949ad45729ece9ee9b89b28242dbf168e781034 100644 (file)
@@ -716,17 +716,10 @@ BicycleCar *ParallelSlot::getFPf()
                 ph += 2 * M_PI;
         float nx;
         float ny;
-        if (this->slotSide() == LEFT) {
-                nx = x + (BCAR_LENGTH - BCAR_WHEEL_BASE) / 2 * cos(ph);
-                ny = y + (BCAR_LENGTH - BCAR_WHEEL_BASE) / 2 * sin(ph);
-                x = nx + (BCAR_DIAG_RRADI) * cos(h);
-                y = ny + (BCAR_DIAG_RRADI) * sin(h);
-        } else {
-                nx = x + (BCAR_LENGTH - BCAR_WHEEL_BASE) / 2 * cos(ph);
-                ny = y + (BCAR_LENGTH - BCAR_WHEEL_BASE) / 2 * sin(ph);
-                x = nx + (BCAR_DIAG_RRADI) * cos(h);
-                y = ny + (BCAR_DIAG_RRADI) * sin(h);
-        }
+        nx = x + (BCAR_LENGTH - BCAR_WHEEL_BASE) / 2 * cos(ph);
+        ny = y + (BCAR_LENGTH - BCAR_WHEEL_BASE) / 2 * sin(ph);
+        x = nx + (BCAR_DIAG_RRADI) * cos(h);
+        y = ny + (BCAR_DIAG_RRADI) * sin(h);
         return new BicycleCar(x, y, ph);
 }