Refac

Author: armin-reichert

pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_BootScene.java

@@ -10,7 +10,6 @@
 import de.amr.pacmanfx.model.actors.Actor;
 import de.amr.pacmanfx.model.actors.Ghost;
 import de.amr.pacmanfx.tengen.ms_pacman.rendering.TengenMsPacMan_GameRenderer;
-import de.amr.pacmanfx.ui._2d.GameRenderer;
 import de.amr.pacmanfx.ui._2d.GameScene2D;
 import de.amr.pacmanfx.ui.api.GameUI;
 import javafx.scene.canvas.GraphicsContext;
@@ -23,13 +22,15 @@
 import static de.amr.pacmanfx.tengen.ms_pacman.TengenMsPacMan_UIConfig.nesPaletteColor;
 import static de.amr.pacmanfx.tengen.ms_pacman.model.TengenMsPacMan_GameModel.createGhost;
 import static de.amr.pacmanfx.tengen.ms_pacman.rendering.TengenMsPacMan_GameRenderer.blueShadedColor;
+import static de.amr.pacmanfx.ui._2d.GameRenderer.fillCanvas;
 
 /**
  * Shows moving and color changing "TENGEN PRESENTS" text and ghost running through scene.
  */
 public class TengenMsPacMan_BootScene extends GameScene2D {
 
     public static final String TENGEN_PRESENTS = "TENGEN PRESENTS";
+    public static final Color GRAY = nesPaletteColor(0x10);
 
     private static final float GHOST_Y = 21.5f * TS;
 
@@ -63,8 +64,7 @@ public void doInit() {
     }
 
     @Override
-    protected void doEnd() {
-    }
+    protected void doEnd() {}
 
     @Override
     public void update() {
@@ -113,11 +113,11 @@ else if (tick == 220) {
     @Override
     public void drawSceneContent() {
         if (grayScreen) {
-            GameRenderer.fillCanvas(canvas, nesPaletteColor(0x10));
+            fillCanvas(canvas, GRAY);
         } else {
-            renderer().fillTextAtScaledPosition(TENGEN_PRESENTS, blueShadedColor(tick), scaledArcadeFont8(),
+            gameRenderer.fillTextAtScaledPosition(TENGEN_PRESENTS, blueShadedColor(tick), scaledArcadeFont8(),
                 movingText.x(), movingText.y());
-            renderer().drawActor(ghost);
+            gameRenderer.drawActor(ghost);
         }
     }
 

pacman-ui/src/main/java/de/amr/pacmanfx/ui/_2d/GameScene2D.java

@@ -34,6 +34,7 @@ public abstract class GameScene2D implements GameScene {
     protected final GameUI ui;
 
     protected final Color debugTextFill;
+    protected final Color debugTextStroke;
     protected final Font debugTextFont;
 
     protected final ObjectProperty<Font> arcadeFont8Property      = new SimpleObjectProperty<>();
@@ -51,8 +52,9 @@ public abstract class GameScene2D implements GameScene {
     protected GameScene2D(GameUI ui) {
         this.ui = requireNonNull(ui);
         actionBindings = new DefaultActionBindingsManager();
-        debugTextFill = ui.uiPreferences().getColor("debug_text.fill");
-        debugTextFont = ui.uiPreferences().getFont("debug_text.font");
+        debugTextFill   = ui.uiPreferences().getColor("debug_text.fill");
+        debugTextStroke = ui.uiPreferences().getColor("debug_text.stroke");
+        debugTextFont   = ui.uiPreferences().getFont("debug_text.font");
     }
 
     @Override
@@ -163,10 +165,11 @@ protected void drawDebugInfo() {
         gameRenderer.drawTileGrid(sizePx.x(), sizePx.y(), Color.LIGHTGRAY);
         gameRenderer.ctx().ifPresent(ctx -> {
             ctx.setFill(debugTextFill);
+            ctx.setStroke(debugTextStroke);
             ctx.setFont(debugTextFont);
             TickTimer stateTimer = gameContext().gameState().timer();
             String stateText = "Game State: '%s' (Tick %d of %s)".formatted(
-                gameContext().gameState(),
+                gameContext().gameState().name(),
                 stateTimer.tickCount(),
                 stateTimer.durationTicks() == TickTimer.INDEFINITE ? "∞" : String.valueOf(stateTimer.tickCount())
             );

pacman-ui/src/main/java/de/amr/pacmanfx/ui/api/GameUI_Preferences.java

@@ -47,8 +47,9 @@ protected void defineDefaultValues() {
         storeDefaultColor("context_menu.title.fill", Color.CORNFLOWERBLUE);
         storeDefaultFont("context_menu.title.font", Font.font("Dialog", FontWeight.BLACK, 14.0f));
 
-        storeDefaultColor("debug_text.fill", Color.YELLOW);
-        storeDefaultFont("debug_text.font", Font.font("Sans", FontWeight.BOLD, 16.0f));
+        storeDefaultColor("debug_text.fill", Color.WHITE);
+        storeDefaultColor("debug_text.stroke", Color.GRAY);
+        storeDefaultFont("debug_text.font", Font.font("Sans", 16.0f));
 
         storeDefaultValue("scene2d.max_scaling", 5.0f);
     }