]> rtime.felk.cvut.cz Git - hubacji1/psp.git/commitdiff
Add (ccr, lf) x (p3, p4) computation
authorJiri Vlasak <hubacji1@fel.cvut.cz>
Tue, 7 Jul 2020 13:04:06 +0000 (15:04 +0200)
committerJiri Vlasak <hubacji1@fel.cvut.cz>
Tue, 7 Jul 2020 13:04:06 +0000 (15:04 +0200)
src/psp.cc

index 9b18fae9bb9b53a7b4a66fdaab89d2c820aabc05..99f5d3d71d1c1f0e460ce6fd287e291891cfee41 100644 (file)
@@ -545,7 +545,17 @@ void PSPlanner::fe_parallel()
                                 std::get<1>(cli2), std::get<2>(cli2),
                                 std::get<3>(cli2), std::get<4>(cli2)
                         );
-                        // TODO (ccr, lf) x (p3, p4)
+                        auto cli3 = ::intersect(
+                                ccrx, ccry, ccr_lf,
+                                this->ps().x3(), this->ps().y3(),
+                                this->ps().x4(), this->ps().y4()
+                        );
+                        double a3 = smaller_angle_of_two(
+                                this->cc().lfx(), this->cc().lfy(),
+                                ccrx, ccry,
+                                std::get<1>(cli3), std::get<2>(cli3),
+                                std::get<3>(cli3), std::get<4>(cli3)
+                        );
 {
         double rf = sqrt(
                 pow(this->cc().lfy() - ccry, 2)