From 23b59101ae6327e3d9957fd2b488dd6794af561c Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Thu, 25 Oct 2018 03:17:42 +0200 Subject: [PATCH] model orientation supported in Joukowsky --- conformal.cpp | 2 +- hypgraph.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/conformal.cpp b/conformal.cpp index dc70b6a7..5b30e623 100644 --- a/conformal.cpp +++ b/conformal.cpp @@ -599,7 +599,7 @@ namespace conformal { bool model_has_orientation() { return - among(pmodel, mdHalfplane, mdPolynomial, mdPolygonal, mdTwoPoint) || mdBandAny(); + among(pmodel, mdHalfplane, mdPolynomial, mdPolygonal, mdTwoPoint, mdJoukowsky, mdJoukowskyInverted) || mdBandAny(); } void model_menu() { diff --git a/hypgraph.cpp b/hypgraph.cpp index 70fa6e0d..eb1a1425 100644 --- a/hypgraph.cpp +++ b/hypgraph.cpp @@ -410,6 +410,7 @@ void applymodel(hyperpoint H, hyperpoint& ret) { ld x0, y0; x0 = H[0] / tz; y0 = H[1] / tz; + conformal::apply_orientation(x0, y0); ld r = hypot(x0, y0); ld c = x0 / r; ld s = y0 / r; @@ -421,6 +422,7 @@ void applymodel(hyperpoint H, hyperpoint& ret) { ret[0] = ret[0] / r2; ret[1] = -ret[1] / r2; } + conformal::apply_orientation(ret[1], ret[0]); ghcheck(ret,H); return; }