Move UI responsibilities to GameInterfaceControl

Author: patrykf-dev

blastback_client/src/com/blastback/appstates/GUIAppState.java

@@ -25,7 +25,6 @@ public class GUIAppState extends BaseAppState implements ScreenController
 {
 
     private Nifty _niftyInstance;
-    Element _scoreboardElement;
     private List<BaseAppState> _gameStates;
     private GameClient _application;
 
@@ -81,22 +80,7 @@ public void joinButtonClicked()
         }
     }
 
-    public void displayScoreboard(boolean value)
-    {
-        if (_scoreboardElement == null)
-        {
-            _scoreboardElement = _niftyInstance.createPopup("popup_scoreboard");
-        }
-
-        if (value)
-        {
-            _niftyInstance.showPopup(_niftyInstance.getCurrentScreen(), _scoreboardElement.getId(), null);
-        } else
-        {
-            _niftyInstance.closePopup(_scoreboardElement.getId());
-
-        }
-    }
+    
 
     private void showMessage(String msg)
     {
@@ -117,36 +101,6 @@ public void exitButtonClicked()
         _application.stop();
     }
 
-    /**
-     * Update ammo label (only in hud-screen).
-     *
-     * @param currentAmmo amount of currently owned ammo
-     * @param maxAmmo max amount of ammo
-     */
-    public void updateAmmo(int currentAmmo, int maxAmmo)
-    {
-        Element ammoLabel = _niftyInstance.getCurrentScreen().findElementById("text_ammo");
-        if (ammoLabel != null)
-        {
-            ammoLabel.getRenderer(TextRenderer.class).setText("AMMO " + currentAmmo + " / " + maxAmmo);
-        }
-    }
-
-    /**
-     * Update timer label (only in hud-screen).
-     *
-     * @param timeLeft time left in seconds
-     */
-    public void updateTimer(long timeLeft)
-    {
-        Element timerLabel = _niftyInstance.getCurrentScreen().findElementById("text_timer");
-        if (timerLabel != null)
-        {
-            int minutes = (int) (timeLeft / 60);
-            int seconds = (int) (timeLeft - 60 * minutes);
-            timerLabel.getRenderer(TextRenderer.class).setText("TIMER " + minutes + ":" + seconds);
-        }
-    }
 
     /**
      * It is a way of verifying user's ip/port combination. I wasn´t able to
@@ -290,4 +244,11 @@ protected void onEnable()
     protected void onDisable()
     {
     }
+
+    public Nifty getNifty()
+    {
+        return _niftyInstance;
+    }
+    
+    
 }

blastback_client/src/com/blastback/appstates/PlayerAppState.java

@@ -121,7 +121,7 @@ private void initPlayer()
         // Add controls to spatials
         _player.addControl(_charControl);
         _player.addControl(new PlayerMovementControl());
-        _player.addControl(new GameInterfaceControl(_guiAppState));
+        _player.addControl(new GameInterfaceControl(_guiAppState.getNifty()));
         _player.addControl(new PlayerShootingControl(new Vector3f(0f, 0f, -1.5f))); //to adjust
         _healthControl = new CharacterHealthControl();
         _player.addControl(_healthControl);

blastback_client/src/com/blastback/controls/GameInterfaceControl.java

@@ -4,24 +4,71 @@
 import com.jme3.renderer.RenderManager;
 import com.jme3.renderer.ViewPort;
 import com.jme3.scene.control.AbstractControl;
+import de.lessvoid.nifty.Nifty;
+import de.lessvoid.nifty.elements.Element;
+import de.lessvoid.nifty.elements.render.TextRenderer;
 
 
 public class GameInterfaceControl extends AbstractControl
 {
-    private GUIAppState _guiAppState;
+    private Nifty _niftyInstance;
+    Element _scoreboardElement;
 
-    public GameInterfaceControl(GUIAppState guiAppState)
+    public GameInterfaceControl( Nifty niftyInstance)
     {
-        this._guiAppState = guiAppState;
+        this._niftyInstance = niftyInstance;
     }
-
-    public GUIAppState getGui()
+    
+    public void displayScoreboard(boolean value)
     {
-        return _guiAppState;
+        if (_scoreboardElement == null)
+        {
+            _scoreboardElement = _niftyInstance.createPopup("popup_scoreboard");
+        }
+
+        if (value)
+        {
+            _niftyInstance.showPopup(_niftyInstance.getCurrentScreen(), _scoreboardElement.getId(), null);
+        } else
+        {
+            _niftyInstance.closePopup(_scoreboardElement.getId());
+
+        }
     }
 
 
 
+    /**
+     * Update ammo label (only in hud-screen).
+     *
+     * @param currentAmmo amount of currently owned ammo
+     * @param maxAmmo max amount of ammo
+     */
+    public void updateAmmo(int currentAmmo, int maxAmmo)
+    {
+        Element ammoLabel = _niftyInstance.getCurrentScreen().findElementById("text_ammo");
+        if (ammoLabel != null)
+        {
+            ammoLabel.getRenderer(TextRenderer.class).setText("AMMO " + currentAmmo + " / " + maxAmmo);
+        }
+    }
+
+    /**
+     * Update timer label (only in hud-screen).
+     *
+     * @param timeLeft time left in seconds
+     */
+    public void updateTimer(long timeLeft)
+    {
+        Element timerLabel = _niftyInstance.getCurrentScreen().findElementById("text_timer");
+        if (timerLabel != null)
+        {
+            int minutes = (int) (timeLeft / 60);
+            int seconds = (int) (timeLeft - 60 * minutes);
+            timerLabel.getRenderer(TextRenderer.class).setText("TIMER " + minutes + ":" + seconds);
+        }
+    }
+    
     @Override
     protected void controlUpdate(float tpf)
     {

blastback_client/src/com/blastback/controls/PlayerInputControl.java

@@ -72,7 +72,7 @@ public void onAction(String name, boolean keyPressed, float tpf)
                 }
                  if (name.equals("Tab"))
                 {
-                    _gameInterfaceControl.getGui().displayScoreboard(keyPressed);
+                    _gameInterfaceControl.displayScoreboard(keyPressed);
                 }
 
                 if (name.equals("Shoot"))