Refac

armin-reichert · armin-reichert · commit 6dc0482d0ee3 · 2025-08-12T11:13:38.000+02:00
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
@@ -27,7 +27,6 @@
 
 import static de.amr.pacmanfx.Globals.HTS;
 import static de.amr.pacmanfx.Globals.TS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.ui._2d.ArcadePalette.*;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Predicate.not;
@@ -79,8 +78,8 @@ public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long t
         if (hud.isScoreVisible()) {
             ctx.setFont(assets().arcadeFont(scaled(8)));
             ctx.setFill(ARCADE_WHITE);
-            drawScore(gameContext.theGame().score(), "SCORE", tiles_to_px(1), tiles_to_px(1));
-            drawScore(gameContext.theGame().highScore(), "HIGH SCORE", tiles_to_px(14), tiles_to_px(1));
+            drawScore(gameContext.theGame().score(), "SCORE", TS(1), TS(1));
+            drawScore(gameContext.theGame().highScore(), "HIGH SCORE", TS(14), TS(1));
         }
 
         if (hud.isLevelCounterVisible()) {
@@ -118,7 +117,7 @@ private void drawScore(Score score, String title, double x, double y) {
         fillTextAtScaledPosition(title, x, y);
         fillTextAtScaledPosition("%7s".formatted("%02d".formatted(score.points())), x, y + TS + 1);
         if (score.points() != 0) {
-            fillTextAtScaledPosition("L" + score.levelNumber(), x + tiles_to_px(8), y + TS + 1);
+            fillTextAtScaledPosition("L" + score.levelNumber(), x + TS(8), y + TS + 1);
         }
     }
 
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene1.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene1.java
@@ -22,7 +22,6 @@
 import static de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel.*;
 import static de.amr.pacmanfx.arcade.ms_pacman.rendering.ArcadeMsPacMan_PacAnimationMap.PAC_MAN_MUNCHING;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ARCADE_MAP_SIZE_IN_PIXELS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_GHOST_NORMAL;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_MUNCHING;
 
@@ -74,7 +73,7 @@ public void doInit() {
         pinky.setAnimations(config.createGhostAnimations(pinky));
 
         clapperboard = new Clapperboard("1", "THEY MEET");
-        clapperboard.setPosition(tiles_to_px(3), tiles_to_px(10));
+        clapperboard.setPosition(TS(3), TS(10));
         clapperboard.setFont(scaledArcadeFont8());
         clapperboard.startAnimation();
 
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene2.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene2.java
@@ -18,7 +18,6 @@
 import static de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel.createPacMan;
 import static de.amr.pacmanfx.arcade.ms_pacman.rendering.ArcadeMsPacMan_PacAnimationMap.PAC_MAN_MUNCHING;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ARCADE_MAP_SIZE_IN_PIXELS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_MUNCHING;
 
 /**
@@ -53,7 +52,7 @@ public void doInit() {
         pacMan.setAnimations(ui.currentConfig().createPacAnimations(pacMan));
 
         clapperboard = new Clapperboard("2", "THE CHASE");
-        clapperboard.setPosition(tiles_to_px(3), tiles_to_px(10));
+        clapperboard.setPosition(TS(3), TS(10));
         clapperboard.setFont(scaledArcadeFont8());
         clapperboard.startAnimation();
 
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene3.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_CutScene3.java
@@ -21,7 +21,6 @@
 import static de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel.createPacMan;
 import static de.amr.pacmanfx.arcade.ms_pacman.rendering.ArcadeMsPacMan_PacAnimationMap.PAC_MAN_MUNCHING;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ARCADE_MAP_SIZE_IN_PIXELS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_MUNCHING;
 
 /**
@@ -65,7 +64,7 @@ public void doInit() {
         pacMan.setAnimations(config.createPacAnimations(pacMan));
 
         clapperboard = new Clapperboard("3", "JUNIOR");
-        clapperboard.setPosition(tiles_to_px(3), tiles_to_px(10));
+        clapperboard.setPosition(TS(3), TS(10));
         clapperboard.setFont(scaledArcadeFont8());
         clapperboard.startAnimation();
 
diff --git a/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_IntroScene.java b/pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/scenes/ArcadeMsPacMan_IntroScene.java
@@ -25,7 +25,6 @@
 import static de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel.createGhost;
 import static de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel.createMsPacMan;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ARCADE_MAP_SIZE_IN_PIXELS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_GHOST_NORMAL;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_MUNCHING;
 import static de.amr.pacmanfx.ui.CommonGameActions.*;
@@ -139,15 +138,15 @@ public void drawSceneContent() {
                 String ghostName = GHOST_NAMES[presentedGhostCharacter];
                 Color ghostColor = GHOST_COLORS[presentedGhostCharacter];
                 if (presentedGhostCharacter == RED_GHOST_SHADOW) {
-                    gameRenderer.fillTextAtScaledPosition("WITH", ARCADE_WHITE, TITLE_X, TOP_Y + tiles_to_px(3));
+                    gameRenderer.fillTextAtScaledPosition("WITH", ARCADE_WHITE, TITLE_X, TOP_Y + TS(3));
                 }
-                double x = TITLE_X + (ghostName.length() < 4 ? tiles_to_px(4) : tiles_to_px(3));
-                double y = TOP_Y + tiles_to_px(6);
+                double x = TITLE_X + (ghostName.length() < 4 ? TS(4) : TS(3));
+                double y = TOP_Y + TS(6);
                 gameRenderer.fillTextAtScaledPosition(ghostName, ghostColor, x, y);
             }
             case MS_PACMAN_MARCHING_IN, READY_TO_PLAY -> {
-                gameRenderer.fillTextAtScaledPosition("STARRING", ARCADE_WHITE, TITLE_X, TOP_Y + tiles_to_px(3));
-                gameRenderer.fillTextAtScaledPosition("MS PAC-MAN", ARCADE_YELLOW, TITLE_X, TOP_Y + tiles_to_px(6));
+                gameRenderer.fillTextAtScaledPosition("STARRING", ARCADE_WHITE, TITLE_X, TOP_Y + TS(3));
+                gameRenderer.fillTextAtScaledPosition("MS PAC-MAN", ARCADE_YELLOW, TITLE_X, TOP_Y + TS(6));
             }
         }
         gameRenderer.drawActor(midwayCopyright);
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
@@ -22,7 +22,6 @@
 import java.util.Optional;
 
 import static de.amr.pacmanfx.Globals.TS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.ui._2d.ArcadePalette.ARCADE_WHITE;
 import static de.amr.pacmanfx.ui._2d.ArcadePalette.ARCADE_YELLOW;
 import static java.util.Objects.requireNonNull;
@@ -56,8 +55,8 @@ public void drawHUD(GameContext gameContext, HUD hud, Vector2f sceneSize, long t
         if (hud.isScoreVisible()) {
             ctx.setFont(assets().arcadeFont(scaled(8)));
             ctx.setFill((ARCADE_WHITE));
-            drawScore(gameContext.theGame().score(), "SCORE", tiles_to_px(1), tiles_to_px(1));
-            drawScore(gameContext.theGame().highScore(), "HIGH SCORE", tiles_to_px(14), tiles_to_px(1));
+            drawScore(gameContext.theGame().score(), "SCORE", TS(1), TS(1));
+            drawScore(gameContext.theGame().highScore(), "HIGH SCORE", TS(14), TS(1));
         }
 
         if (hud.isLevelCounterVisible()) {
@@ -95,7 +94,7 @@ private void drawScore(Score score, String title, double x, double y) {
         fillTextAtScaledPosition(title, x, y);
         fillTextAtScaledPosition("%7s".formatted("%02d".formatted(score.points())), x, y + TS + 1);
         if (score.points() != 0) {
-            fillTextAtScaledPosition("L" + score.levelNumber(), x + tiles_to_px(8), y + TS + 1);
+            fillTextAtScaledPosition("L" + score.levelNumber(), x + TS(8), y + TS + 1);
         }
     }
 
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_BootScene2D.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_BootScene2D.java
@@ -17,7 +17,6 @@
 import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ARCADE_MAP_SIZE_IN_PIXELS;
 import static de.amr.pacmanfx.lib.UsefulFunctions.lerp;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.ui._2d.ArcadePalette.ARCADE_WHITE;
 
 /**
@@ -91,10 +90,10 @@ private void drawRandomHexDigits() {
         ctx().setFill(ARCADE_WHITE);
         ctx().setFont(scaledArcadeFont8());
         for (int row = 0; row < numRows; ++row) {
-            double y = scaled(tiles_to_px(row + 1));
+            double y = scaled(TS(row + 1));
             for (int col = 0; col < numCols; ++col) {
                 int hexDigit = random.nextInt(16);
-                ctx().fillText(Integer.toHexString(hexDigit), scaled(tiles_to_px(col)), y);
+                ctx().fillText(Integer.toHexString(hexDigit), scaled(TS(col)), y);
             }
         }
     }
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene1.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene1.java
@@ -13,11 +13,11 @@
 import org.tinylog.Logger;
 
 import static de.amr.pacmanfx.Globals.RED_GHOST_SHADOW;
+import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_GameModel.createGhost;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_GameModel.createPac;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ANIM_BIG_PAC_MAN;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ARCADE_MAP_SIZE_IN_PIXELS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.*;
 
 /**
@@ -112,6 +112,6 @@ public void drawSceneContent() {
     protected void drawDebugInfo() {
         super.drawDebugInfo();
         String text = frame < ANIMATION_START ? String.format("Wait %d", ANIMATION_START - frame) : String.format("Frame %d", frame);
-        gameRenderer.fillTextAtScaledPosition(text, debugTextFill, debugTextFont, tiles_to_px(1), tiles_to_px(5));
+        gameRenderer.fillTextAtScaledPosition(text, debugTextFill, debugTextFont, TS(1), TS(5));
     }
 }
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene2.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene2.java
@@ -16,10 +16,10 @@
 import org.tinylog.Logger;
 
 import static de.amr.pacmanfx.Globals.RED_GHOST_SHADOW;
+import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_GameModel.createGhost;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_GameModel.createPac;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.*;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_GHOST_NORMAL;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_MUNCHING;
 
@@ -132,14 +132,14 @@ public void update() {
     @Override
     public void drawSceneContent() {
         gameRenderer.drawSpriteScaled((RectShort) nailDressRaptureAnimation.currentSprite(),
-                tiles_to_px(14), tiles_to_px(19) + 3);
+                TS(14), TS(19) + 3);
         gameRenderer.drawActors(actorsInZOrder);
     }
 
     @Override
     protected void drawDebugInfo() {
         super.drawDebugInfo();
         String text = frame < ANIMATION_START ? String.format("Wait %d", ANIMATION_START - frame) : String.format("Frame %d", frame);
-        gameRenderer.fillTextAtScaledPosition(text, debugTextFill, debugTextFont, tiles_to_px(1), tiles_to_px(5));
+        gameRenderer.fillTextAtScaledPosition(text, debugTextFill, debugTextFont, TS(1), TS(5));
     }
 }
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene3.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_CutScene3.java
@@ -13,10 +13,10 @@
 import org.tinylog.Logger;
 
 import static de.amr.pacmanfx.Globals.RED_GHOST_SHADOW;
+import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_GameModel.createGhost;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_GameModel.createPac;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.*;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_MUNCHING;
 
 /**
@@ -104,6 +104,6 @@ public void drawSceneContent() {
     protected void drawDebugInfo() {
         super.drawDebugInfo();
         String text = frame < ANIMATION_START ? String.format("Wait %d", ANIMATION_START - frame) : String.format("Frame %d", frame);
-        gameRenderer.fillTextAtScaledPosition(text, debugTextFill, debugTextFont, tiles_to_px(1), tiles_to_px(5));
+        gameRenderer.fillTextAtScaledPosition(text, debugTextFill, debugTextFont, TS(1), TS(5));
     }
 }
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_IntroScene.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_IntroScene.java
@@ -30,7 +30,6 @@
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_GameModel.createPac;
 import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ARCADE_MAP_SIZE_IN_PIXELS;
 import static de.amr.pacmanfx.arcade.pacman.rendering.SpriteID.GALLERY_GHOSTS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.*;
 import static de.amr.pacmanfx.model.actors.GhostState.EATEN;
 import static de.amr.pacmanfx.model.actors.GhostState.FRIGHTENED;
@@ -127,7 +126,7 @@ public void drawSceneContent() {
             case SHOWING_PELLET_POINTS -> drawPoints();
             case CHASING_PAC -> {
                 drawPoints();
-                drawBlinkingEnergizer(tiles_to_px(LEFT_TILE_X), tiles_to_px(20));
+                drawBlinkingEnergizer(TS(LEFT_TILE_X), TS(20));
                 drawGuys(true);
                 gameRenderer.fillTextAtScaledTilePosition(MIDWAY_MFG_CO, ARCADE_PINK, scaledArcadeFont8(), 4, 32);
             }
@@ -144,20 +143,20 @@ private void drawGallery() {
         ctx().setFont(scaledArcadeFont8());
         if (titleVisible) {
             gameRenderer.fillTextAtScaledPosition("CHARACTER / NICKNAME", ARCADE_WHITE,
-                tiles_to_px(LEFT_TILE_X + 3), tiles_to_px(6));
+                TS(LEFT_TILE_X + 3), TS(6));
         }
         for (byte personality = RED_GHOST_SHADOW; personality <= ORANGE_GHOST_POKEY; ++personality) {
             if (ghostImageVisible[personality]) {
                 gameRenderer.drawSpriteScaledCenteredAt(spriteSheet.spriteSeq(GALLERY_GHOSTS)[personality],
-                    tiles_to_px(LEFT_TILE_X) + TS, tiles_to_px(7 + 3 * personality) + HTS);
+                    TS(LEFT_TILE_X) + TS, TS(7 + 3 * personality) + HTS);
             }
             if (ghostCharacterVisible[personality]) {
                 gameRenderer.fillTextAtScaledPosition("-" + GHOST_CHARACTERS[personality], GHOST_COLORS[personality],
-                    tiles_to_px(LEFT_TILE_X + 3), tiles_to_px(8 + 3 * personality));
+                    TS(LEFT_TILE_X + 3), TS(8 + 3 * personality));
             }
             if (ghostNicknameVisible[personality]) {
                 gameRenderer.fillTextAtScaledPosition(GHOST_NICKNAMES[personality], GHOST_COLORS[personality],
-                    tiles_to_px(LEFT_TILE_X + 14), tiles_to_px(8 + 3 * personality));
+                    TS(LEFT_TILE_X + 14), TS(8 + 3 * personality));
             }
         }
     }
@@ -183,11 +182,11 @@ private void drawGuys(boolean shaking) {
     private void drawPoints() {
         ctx().setFill(ARCADE_ROSE);
         // normal pellet
-        ctx().fillRect(scaled(tiles_to_px(LEFT_TILE_X + 6) + 4), scaled(tiles_to_px(24) + 4), scaled(2), scaled(2));
+        ctx().fillRect(scaled(TS(LEFT_TILE_X + 6) + 4), scaled(TS(24) + 4), scaled(2), scaled(2));
         gameRenderer.fillTextAtScaledTilePosition("10",  ARCADE_WHITE, scaledArcadeFont8(), LEFT_TILE_X + 8, 25);
         gameRenderer.fillTextAtScaledTilePosition("PTS", ARCADE_WHITE, scaledArcadeFont6(), LEFT_TILE_X + 11, 25);
         // energizer
-        drawBlinkingEnergizer(tiles_to_px(LEFT_TILE_X + 6), tiles_to_px(26));
+        drawBlinkingEnergizer(TS(LEFT_TILE_X + 6), TS(26));
         gameRenderer.fillTextAtScaledTilePosition("50",  ARCADE_WHITE, scaledArcadeFont8(), LEFT_TILE_X + 8, 27);
         gameRenderer.fillTextAtScaledTilePosition("PTS", ARCADE_WHITE, scaledArcadeFont6(), LEFT_TILE_X + 11, 27);
     }
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
@@ -37,7 +37,6 @@
 
 import static de.amr.pacmanfx.Globals.HTS;
 import static de.amr.pacmanfx.Globals.TS;
-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_DYING;
 import static de.amr.pacmanfx.tengen.ms_pacman.TengenMsPacMan_UIConfig.nesPaletteColor;
 import static de.amr.pacmanfx.tengen.ms_pacman.model.TengenMsPacMan_MapRepository.strangeMap15Sprite;
@@ -138,11 +137,11 @@ public void drawScores(TengenMsPacMan_GameModel game, long tick, Color color, Fo
         ctx.setFill(color);
         ctx.setFont(font);
         if (tick % 60 < 30) {
-            ctx.fillText("1UP", tiles_to_px(4), tiles_to_px(1));
+            ctx.fillText("1UP", TS(4), TS(1));
         }
-        ctx.fillText("HIGH SCORE", tiles_to_px(11), tiles_to_px(1));
-        ctx.fillText("%6d".formatted(game.score().points()), tiles_to_px(2), tiles_to_px(2));
-        ctx.fillText("%6d".formatted(game.highScore().points()), tiles_to_px(13), tiles_to_px(2));
+        ctx.fillText("HIGH SCORE", TS(11), TS(1));
+        ctx.fillText("%6d".formatted(game.score().points()), TS(2), TS(2));
+        ctx.fillText("%6d".formatted(game.highScore().points()), TS(13), TS(2));
         ctx.restore();
     }
 
@@ -311,7 +310,7 @@ public void drawLevelWithMaze(GameContext gameContext, GameLevel level, Image ma
         ctx.setImageSmoothing(false);
         if (!tengenGame.optionsAreInitial()) {
             drawGameOptions(tengenGame.mapCategory(), tengenGame.difficulty(), tengenGame.pacBooster(),
-                level.worldMap().numCols() * HTS, tiles_to_px(2) + HTS);
+                level.worldMap().numCols() * HTS, TS(2) + HTS);
         }
         int x = 0, y = GameLevel.EMPTY_ROWS_OVER_MAZE * TS;
         ctx.drawImage(mazeImage,
@@ -431,7 +430,7 @@ public void drawGameOptions(MapCategory category, Difficulty difficulty, PacBoos
             case STRANGE -> spriteSheet.sprite(SpriteID.INFO_CATEGORY_STRANGE);
             case ARCADE  -> RectShort.ZERO;
         };
-        drawSpriteScaledCenteredAt(categorySprite, centerX + tiles_to_px(4.5), y);
+        drawSpriteScaledCenteredAt(categorySprite, centerX + TS(4.5), y);
         RectShort difficultySprite = switch (requireNonNull(difficulty)) {
             case EASY   -> spriteSheet.sprite(SpriteID.INFO_DIFFICULTY_EASY);
             case HARD   -> spriteSheet.sprite(SpriteID.INFO_DIFFICULTY_HARD);
@@ -440,7 +439,7 @@ public void drawGameOptions(MapCategory category, Difficulty difficulty, PacBoos
         };
         drawSpriteScaledCenteredAt(difficultySprite, centerX, y);
         if (requireNonNull(booster) != PacBooster.OFF) {
-            drawSpriteScaledCenteredAt(spriteSheet.sprite(SpriteID.INFO_BOOSTER), centerX - tiles_to_px(6), y);
+            drawSpriteScaledCenteredAt(spriteSheet.sprite(SpriteID.INFO_BOOSTER), centerX - TS(6), y);
         }
     }
 
diff --git a/pacman-core/src/main/java/de/amr/pacmanfx/Globals.java b/pacman-core/src/main/java/de/amr/pacmanfx/Globals.java
diff --git a/pacman-core/src/main/java/de/amr/pacmanfx/controller/GameController.java b/pacman-core/src/main/java/de/amr/pacmanfx/controller/GameController.java
diff --git a/pacman-core/src/main/java/de/amr/pacmanfx/lib/UsefulFunctions.java b/pacman-core/src/main/java/de/amr/pacmanfx/lib/UsefulFunctions.java
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

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`import static de.amr.pacmanfx.Globals.TS;`
`18`	`18`	`import static de.amr.pacmanfx.arcade.pacman.ArcadePacMan_UIConfig.ARCADE_MAP_SIZE_IN_PIXELS;`
`19`	`19`	`import static de.amr.pacmanfx.lib.UsefulFunctions.lerp;`
`20`		`-import static de.amr.pacmanfx.lib.UsefulFunctions.tiles_to_px;`
`21`	`20`	`import static de.amr.pacmanfx.ui._2d.ArcadePalette.ARCADE_WHITE;`
`22`	`21`
`23`	`22`	`/**`
`@@ -91,10 +90,10 @@ private void drawRandomHexDigits() {`
`91`	`90`	`ctx().setFill(ARCADE_WHITE);`
`92`	`91`	`ctx().setFont(scaledArcadeFont8());`
`93`	`92`	`for (int row = 0; row < numRows; ++row) {`
`94`		`- double y = scaled(tiles_to_px(row + 1));`
	`93`	`+ double y = scaled(TS(row + 1));`
`95`	`94`	`for (int col = 0; col < numCols; ++col) {`
`96`	`95`	`int hexDigit = random.nextInt(16);`
`97`		`- ctx().fillText(Integer.toHexString(hexDigit), scaled(tiles_to_px(col)), y);`
	`96`	`+ ctx().fillText(Integer.toHexString(hexDigit), scaled(TS(col)), y);`
`98`	`97`	`}`
`99`	`98`	`}`
`100`	`99`	`}`