Refac

Author: armin-reichert

pacman-app-arcade-mspacman/src/main/java/de/amr/pacmanfx/arcade/ms_pacman/rendering/ArcadeMsPacMan_GameRenderer.java

@@ -16,7 +16,6 @@
 import de.amr.pacmanfx.model.actors.BonusState;
 import de.amr.pacmanfx.ui.GameAssets;
 import de.amr.pacmanfx.ui._2d.GameRenderer;
-import de.amr.pacmanfx.ui.api.GameUI_Config;
 import de.amr.pacmanfx.uilib.assets.SpriteSheet;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.paint.Color;
@@ -52,12 +51,6 @@ protected ArcadeMsPacMan_GameRenderer(GameAssets assets, Canvas canvas, ArcadeMs
         this(assets, canvas, spriteSheet, null);
     }
 
-    @Override
-    public void dispose() {
-        spriteSheet = null;
-        brightMazesSpriteSheet = null;
-    }
-
     @Override
     public Optional<SpriteSheet<?>> optSpriteSheet() { return Optional.of(spriteSheet); }
 

pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/ArcadePacMan_UIConfig.java

@@ -74,6 +74,11 @@ public GameUI theUI() {
         return ui;
     }
 
+    @Override
+    public ArcadePacMan_SpriteSheet spriteSheet() {
+        return spriteSheet;
+    }
+
     public void storeAssets(AssetStorage assets) {
         storeLocalAssetValue(assets, "spritesheet", spriteSheet);
         storeLocalAssetValue(assets, "app_icon",         RES_ARCADE_PAC_MAN.loadImage("graphics/icons/pacman.png"));
@@ -164,29 +169,24 @@ public String assetNamespace() {
         return ASSET_NAMESPACE;
     }
 
-    @Override
-    public ArcadePacMan_GameRenderer createGameRenderer(Canvas canvas) {
-        return new ArcadePacMan_GameRenderer(ui.assets(), spriteSheet(), canvas);
-    }
-
     @Override
     public WorldMapColorScheme colorScheme(WorldMap worldMap) {
         return MAP_COLORING;
     }
 
     @Override
-    public ArcadePacMan_SpriteSheet spriteSheet() {
-        return spriteSheet;
+    public ArcadePacMan_GameRenderer createGameRenderer(Canvas canvas) {
+        return new ArcadePacMan_GameRenderer(ui.assets(), canvas, spriteSheet);
     }
 
     @Override
     public ArcadePacMan_GhostAnimationMap createGhostAnimations(Ghost ghost) {
-        return new ArcadePacMan_GhostAnimationMap(spriteSheet(), ghost.personality());
+        return new ArcadePacMan_GhostAnimationMap(spriteSheet, ghost.personality());
     }
 
     @Override
     public ArcadePacMan_PacAnimationMap createPacAnimations(Pac pac) {
-        return new ArcadePacMan_PacAnimationMap(spriteSheet());
+        return new ArcadePacMan_PacAnimationMap(spriteSheet);
     }
 
     @Override

pacman-app-arcade-pacman/src/main/java/de/amr/pacmanfx/arcade/pacman/rendering/ArcadePacMan_GameRenderer.java

@@ -25,32 +25,23 @@
 import static de.amr.pacmanfx.Globals.TS;
 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;
 import static java.util.function.Predicate.not;
 
 public class ArcadePacMan_GameRenderer extends GameRenderer {
 
     protected ArcadePacMan_SpriteSheet spriteSheet;
 
-    public ArcadePacMan_GameRenderer(GameAssets assets, ArcadePacMan_SpriteSheet spriteSheet, Canvas canvas) {
+    public ArcadePacMan_GameRenderer(GameAssets assets, Canvas canvas, ArcadePacMan_SpriteSheet spriteSheet) {
         super(assets);
-        this.ctx = requireNonNull(canvas).getGraphicsContext2D();
-        this.spriteSheet = requireNonNull(spriteSheet);
+        ctx = canvas.getGraphicsContext2D();
+        this.spriteSheet = spriteSheet;
     }
 
     @Override
     public Optional<SpriteSheet<?>> optSpriteSheet() { return Optional.of(spriteSheet); }
 
-    @Override
-    public void dispose() {
-        ctx = null;
-        spriteSheet = null;
-        scalingProperty.unbind();
-    }
-
     @Override
     public void drawHUD(GameContext gameContext, HUDData data, Vector2f sceneSize, long tick) {
-        requireNonNull(data);
         if (!data.isVisible()) return;
 
         if (data.isScoreVisible()) {

pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_GameRenderer.java

@@ -17,8 +17,8 @@ public class PacManXXL_PacMan_GameRenderer extends ArcadePacMan_GameRenderer {
 
     private final GenericMapRenderer mapRenderer;
 
-    public PacManXXL_PacMan_GameRenderer(GameAssets assets, ArcadePacMan_SpriteSheet spriteSheet, Canvas canvas) {
-        super(assets, spriteSheet, canvas);
+    public PacManXXL_PacMan_GameRenderer(GameAssets assets, Canvas canvas, ArcadePacMan_SpriteSheet spriteSheet) {
+        super(assets, canvas, spriteSheet);
         mapRenderer = new GenericMapRenderer(canvas);
         mapRenderer.scalingProperty().bind(scalingProperty());
     }

pacman-app-arcade-pacmanxxl/src/main/java/de/amr/pacmanfx/arcade/pacman_xxl/PacManXXL_PacMan_UIConfig.java

@@ -162,7 +162,7 @@ public String assetNamespace() {
 
     @Override
     public PacManXXL_PacMan_GameRenderer createGameRenderer(Canvas canvas) {
-        return new PacManXXL_PacMan_GameRenderer(ui.assets(), spriteSheet(), canvas);
+        return new PacManXXL_PacMan_GameRenderer(ui.assets(), canvas, spriteSheet);
     }
 
     @Override
@@ -194,12 +194,12 @@ public ArcadePacMan_SpriteSheet spriteSheet() {
 
     @Override
     public ArcadePacMan_GhostAnimationMap createGhostAnimations(Ghost ghost) {
-        return new ArcadePacMan_GhostAnimationMap(spriteSheet(), ghost.personality());
+        return new ArcadePacMan_GhostAnimationMap(spriteSheet, ghost.personality());
     }
 
     @Override
     public ArcadePacMan_PacAnimationMap createPacAnimations(Pac pac) {
-        return new ArcadePacMan_PacAnimationMap(spriteSheet());
+        return new ArcadePacMan_PacAnimationMap(spriteSheet);
     }
 
     @Override
@@ -242,7 +242,6 @@ public void createGameScenes() {
         scenesByID.put(SCENE_ID_CUT_SCENE_N_2D.formatted(3), new ArcadePacMan_CutScene3(ui));
     }
 
-
     @Override
     public GameScene selectGameScene(GameContext gameContext) {
         String sceneID = switch (gameContext.gameState()) {

pacman-app-tengen-mspacman/src/main/java/de/amr/pacmanfx/tengen/ms_pacman/rendering/TengenMsPacMan_GameRenderer.java

@@ -54,8 +54,8 @@ public static Color blueShadedColor(long tick) {
 
     private final ObjectProperty<Color> backgroundColorProperty = new SimpleObjectProperty<>(Color.BLACK);
 
-    private TengenMsPacMan_SpriteSheet spriteSheet;
-    private TengenMsPacMan_MapRepository mapRepository;
+    private final TengenMsPacMan_SpriteSheet spriteSheet;
+    private final TengenMsPacMan_MapRepository mapRepository;
     private ColoredMazeSpriteSet mazeSpriteSet;
 
     public TengenMsPacMan_GameRenderer(
@@ -71,14 +71,6 @@ public TengenMsPacMan_GameRenderer(
         this.mapRepository = requireNonNull(mapRepository);
     }
 
-    @Override
-    public void dispose() {
-        spriteSheet = null;
-        mapRepository = null;
-        backgroundColorProperty.unbind();
-        scalingProperty.unbind();
-    }
-
     @Override
     public Optional<SpriteSheet<?>> optSpriteSheet() {
         return Optional.of(spriteSheet);

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

@@ -36,7 +36,7 @@
 /**
  * Common base class of all 2D game renderers.
  */
-public abstract class GameRenderer implements Disposable {
+public abstract class GameRenderer {
 
     public static void fillCanvas(Canvas canvas, Color color) {
         requireNonNull(canvas);
@@ -350,9 +350,7 @@ public void drawMovingActorInfo(MovingActor movingActor) {
                 ctx().setFont(Font.font("Monospaced", scaled(6)));
                 ctx().fillText(text, scaled(pac.x() - 4), scaled(pac.y() + 16));
             }
-            case Bonus bonus -> {
-                //TODO
-            }
+            case Bonus bonus -> {} //TODO
             case Animated animated -> drawAnimatedMovingActorInfo(animated);
             default -> Logger.error("Cannot render moving actor info of class {}", movingActor.getClass().getSimpleName());
         }