Fixed: "Automap rotation angle smoothing" (see here http://sourceforg…

…e.net/tracker/index.php?func=detail&aid=2774902&group_id=74815&atid=542099)
skyjake · Nov 9, 2009 · fc10e28 · fc10e28
1 parent df2b4a8
commit fc10e28
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/doomsday/plugins/common/src/am_map.c b/doomsday/plugins/common/src/am_map.c
@@ -786,7 +786,7 @@ void AM_Open(automapid_t id, boolean yes, boolean fast)
 
                 /* $unifiedangles */
                 if(map->rotate)
-                    angle = mo->angle / (float) ANGLE_MAX * -360 - 90;
+                    angle = (mo->angle - ANGLE_90) / (float) ANGLE_MAX * 360;
                 else
                     angle = 0;
                 Automap_SetViewAngleTarget(map, angle);
@@ -1837,7 +1837,7 @@ static void mapTicker(automap_t* map)
 
         /* $unifiedangles */
         if(map->rotate)
-            angle = mo->angle / (float) ANGLE_MAX * 360 - 90;
+            angle = (mo->angle - ANGLE_90) / (float) ANGLE_MAX * 360;
         else
             angle = 0;
         Automap_SetViewAngleTarget(map, angle);

diff --git a/doomsday/plugins/common/src/p_automap.c b/doomsday/plugins/common/src/p_automap.c
@@ -230,9 +230,7 @@ void Automap_RunTic(automap_t* map)
     }
     else
     {
-        float               diff;
-        float               startAngle = map->oldAngle;
-        float               endAngle = map->targetAngle;
+        float diff, startAngle = map->oldAngle, endAngle = map->targetAngle;
 
         if(endAngle > startAngle)
         {
@@ -248,6 +246,10 @@ void Automap_RunTic(automap_t* map)
         }
 
         map->angle = LERP(startAngle, endAngle, map->angleTimer);
+        if(map->angle < 0)
+            map->angle += 360;
+        else if(map->angle > 360)
+            map->angle -= 360;
     }
 
     //
@@ -482,7 +484,7 @@ void Automap_SetViewAngleTarget(automap_t* map, float angle)
         return;
 
     map->oldAngle = map->angle;
-    map->targetAngle = angle;
+    map->targetAngle = MINMAX_OF(0, angle, 359.9999f);
 
     // Restart the timer.
     map->angleTimer = 0;