Merge pull request #126 from Avalancs/pauseMapFix

fix map doesn't look right when the game is paused (issue #119)

Author: vampcat

main/src/org/destinationsol/game/SolCam.java

@@ -62,8 +62,6 @@ public Matrix4 getMtx() {
   }
 
   public void update(SolGame game) {
-
-    float desiredVd = Const.CAM_VIEW_DIST_GROUND;
     float life = 0;
 
     SolShip hero = game.getHero();
@@ -75,7 +73,6 @@ public void update(SolGame game) {
           applyInput(game);
         }
       } else {
-        desiredVd = Const.CAM_VIEW_DIST_SPACE;
         myPos.set(trans.getPosition());
       }
     } else {
@@ -93,17 +90,6 @@ public void update(SolGame game) {
         myPos.y = SolMath.approach(myPos.y, heroPos.y, moveSpd);
       }
       life = hero.getLife();
-
-      float spd = hero.getSpd().len();
-
-      desiredVd = Const.CAM_VIEW_DIST_SPACE;
-      Planet np = game.getPlanetMan().getNearestPlanet(myPos);
-      if (np.getFullHeight() < np.getPos().dst(myPos) && MAX_ZOOM_SPD < spd) {
-        desiredVd = Const.CAM_VIEW_DIST_JOURNEY;
-      } else if (np.isNearGround(myPos) && spd < MED_ZOOM_SPD) {
-        desiredVd = Const.CAM_VIEW_DIST_GROUND;
-      }
-      desiredVd += hero.getHull().config.getApproxRadius();
     }
 
     if (life < myPrevHeroLife) {
@@ -124,12 +110,38 @@ public void update(SolGame game) {
     myAngle = SolMath.approachAngle(myAngle, desiredAngle, rotSpd);
     applyAngle();
 
-    float desiredZoom = calcZoom(desiredVd);
+    updateMap(game);
+  }
+
+  public void updateMap(SolGame game) {
+    float ts = game.getTimeStep();
+    float desiredViewDistance = getDesiredViewDistance(game);
+    float desiredZoom = calcZoom(desiredViewDistance);
     myZoom = SolMath.approach(myZoom, desiredZoom, ZOOM_CHG_SPD * ts);
     applyZoom(game.getMapDrawer());
     myCam.update();
   }
 
+  private float getDesiredViewDistance(SolGame game) {
+    SolShip hero = game.getHero();
+    if(hero == null && game.getTranscendentHero() != null) { // hero is in transcendent state
+      return Const.CAM_VIEW_DIST_SPACE;
+    } else if(hero == null && game.getTranscendentHero() == null) {
+      return Const.CAM_VIEW_DIST_GROUND;
+    } else {
+      float speed = hero.getSpd().len();
+      float desiredViewDistance = Const.CAM_VIEW_DIST_SPACE;
+      Planet nearestPlanet = game.getPlanetMan().getNearestPlanet(myPos);
+      if (nearestPlanet.getFullHeight() < nearestPlanet.getPos().dst(myPos) && MAX_ZOOM_SPD < speed) {
+        desiredViewDistance = Const.CAM_VIEW_DIST_JOURNEY;
+      } else if (nearestPlanet.isNearGround(myPos) && speed < MED_ZOOM_SPD) {
+        desiredViewDistance = Const.CAM_VIEW_DIST_GROUND;
+      }
+      desiredViewDistance += hero.getHull().config.getApproxRadius();
+      return desiredViewDistance;
+    }
+  }
+
   private float calcZoom(float vd) {
     float h = vd * SolMath.sqrt(2);
     return h / VIEWPORT_HEIGHT;

main/src/org/destinationsol/game/SolGame.java

@@ -255,7 +255,11 @@ public GameScreens getScreens() {
   public void update() {
     myDraDebugger.update(this);
 
-    if (myPaused) return;
+    if (myPaused) {
+      myCam.updateMap(this); // update zoom only for map
+      myMapDrawer.update(this); // animate map icons
+      return;
+    }
 
     myTimeFactor = DebugOptions.GAME_SPEED_MULTIPLIER;
     if (myHero != null) {