summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Hofmann <Johannes.Hofmann@gmx.de>2008-05-02 15:48:58 +0200
committerJohannes Hofmann <Johannes.Hofmann@gmx.de>2008-05-02 15:48:58 +0200
commitbc36079638b4ff3d0b7b3476dc5125bb1fc38c91 (patch)
tree0b390378ef6cd311bb4f14f00e8bbd411a4dc931
parente4c3f1b8661cd3b1b4bc9e640b56c63ee234877f (diff)
fix rectilinear projection
-rw-r--r--src/lsq_rectilinear.mac7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lsq_rectilinear.mac b/src/lsq_rectilinear.mac
index 5bd7ac9..d1abf4e 100644
--- a/src/lsq_rectilinear.mac
+++ b/src/lsq_rectilinear.mac
@@ -2,8 +2,11 @@
* rectilinear (pinhole) projection model with distortion correction
*/
-x : tan(m_view - c_view)$
-y : tan(c_nick - m_nick)$
+a_v : m_view - c_view$
+a_h : c_nick - atan (tan (m_nick) / cos(a_v))$
+
+x : tan(a_v)$
+y : tan(a_h)$
x_rot : y * sin(c_tilt) + x * cos(c_tilt)+x0$
y_rot : y * cos(c_tilt) - x * sin(c_tilt)$
d : x_rot ^ 2 + y_rot ^ 2$