Refac

armin-reichert · armin-reichert · commit 9053726ff8fd · 2025-08-13T12:24:28.000+02:00
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameData.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameData.java
@@ -1,10 +1,10 @@
 package de.amr.pacmanfx.arcade.ms_pacman;
 
 import de.amr.pacmanfx.arcade.pacman.ArcadePacMan_LevelCounter;
-import de.amr.pacmanfx.model.HUD;
+import de.amr.pacmanfx.model.GameData;
 import de.amr.pacmanfx.model.LivesCounter;
 
-public class ArcadeMsPacMan_HUD implements HUD {
+public class ArcadeMsPacMan_GameData implements GameData {
 
     private final LivesCounter livesCounter = new LivesCounter();
     private final ArcadePacMan_LevelCounter levelCounter = new ArcadePacMan_LevelCounter();
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameModel.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/ArcadeMsPacMan_GameModel.java
@@ -198,7 +198,7 @@ protected LevelData createLevelData(int levelNumber) {
 
     private static final int DEMO_LEVEL_MIN_DURATION_SEC = 20;
 
-    private final ArcadeMsPacMan_HUD hud = new ArcadeMsPacMan_HUD();
+    private final ArcadeMsPacMan_GameData hud = new ArcadeMsPacMan_GameData();
     private final ScoreManager scoreManager;
 
     public ArcadeMsPacMan_GameModel(GameContext gameContext, File highScoreFile) {
@@ -258,7 +258,7 @@ public ScoreManager scoreManager() {
     }
 
     @Override
-    public ArcadeMsPacMan_HUD hud() {
+    public ArcadeMsPacMan_GameData hud() {
         return hud;
     }
 
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/rendering/ArcadeMsPacMan_GameRenderer.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/rendering/ArcadeMsPacMan_GameRenderer.java
@@ -70,20 +70,20 @@ public void dispose() {
     public Optional<SpriteSheet<?>> optSpriteSheet() { return Optional.of(spriteSheet); }
 
     @Override
-    public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long tick) {
-        requireNonNull(hud);
+    public void drawHUD(GameContext gameContext, GameData data, Vector2f sceneSize, long tick) {
+        requireNonNull(data);
 
-        if (!hud.isVisible()) return;
+        if (!data.isVisible()) return;
 
-        if (hud.isScoreVisible()) {
+        if (data.isScoreVisible()) {
             ctx.setFont(assets.arcadeFont(scaled(8)));
             ctx.setFill(ARCADE_WHITE);
             drawScore(gameContext.game().scoreManager().score(), "SCORE", TS(1), TS(1));
             drawScore(gameContext.game().scoreManager().highScore(), "HIGH SCORE", TS(14), TS(1));
         }
 
-        if (hud.isLevelCounterVisible()) {
-            LevelCounter levelCounter = hud.theLevelCounter();
+        if (data.isLevelCounterVisible()) {
+            LevelCounter levelCounter = data.theLevelCounter();
             float x = sceneSize.x() - TS(4), y = sceneSize.y() - TS(2);
             for (byte symbol : levelCounter.symbols()) {
                 RectShort sprite = spriteSheet.spriteSeq(SpriteID.BONUS_SYMBOLS)[symbol];
@@ -92,9 +92,9 @@ public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long t
             }
         }
 
-        if (hud.isLivesCounterVisible()) {
+        if (data.isLivesCounterVisible()) {
             float x = TS(2), y = sceneSize.y() - TS(2);
-            LivesCounter livesCounter = hud.theLivesCounter();
+            LivesCounter livesCounter = data.theLivesCounter();
             RectShort sprite = spriteSheet.sprite(SpriteID.LIVES_COUNTER_SYMBOL);
             for (int i = 0; i < livesCounter.visibleLifeCount(); ++i) {
                 drawSpriteScaled(sprite, x + TS(2 * i), y);
@@ -106,7 +106,7 @@ public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long t
             }
         }
 
-        if (hud.isCreditVisible()) {
+        if (data.isCreditVisible()) {
             String text = "CREDIT %2d".formatted(gameContext.coinMechanism().numCoins());
             fillTextAtScaledPosition(text, ARCADE_WHITE, assets.arcadeFont(scaled(8)), TS(2), sceneSize.y() - 2);
         }
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_GameData.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_GameData.java
@@ -1,9 +1,9 @@
 package de.amr.pacmanfx.arcade.pacman;
 
-import de.amr.pacmanfx.model.HUD;
+import de.amr.pacmanfx.model.GameData;
 import de.amr.pacmanfx.model.LivesCounter;
 
-public class ArcadePacMan_HUD implements HUD {
+public class ArcadePacMan_GameData implements GameData {
 
     private final LivesCounter livesCounter = new LivesCounter();
     private final ArcadePacMan_LevelCounter levelCounter = new ArcadePacMan_LevelCounter();
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_GameModel.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_GameModel.java
@@ -176,7 +176,7 @@ protected static LevelData createLevelData(int levelNumber) {
     // bonus points = multiplier * 100
     private static final byte[] BONUS_VALUE_MULTIPLIERS = { 1, 3, 5, 7, 10, 20, 30, 50 };
 
-    private final HUD hud = new ArcadePacMan_HUD();
+    private final GameData hud = new ArcadePacMan_GameData();
     private final ScoreManager scoreManager;
 
     public ArcadePacMan_GameModel(GameContext gameContext, File highScoreFile) {
@@ -252,7 +252,7 @@ public ScoreManager scoreManager() {
     }
 
     @Override
-    public HUD hud() {
+    public GameData hud() {
         return hud;
     }
 
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/rendering/ArcadePacMan_GameRenderer.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/rendering/ArcadePacMan_GameRenderer.java
@@ -49,19 +49,19 @@ public void dispose() {
     }
 
     @Override
-    public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long tick) {
-        requireNonNull(hud);
-        if (!hud.isVisible()) return;
+    public void drawHUD(GameContext gameContext, GameData data, Vector2f sceneSize, long tick) {
+        requireNonNull(data);
+        if (!data.isVisible()) return;
 
-        if (hud.isScoreVisible()) {
+        if (data.isScoreVisible()) {
             ctx.setFont(assets().arcadeFont(scaled(8)));
             ctx.setFill((ARCADE_WHITE));
             drawScore(gameContext.game().scoreManager().score(), "SCORE", TS(1), TS(1));
             drawScore(gameContext.game().scoreManager().highScore(), "HIGH SCORE", TS(14), TS(1));
         }
 
-        if (hud.isLevelCounterVisible()) {
-            LevelCounter levelCounter = hud.theLevelCounter();
+        if (data.isLevelCounterVisible()) {
+            LevelCounter levelCounter = data.theLevelCounter();
             float x = sceneSize.x() - TS(4), y = sceneSize.y() - TS(2) + 2;
             for (byte symbol : levelCounter.symbols()) {
                 RectShort sprite = spriteSheet.spriteSeq(SpriteID.BONUS_SYMBOLS)[symbol];
@@ -70,8 +70,8 @@ public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long t
             }
         }
 
-        if (hud.isLivesCounterVisible()) {
-            LivesCounter livesCounter = hud.theLivesCounter();
+        if (data.isLivesCounterVisible()) {
+            LivesCounter livesCounter = data.theLivesCounter();
             float x = TS(2), y = sceneSize.y() - TS(2);
             RectShort sprite = spriteSheet.sprite(SpriteID.LIVES_COUNTER_SYMBOL);
             for (int i = 0; i < livesCounter.visibleLifeCount(); ++i) {
@@ -84,7 +84,7 @@ public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long t
             }
         }
 
-        if (hud.isCreditVisible()) {
+        if (data.isCreditVisible()) {
             String text = "CREDIT %2d".formatted(gameContext.coinMechanism().numCoins());
             Font font = assets.arcadeFont(scaled(8));
             fillTextAtScaledPosition(text, ARCADE_WHITE, font, TS(2), sceneSize.y());
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameData.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameData.java
@@ -1,9 +1,9 @@
 package de.amr.pacmanfx.tengen.ms_pacman.model;
 
-import de.amr.pacmanfx.model.HUD;
+import de.amr.pacmanfx.model.GameData;
 import de.amr.pacmanfx.model.LivesCounter;
 
-public class TengenMsPacMan_HUD implements HUD {
+public class TengenMsPacMan_GameData implements GameData {
     private final TengenMsPacMan_LevelCounter levelCounter = new TengenMsPacMan_LevelCounter();
     private final LivesCounter livesCounter = new LivesCounter();
 
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameModel.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/model/TengenMsPacMan_GameModel.java
@@ -214,7 +214,7 @@ public Vector2i chasingTargetTile() {
 
     private final GameContext gameContext;
     private final ScoreManager scoreManager;
-    private final TengenMsPacMan_HUD hud = new TengenMsPacMan_HUD();
+    private final TengenMsPacMan_GameData hud = new TengenMsPacMan_GameData();
     private final TengenMsPacMan_MapSelector mapSelector;
     private final TengenActorSpeedControl actorSpeedControl;
     private final GateKeeper gateKeeper;
@@ -253,7 +253,7 @@ public ScoreManager scoreManager() {
     }
 
     @Override
-    public TengenMsPacMan_HUD hud() {
+    public TengenMsPacMan_GameData hud() {
         return hud;
     }
 
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/rendering/TengenMsPacMan_GameRenderer.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/rendering/TengenMsPacMan_GameRenderer.java
@@ -107,13 +107,13 @@ public void applyRenderingHints(GameLevel level) {
     }
 
     @Override
-    public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long tick) {
-        requireNonNull(hud);
+    public void drawHUD(GameContext gameContext, GameData data, Vector2f sceneSize, long tick) {
+        requireNonNull(data);
 
-        if (!hud.isVisible()) return;
+        if (!data.isVisible()) return;
 
         var tengenGame = (TengenMsPacMan_GameModel) gameContext.game();
-        var tengenHUD = (TengenMsPacMan_HUD) hud;
+        var tengenHUD = (TengenMsPacMan_GameData) data;
         
         if (tengenHUD.isScoreVisible()) {
             drawScores(tengenGame, tick, nesPaletteColor(0x20), assets.arcadeFont(8));
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_PlayScene2D.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_PlayScene2D.java
@@ -15,8 +15,8 @@
 import de.amr.pacmanfx.model.actors.Pac;
 import de.amr.pacmanfx.tengen.ms_pacman.TengenMsPacMan_UIConfig;
 import de.amr.pacmanfx.tengen.ms_pacman.model.MapCategory;
+import de.amr.pacmanfx.tengen.ms_pacman.model.TengenMsPacMan_GameData;
 import de.amr.pacmanfx.tengen.ms_pacman.model.TengenMsPacMan_GameModel;
-import de.amr.pacmanfx.tengen.ms_pacman.model.TengenMsPacMan_HUD;
 import de.amr.pacmanfx.tengen.ms_pacman.model.TengenMsPacMan_LevelCounter;
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.ColorSchemedSprite;
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.TengenMsPacMan_GameRenderer;
@@ -512,7 +512,7 @@ private Vector2f currentMessagePosition() {
     }
 
     private void updateHUD() {
-        TengenMsPacMan_HUD hud = gameContext().<TengenMsPacMan_GameModel>game().hud();
+        TengenMsPacMan_GameData hud = gameContext().<TengenMsPacMan_GameModel>game().hud();
         int numLives = gameContext().game().lifeCount() - 1;
         // As long as Pac-Man is still invisible on start, he is shown as an additional entry in the lives counter
         if (gameContext().gameState() == GameState.STARTING_GAME && !gameContext().gameLevel().pac().isVisible()) {
diff --git a/pacman-core/src/main/java/de/amr/pacmanfx/model/Game.java b/pacman-core/src/main/java/de/amr/pacmanfx/model/Game.java
@@ -11,7 +11,7 @@
 
 public interface Game extends GameLifecycle, GameEvents {
     ScoreManager scoreManager();
-    HUD hud();
+    GameData hud();
     SimulationStep simulationStep();
     ActorSpeedControl actorSpeedControl();
     HuntingTimer huntingTimer();
diff --git a/pacman-core/src/main/java/de/amr/pacmanfx/model/GameData.java b/pacman-core/src/main/java/de/amr/pacmanfx/model/GameData.java
@@ -5,9 +5,9 @@
 package de.amr.pacmanfx.model;
 
 /**
- * Heads-Up Display aka HUD.
+ * Data which are typically displayed in a Heads-Up Display (HUD).
  */
-public interface HUD {
+public interface GameData {
 
     boolean isVisible();
     void show(boolean b);
@@ -28,9 +28,9 @@ public interface HUD {
     void showCredit(boolean b);
 
     // Fluent API
-    default HUD all(boolean state) { return credit(state).score(state).levelCounter(state).livesCounter(state); }
-    default HUD credit(boolean on) { showCredit(on); return this; }
-    default HUD levelCounter(boolean on) { showLevelCounter(on); return this; }
-    default HUD livesCounter(boolean on) { showLivesCounter(on); return this; }
-    default HUD score(boolean on) { showScore(on); return this; }
+    default GameData all(boolean state) { return credit(state).score(state).levelCounter(state).livesCounter(state); }
+    default GameData credit(boolean on) { showCredit(on); return this; }
+    default GameData levelCounter(boolean on) { showLevelCounter(on); return this; }
+    default GameData livesCounter(boolean on) { showLivesCounter(on); return this; }
+    default GameData score(boolean on) { showScore(on); return this; }
 }
diff --git a/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_2d/GameRenderer.java b/pacman-ui/src/main/java/de/amr/pacmanfx/ui/_2d/GameRenderer.java
@@ -9,8 +9,8 @@
 import de.amr.pacmanfx.lib.RectShort;
 import de.amr.pacmanfx.lib.Vector2f;
 import de.amr.pacmanfx.lib.Vector2i;
+import de.amr.pacmanfx.model.GameData;
 import de.amr.pacmanfx.model.GameLevel;
-import de.amr.pacmanfx.model.HUD;
 import de.amr.pacmanfx.model.actors.*;
 import de.amr.pacmanfx.ui.GameAssets;
 import de.amr.pacmanfx.uilib.animation.SingleSpriteWithoutAnimation;
@@ -84,11 +84,11 @@ public void applyRenderingHints(GameLevel level) {}
      * Draws the Head-Up Display (score, live counter, level counter, coins inserted)
      *
      * @param gameContext the game context
-     * @param hud the Head-Up Display
+     * @param data the data displayed in the Head-Up Display
      * @param sceneSize scene size in pixels
      * @param tick current clock tick
      */
-    public abstract void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long tick);
+    public abstract void drawHUD(GameContext gameContext, GameData data, Vector2f sceneSize, long tick);
 
     /**
      * @param gameContext the game context

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ protected LevelData createLevelData(int levelNumber) {`
`198`	`198`
`199`	`199`	`private static final int DEMO_LEVEL_MIN_DURATION_SEC = 20;`
`200`	`200`
`201`		`- private final ArcadeMsPacMan_HUD hud = new ArcadeMsPacMan_HUD();`
	`201`	`+ private final ArcadeMsPacMan_GameData hud = new ArcadeMsPacMan_GameData();`
`202`	`202`	`private final ScoreManager scoreManager;`
`203`	`203`
`204`	`204`	`public ArcadeMsPacMan_GameModel(GameContext gameContext, File highScoreFile) {`
`@@ -258,7 +258,7 @@ public ScoreManager scoreManager() {`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`@Override`
`261`		`- public ArcadeMsPacMan_HUD hud() {`
	`261`	`+ public ArcadeMsPacMan_GameData hud() {`
`262`	`262`	`return hud;`
`263`	`263`	`}`
`264`	`264`
Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ protected static LevelData createLevelData(int levelNumber) {`
`176`	`176`	`// bonus points = multiplier * 100`
`177`	`177`	`private static final byte[] BONUS_VALUE_MULTIPLIERS = { 1, 3, 5, 7, 10, 20, 30, 50 };`
`178`	`178`
`179`		`- private final HUD hud = new ArcadePacMan_HUD();`
	`179`	`+ private final GameData hud = new ArcadePacMan_GameData();`
`180`	`180`	`private final ScoreManager scoreManager;`
`181`	`181`
`182`	`182`	`public ArcadePacMan_GameModel(GameContext gameContext, File highScoreFile) {`
`@@ -252,7 +252,7 @@ public ScoreManager scoreManager() {`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`@Override`
`255`		`- public HUD hud() {`
	`255`	`+ public GameData hud() {`
`256`	`256`	`return hud;`
`257`	`257`	`}`
`258`	`258`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ public Vector2i chasingTargetTile() {`
`214`	`214`
`215`	`215`	`private final GameContext gameContext;`
`216`	`216`	`private final ScoreManager scoreManager;`
`217`		`- private final TengenMsPacMan_HUD hud = new TengenMsPacMan_HUD();`
	`217`	`+ private final TengenMsPacMan_GameData hud = new TengenMsPacMan_GameData();`
`218`	`218`	`private final TengenMsPacMan_MapSelector mapSelector;`
`219`	`219`	`private final TengenActorSpeedControl actorSpeedControl;`
`220`	`220`	`private final GateKeeper gateKeeper;`
`@@ -253,7 +253,7 @@ public ScoreManager scoreManager() {`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`@Override`
`256`		`- public TengenMsPacMan_HUD hud() {`
	`256`	`+ public TengenMsPacMan_GameData hud() {`
`257`	`257`	`return hud;`
`258`	`258`	`}`
`259`	`259`