Refac

armin-reichert · armin-reichert · commit 3892af743e09 · 2025-08-15T09:31:43.000+02:00
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
@@ -16,7 +16,7 @@
 import de.amr.pacmanfx.ui.api.GameUI_Config;
 import de.amr.pacmanfx.uilib.animation.SingleSpriteActor;
 
-import java.util.List;
+import java.util.stream.Stream;
 
 import static de.amr.pacmanfx.Globals.*;
 import static de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel.*;
@@ -106,7 +106,7 @@ public Vector2f sizeInPx() {
 
     @Override
     public void drawSceneContent() {
-        gameRenderer.drawActors(List.of(clapperboard, msPacMan, pacMan, inky, pinky, heart));
+        Stream.of(clapperboard, msPacMan, pacMan, inky, pinky, heart).forEach(gameRenderer::drawActor);
     }
 
     // Scene controller state machine
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
@@ -11,7 +11,7 @@
 import de.amr.pacmanfx.ui._2d.GameScene2D;
 import de.amr.pacmanfx.ui.api.GameUI;
 
-import java.util.List;
+import java.util.stream.Stream;
 
 import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel.createMsPacMan;
@@ -83,7 +83,7 @@ public Vector2f sizeInPx() {
 
     @Override
     public void drawSceneContent() {
-        gameRenderer.drawActors(List.of(clapperboard, msPacMan, pacMan));
+        Stream.of(clapperboard, msPacMan, pacMan).forEach(gameRenderer::drawActor);
     }
 
     // Scene controller state machine
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
@@ -14,7 +14,7 @@
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.api.GameUI_Config;
 
-import java.util.List;
+import java.util.stream.Stream;
 
 import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.arcade.ms_pacman.ArcadeMsPacMan_GameModel.createMsPacMan;
@@ -96,7 +96,7 @@ public Vector2f sizeInPx() {
 
     @Override
     public void drawSceneContent() {
-        gameRenderer.drawActors(List.of(clapperboard, msPacMan, pacMan, stork, bag));
+        Stream.of(clapperboard, msPacMan, pacMan, stork, bag).forEach(gameRenderer::drawActor);
     }
 
     // Scene controller state machine
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
@@ -133,7 +133,7 @@ public void drawSceneContent() {
         ctx().setFont(scaledArcadeFont8());
         gameRenderer.fillTextAtScaledPosition(TITLE, ARCADE_ORANGE, TITLE_X, TITLE_Y);
         gameRenderer.drawActor(marquee);
-        gameRenderer.drawActors(ghosts);
+        ghosts.forEach(gameRenderer::drawActor);
         gameRenderer.drawActor(msPacMan);
         switch (sceneController.state()) {
             case GHOSTS_MARCHING_IN -> {
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
@@ -105,7 +105,7 @@ else if (frame == ANIMATION_START + 632) {
 
     @Override
     public void drawSceneContent() {
-        gameRenderer.drawActors(actorsInZOrder);
+        actorsInZOrder.forEach(gameRenderer::drawActor);
     }
 
     @Override
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
@@ -131,7 +131,7 @@ public void update() {
     @Override
     public void drawSceneContent() {
         gameRenderer.drawSpriteScaled(nailDressRaptureAnimation.currentSprite(), TS(14), TS(19) + 3);
-        gameRenderer.drawActors(actorsInZOrder);
+        actorsInZOrder.forEach(gameRenderer::drawActor);
     }
 
     @Override
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
@@ -97,7 +97,7 @@ public void update() {
 
     @Override
     public void drawSceneContent() {
-        gameRenderer.drawActors(actorsInZOrder);
+        actorsInZOrder.forEach(gameRenderer::drawActor);
     }
 
     @Override
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
@@ -167,7 +167,7 @@ private void drawGuys(boolean shaking) {
         long tick = sceneController.state().timer().tickCount();
         int shakingAmount = shaking ? (tick % 5 < 2 ? 0 : -1) : 0;
         if (shakingAmount == 0) {
-            gameRenderer.drawActors(ghosts);
+            ghosts.forEach(gameRenderer::drawActor);
         } else {
             gameRenderer.drawActor(ghosts.get(RED_GHOST_SHADOW));
             gameRenderer.drawActor(ghosts.get(ORANGE_GHOST_POKEY));
diff --git a/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_PlayScene2D.java b/pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/scenes/ArcadePacMan_PlayScene2D.java
@@ -240,7 +240,7 @@ public void drawSceneContent() {
         Stream.of(ORANGE_GHOST_POKEY, CYAN_GHOST_BASHFUL, PINK_GHOST_SPEEDY, RED_GHOST_SHADOW).map(gameLevel::ghost)
                 .forEach(actorsInZOrder::add);
 
-        gameRenderer.drawActors(actorsInZOrder);
+        actorsInZOrder.forEach(gameRenderer::drawActor);
 
         if (isDebugInfoVisible()) {
             actorsInZOrder.forEach(actor -> {
diff --git a/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_StartPageMenu.java b/pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_Common_StartPageMenu.java
@@ -49,7 +49,7 @@ private static class ChaseAnimation {
         private final GraphicsContext ctx;
         private final Pac pac;
         private final List<Ghost> ghosts;
-        private GameRenderer renderer;
+        private GameRenderer gameRenderer;
         private boolean chasingGhosts;
         private boolean running;
 
@@ -140,14 +140,14 @@ void draw(float scaling) {
             ctx.save();
             ctx.translate(0, 23.5 * TS * scaling);
             ctx.setImageSmoothing(false);
-            renderer.setScaling(scaling);
-            renderer.drawActors(ghosts);
-            renderer.drawActor(pac);
+            gameRenderer.setScaling(scaling);
+            ghosts.forEach(gameRenderer::drawActor);
+            gameRenderer.drawActor(pac);
             ctx.restore();
         }
 
         void setGameConfig(GameUI_Config config) {
-            renderer = config.createGameRenderer(ctx.getCanvas());
+            gameRenderer = config.createGameRenderer(ctx.getCanvas());
             pac.setAnimations(config.createPacAnimations(pac));
             pac.animations().ifPresent(am -> am.play(ANIM_PAC_MUNCHING));
             for (Ghost ghost : ghosts) {
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene1.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene1.java
@@ -20,6 +20,7 @@
 import de.amr.pacmanfx.uilib.animation.SingleSpriteActor;
 
 import java.util.List;
+import java.util.stream.Stream;
 
 import static de.amr.pacmanfx.Globals.*;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_GHOST_NORMAL;
@@ -243,6 +244,6 @@ public void draw() {
 
     @Override
     public void drawSceneContent() {
-        renderer().drawActors(List.of(clapperboard, msPacMan, pacMan, inky, pinky, heart));
+        Stream.of(clapperboard, msPacMan, pacMan, inky, pinky, heart).forEach(gameRenderer::drawActor);
     }
 }
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene2.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene2.java
@@ -16,7 +16,7 @@
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.api.GameUI_Config;
 
-import java.util.List;
+import java.util.stream.Stream;
 
 import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_MUNCHING;
@@ -175,6 +175,6 @@ public void draw() {
 
     @Override
     public void drawSceneContent() {
-        renderer().drawActors(List.of(clapperboard, msPacMan, pacMan));
+        Stream.of(clapperboard, msPacMan, pacMan).forEach(gameRenderer::drawActor);
     }
 }
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene3.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene3.java
@@ -16,7 +16,7 @@
 import de.amr.pacmanfx.ui.api.GameUI;
 import de.amr.pacmanfx.ui.api.GameUI_Config;
 
-import java.util.List;
+import java.util.stream.Stream;
 
 import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.model.actors.CommonAnimationID.ANIM_PAC_MUNCHING;
@@ -176,7 +176,7 @@ public void draw() {
     @Override
     public void drawSceneContent() {
         if (!darkness) {
-            renderer().drawActors(List.of(clapperboard, stork, flyingBag, msPacMan, pacMan));
+            Stream.of(clapperboard, stork, flyingBag, msPacMan, pacMan).forEach(gameRenderer::drawActor);
         }
     }
 }
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene4.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_CutScene4.java
@@ -15,6 +15,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.lib.RandomNumberSupport.randomInt;
@@ -233,7 +234,7 @@ public void draw() {
 
     @Override
     public void drawSceneContent() {
-        renderer().drawActors(List.of(clapperboard, msPacMan, pacMan));
-        renderer().drawActors(juniors);
+        Stream.of(clapperboard, msPacMan, pacMan).forEach(gameRenderer::drawActor);
+        juniors.forEach(gameRenderer::drawActor);
     }
 }
diff --git a/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_IntroScene.java b/pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/scenes/TengenMsPacMan_IntroScene.java
@@ -113,38 +113,38 @@ public void drawSceneContent() {
         switch (sceneController.state()) {
             case WAITING_FOR_START -> {
                 if (!dark) {
-                    renderer().fillTextAtScaledPosition("TENGEN PRESENTS", blueShadedColor(tick), presentsText.x(), presentsText.y());
-                    renderer().drawSpriteScaled(spriteSheet.sprite(SpriteID.TITLE_TEXT), 6 * TS, MARQUEE_Y);
+                    gameRenderer.fillTextAtScaledPosition("TENGEN PRESENTS", blueShadedColor(tick), presentsText.x(), presentsText.y());
+                    gameRenderer.drawSpriteScaled(spriteSheet.sprite(SpriteID.TITLE_TEXT), 6 * TS, MARQUEE_Y);
                     if (tick % 60 < 30) {
-                        renderer().fillTextAtScaledPosition("PRESS START", nesPaletteColor(0x20), 11 * TS, MARQUEE_Y + 9 * TS);
+                        gameRenderer.fillTextAtScaledPosition("PRESS START", nesPaletteColor(0x20), 11 * TS, MARQUEE_Y + 9 * TS);
                     }
-                    renderer().fillTextAtScaledPosition("MS PAC-MAN TM NAMCO LTD", nesPaletteColor(0x25), 6 * TS, MARQUEE_Y + 15 * TS);
-                    renderer().fillTextAtScaledPosition("©1990 TENGEN INC",        nesPaletteColor(0x25), 8 * TS, MARQUEE_Y + 16 * TS);
-                    renderer().fillTextAtScaledPosition("ALL RIGHTS RESERVED",     nesPaletteColor(0x25), 7 * TS, MARQUEE_Y + 17 * TS);
+                    gameRenderer.fillTextAtScaledPosition("MS PAC-MAN TM NAMCO LTD", nesPaletteColor(0x25), 6 * TS, MARQUEE_Y + 15 * TS);
+                    gameRenderer.fillTextAtScaledPosition("©1990 TENGEN INC",        nesPaletteColor(0x25), 8 * TS, MARQUEE_Y + 16 * TS);
+                    gameRenderer.fillTextAtScaledPosition("ALL RIGHTS RESERVED",     nesPaletteColor(0x25), 7 * TS, MARQUEE_Y + 17 * TS);
                 }
             }
             case SHOWING_MARQUEE -> {
                 drawMarquee();
-                renderer().fillTextAtScaledPosition("\"MS PAC-MAN\"", nesPaletteColor(0x28), MARQUEE_X + 20, MARQUEE_Y - 18);
+                gameRenderer.fillTextAtScaledPosition("\"MS PAC-MAN\"", nesPaletteColor(0x28), MARQUEE_X + 20, MARQUEE_Y - 18);
             }
             case GHOSTS_MARCHING_IN -> {
                 drawMarquee();
-                renderer().fillTextAtScaledPosition("\"MS PAC-MAN\"", nesPaletteColor(0x28), MARQUEE_X + 20, MARQUEE_Y - 18);
+                gameRenderer.fillTextAtScaledPosition("\"MS PAC-MAN\"", nesPaletteColor(0x28), MARQUEE_X + 20, MARQUEE_Y - 18);
                 if (ghostIndex == 0) {
-                    renderer().fillTextAtScaledPosition("WITH", nesPaletteColor(0x20), MARQUEE_X + 12, MARQUEE_Y + 23);
+                    gameRenderer.fillTextAtScaledPosition("WITH", nesPaletteColor(0x20), MARQUEE_X + 12, MARQUEE_Y + 23);
                 }
                 Ghost currentGhost = ghosts.get(ghostIndex);
                 Color ghostColor = ui.assets().color("tengen.ghost.%d.color.normal.dress".formatted(currentGhost.id().personality()));
-                renderer().fillTextAtScaledPosition(currentGhost.name().toUpperCase(), ghostColor, MARQUEE_X + 44, MARQUEE_Y + 41);
-                renderer().drawActors(ghosts);
+                gameRenderer.fillTextAtScaledPosition(currentGhost.name().toUpperCase(), ghostColor, MARQUEE_X + 44, MARQUEE_Y + 41);
+                ghosts.forEach(gameRenderer::drawActor);
             }
             case MS_PACMAN_MARCHING_IN -> {
                 drawMarquee();
-                renderer().fillTextAtScaledPosition("\"MS PAC-MAN\"", nesPaletteColor(0x28), MARQUEE_X + 20, MARQUEE_Y - 18);
-                renderer().fillTextAtScaledPosition("STARRING", nesPaletteColor(0x20), MARQUEE_X + 12, MARQUEE_Y + 22);
-                renderer().fillTextAtScaledPosition("MS PAC-MAN", nesPaletteColor(0x28), MARQUEE_X + 28, MARQUEE_Y + 38);
-                renderer().drawActors(ghosts);
-                renderer().drawActor(msPacMan);
+                gameRenderer.fillTextAtScaledPosition("\"MS PAC-MAN\"", nesPaletteColor(0x28), MARQUEE_X + 20, MARQUEE_Y - 18);
+                gameRenderer.fillTextAtScaledPosition("STARRING", nesPaletteColor(0x20), MARQUEE_X + 12, MARQUEE_Y + 22);
+                gameRenderer.fillTextAtScaledPosition("MS PAC-MAN", nesPaletteColor(0x28), MARQUEE_X + 28, MARQUEE_Y + 38);
+                ghosts.forEach(gameRenderer::drawActor);
+                gameRenderer.drawActor(msPacMan);
             }
         }
 
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
@@ -481,7 +481,7 @@ public void drawSceneContent() {
         gameContext().gameLevel().bonus().ifPresent(actorsByZ::add);
         actorsByZ.add(gameContext().gameLevel().pac());
         ghostsByZ(gameContext().gameLevel()).forEach(actorsByZ::add);
-        renderer().drawActors(actorsByZ);
+        actorsByZ.forEach(gameRenderer::drawActor);
 
         ctx().restore();
     }
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
@@ -23,11 +23,11 @@
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.image.Image;
 import javafx.scene.paint.Color;
+import javafx.scene.paint.Paint;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
 import org.tinylog.Logger;
 
-import java.util.List;
 import java.util.Optional;
 
 import static de.amr.pacmanfx.Globals.HTS;
@@ -39,11 +39,11 @@
  */
 public abstract class GameRenderer {
 
-    public static void fillCanvas(Canvas canvas, Color color) {
+    public static void fillCanvas(Canvas canvas, Paint paint) {
         requireNonNull(canvas);
-        requireNonNull(color);
+        requireNonNull(paint);
         GraphicsContext ctx = canvas.getGraphicsContext2D();
-        ctx.setFill(color);
+        ctx.setFill(paint);
         ctx.fillRect(0, 0, canvas.getWidth(), canvas.getHeight());
     }
 
@@ -107,17 +107,6 @@ public abstract void drawLevel(
         boolean energizerHighlighted,
         long tick);
 
-    /**
-     * Draws the specified actors in sequence.
-     *
-     * @param actors list of actors
-     */
-    public <T extends Actor> void drawActors(List<T> actors) {
-        for (Actor actor : actors) {
-            drawActor(actor);
-        }
-    }
-
     /**
      * Draws an actor (Pac-Man, ghost, moving bonus, etc.) if it is visible.
      *

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ else if (frame == ANIMATION_START + 632) {`
`105`	`105`
`106`	`106`	`@Override`
`107`	`107`	`public void drawSceneContent() {`
`108`		`- gameRenderer.drawActors(actorsInZOrder);`
	`108`	`+ actorsInZOrder.forEach(gameRenderer::drawActor);`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ public void update() {`
`131`	`131`	`@Override`
`132`	`132`	`public void drawSceneContent() {`
`133`	`133`	`gameRenderer.drawSpriteScaled(nailDressRaptureAnimation.currentSprite(), TS(14), TS(19) + 3);`
`134`		`- gameRenderer.drawActors(actorsInZOrder);`
	`134`	`+ actorsInZOrder.forEach(gameRenderer::drawActor);`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void update() {`
`97`	`97`
`98`	`98`	`@Override`
`99`	`99`	`public void drawSceneContent() {`
`100`		`- gameRenderer.drawActors(actorsInZOrder);`
	`100`	`+ actorsInZOrder.forEach(gameRenderer::drawActor);`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`@Override`