summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan FitiƩ <jfitie@gmail.com>2017-07-27 09:56:53 +0200
committerJohan FitiƩ <jfitie@gmail.com>2017-07-27 09:56:53 +0200
commit30c09818748b9ed7e58500a41f57b49c97c3fa70 (patch)
tree92269d3771d5d770a3c5c71ad4ce2a29f21ed27e
parent94b9f2787ba30ce74a64b8cb1741f98fe0f7d6a6 (diff)
downloadnavit-30c09818748b9ed7e58500a41f57b49c97c3fa70.tar.gz
Variables for w and h
-rw-r--r--navit/transform.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/navit/transform.c b/navit/transform.c
index d488a87d2..eab4783d4 100644
--- a/navit/transform.c
+++ b/navit/transform.c
@@ -67,6 +67,8 @@ struct transformation {
int scale_shift;
int order;
int order_base;
+ int w = 240; // TODO
+ int h = 320; // TODO
};
#ifdef ENABLE_ROLL
@@ -91,8 +93,8 @@ transform_setup_matrix(struct transformation *t)
navit_float fac;
navit_float yawc=navit_cos(-M_PI*t->yaw/180);
navit_float yaws=navit_sin(-M_PI*t->yaw/180);
- navit_float pitchc=navit_cos(-M_PI*t->pitch*277/sqrt(240*320)/180); // Pitch corrected for window resolution
- navit_float pitchs=navit_sin(-M_PI*t->pitch*277/sqrt(240*320)/180); // sqrt(240*320)=277
+ navit_float pitchc=navit_cos(-M_PI*t->pitch*277/sqrt(t->w*t->h)/180); // Pitch corrected for window resolution
+ navit_float pitchs=navit_sin(-M_PI*t->pitch*277/sqrt(y->w*t->h)/180); // sqrt(240*320)=277
#ifdef ENABLE_ROLL
navit_float rollc=navit_cos(M_PI*t->roll/180);
navit_float rolls=navit_sin(M_PI*t->roll/180);