[Navit-cvs-commit] SF.net SVN: navit:[2149] trunk/navit/navit/transform.c

[<mar...@us...>]

Revision: 2149
          http://navit.svn.sourceforge.net/navit/?rev=2149&view=rev
Author:   martin-s
Date:     2009-03-20 17:37:32 +0000 (Fri, 20 Mar 2009)

Log Message:
-----------
Fix:Core:Added functions to get/set hog and order base

Modified Paths:
--------------
    trunk/navit/navit/transform.c

Modified: trunk/navit/navit/transform.c
===================================================================
--- trunk/navit/navit/transform.c	2009-03-20 17:36:15 UTC (rev 2148)
+++ trunk/navit/navit/transform.c	2009-03-20 17:37:32 UTC (rev 2149)
@@ -59,6 +59,7 @@
 	double scale;		/* Scale factor */
 	int scale_shift;
 	int order;
+	int order_base;
 };
 
 static void
@@ -80,7 +81,8 @@
 
 	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 @@
 		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 @@
 
 	this_=g_new0(struct transformation, 1);
 	this_->screen_dist=100;
+	this_->order_base=14;
 #if 0
 	this_->pitch=20;
 #endif
@@ -168,6 +171,48 @@
 	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 @@
 int
 transform_get_order(struct transformation *t)
 {
+	dbg(0,"order %d\n", t->order);
 	return t->order;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.