diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-03-20 17:37:32 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2009-03-20 17:37:32 +0000 |
commit | aed11dd9b8ec74fd4c03ece6fa0a6941826aa0fb (patch) | |
tree | 625dd7345e0d3d8d078ff66b309f7412194b24fb /navit/transform.c | |
parent | 99a067800d3f022654d188a0773529e97761d175 (diff) | |
download | navit-aed11dd9b8ec74fd4c03ece6fa0a6941826aa0fb.tar.gz |
Fix:Core:Added functions to get/set hog and order base
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@2149 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit/transform.c')
-rw-r--r-- | navit/transform.c | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/navit/transform.c b/navit/transform.c index 44d499e31..ddd5fa071 100644 --- a/navit/transform.c +++ b/navit/transform.c @@ -59,6 +59,7 @@ struct transformation { double scale; /* Scale factor */ int scale_shift; int order; + int order_base; }; static void @@ -80,7 +81,8 @@ transform_setup_matrix(struct transformation *t) dbg(1,"yaw=%d pitch=%d center=0x%x,0x%x\n", t->yaw, t->pitch, t->map_center.x, t->map_center.y); t->scale_shift=0; - t->order=14; + t->order=t->order_base; + dbg(0,"scale_shift=%d order_base=%d scale=%f fac=%f\n", t->scale_shift, t->order_base,t->scale,fac); if (t->scale >= 1) { scale=t->scale; } else { @@ -94,7 +96,7 @@ transform_setup_matrix(struct transformation *t) scale >>= 1; } fac=(1 << POST_SHIFT) * (1 << t->scale_shift) / t->scale; - dbg(1,"scale_shift=%d order=%d scale=%f fac=%f\n", t->scale_shift, t->order,t->scale,fac); + dbg(0,"scale_shift=%d order=%d scale=%f fac=%f\n", t->scale_shift, t->order,t->scale,fac); #ifdef ENABLE_ROLL t->m00=rollc*yawc*fac; @@ -157,6 +159,7 @@ transform_new(void) this_=g_new0(struct transformation, 1); this_->screen_dist=100; + this_->order_base=14; #if 0 this_->pitch=20; #endif @@ -168,6 +171,48 @@ transform_new(void) return this_; } +#ifdef ENABLE_ROLL + +int +transform_get_hog(struct transformation *this_) +{ + return this_->hog; +} + +void +transform_set_hog(struct transformation *this_, int hog) +{ + this_->hog=hog; +} + +#else + +int +transform_get_hog(struct transformation *this_) +{ + return 0; +} + +void +transform_set_hog(struct transformation *this_, int hog) +{ +} + +#endif + +int +transformation_get_order_base(struct transformation *this_) +{ + return this_->order_base; +} + +void +transform_set_order_base(struct transformation *this_, int order_base) +{ + this_->order_base=order_base; +} + + struct transformation * transform_dup(struct transformation *t) { @@ -675,6 +720,7 @@ transform_set_scale(struct transformation *t, long scale) int transform_get_order(struct transformation *t) { + dbg(0,"order %d\n", t->order); return t->order; } |