Refac

Author: armin-reichert

pacman-ui/src/main/java/de/amr/pacmanfx/ui/layout/MiniGameView.java

@@ -15,7 +15,6 @@
 import javafx.beans.property.*;
 import javafx.geometry.Insets;
 import javafx.scene.canvas.Canvas;
-import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.layout.Background;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
@@ -24,11 +23,12 @@
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
 import javafx.util.Duration;
-import org.tinylog.Logger;
 
 import java.util.stream.Stream;
 
 import static de.amr.pacmanfx.Globals.*;
+import static de.amr.pacmanfx.ui.GameUI_Config.SCENE_ID_PLAY_SCENE_3D;
+import static java.util.Objects.requireNonNull;
 
 public class MiniGameView extends VBox {
 
@@ -43,7 +43,10 @@ public class MiniGameView extends VBox {
 
     private final Canvas canvas;
     private final HBox canvasContainer;
+
+    private GameUI ui;
     private GameRenderer gr;
+    private GameLevel gameLevel;
     private long drawCallCount;
 
     private final Animation moveIntoScreenAnimation;
@@ -85,7 +88,20 @@ public DoubleProperty canvasHeightProperty() {
         return canvasHeightProperty;
     }
 
-    public void onLevelCreated(GameUI ui, GameLevel gameLevel) {
+    public void setGameUI(GameUI ui) {
+        this.ui = requireNonNull(ui);
+        backgroundColorProperty().bind(GameUI.PROPERTY_CANVAS_BACKGROUND_COLOR);
+        debugProperty().bind(GameUI.PROPERTY_DEBUG_INFO_VISIBLE);
+        canvasHeightProperty().bind(GameUI.PROPERTY_MINI_VIEW_HEIGHT);
+        opacityProperty().bind(GameUI.PROPERTY_MINI_VIEW_OPACITY_PERCENT.divide(100.0));
+        visibleProperty().bind(Bindings.createObjectBinding(
+            () -> GameUI.PROPERTY_MINI_VIEW_ON.get() && ui.isCurrentGameSceneID(SCENE_ID_PLAY_SCENE_3D),
+            GameUI.PROPERTY_MINI_VIEW_ON, GameUI.PROPERTY_CURRENT_GAME_SCENE
+        ));
+    }
+
+    public void setGameLevel(GameLevel gameLevel) {
+        this.gameLevel = requireNonNull(gameLevel);
         worldSizeProperty.set(gameLevel.worldSizePx());
         gr = ui.theConfiguration().createGameRenderer(canvas);
         gr.applyRenderingHints(gameLevel);
@@ -116,39 +132,37 @@ private Animation createMoveOffScreenAnimation() {
         return transition;
     }
 
-    public void draw(GameUI ui, GameLevel gameLevel) {
-        GraphicsContext ctx = canvas.getGraphicsContext2D();
-        float scaling = scalingProperty.floatValue();
-        ctx.setFill(backgroundColorProperty().get());
-        ctx.fillRect(0, 0, canvas.getWidth(), canvas.getHeight());
+    public void draw() {
+        drawCallCount += 1;
         if (gr == null) {
-            Logger.warn("Cannot draw game scene without game renderer");
-            return;
-        }
-        if (gameLevel == null) {
-            Logger.warn("No game level to draw in mini game view");
             return;
         }
+        float scaling = scalingProperty.get();
         gr.setScaling(scaling);
-        gr.drawLevel(ui.theGameContext(),
-            gameLevel,
-            backgroundColorProperty().get(),
-            false,
-            gameLevel.blinking().isOn(),
-            ui.theGameClock().tickCount());
-        gameLevel.bonus().ifPresent(gr::drawActor);
-        gr.drawActor(gameLevel.pac());
-        Stream.of(ORANGE_GHOST_POKEY, CYAN_GHOST_BASHFUL, PINK_GHOST_SPEEDY, RED_GHOST_SHADOW)
+        gr.ctx().setFill(backgroundColorProperty().get());
+        gr.ctx().fillRect(0, 0, canvas.getWidth(), canvas.getHeight());
+
+        if (gameLevel != null) {
+            gr.drawLevel(ui.theGameContext(),
+                gameLevel,
+                backgroundColorProperty().get(),
+                false,
+                gameLevel.blinking().isOn(),
+                ui.theGameClock().tickCount());
+            gameLevel.bonus().ifPresent(gr::drawActor);
+            gr.drawActor(gameLevel.pac());
+            Stream.of(ORANGE_GHOST_POKEY, CYAN_GHOST_BASHFUL, PINK_GHOST_SPEEDY, RED_GHOST_SHADOW)
                 .map(gameLevel::ghost)
                 .forEach(gr::drawActor);
+        }
+
         if (debugProperty().get()) {
-            ctx.save();
-            ctx.setTextAlign(TextAlignment.CENTER);
-            ctx.setFill(Color.WHITE);
-            ctx.setFont(Font.font(14 * scaling));
-            ctx.fillText("scaling: %.2f, draw calls: %d".formatted(scaling, drawCallCount), canvas.getWidth() * 0.5, 16 * scaling);
-            ctx.restore();
+            gr.ctx().save();
+            gr.ctx().setTextAlign(TextAlignment.CENTER);
+            gr.ctx().setFill(Color.WHITE);
+            gr.ctx().setFont(Font.font(14 * scaling));
+            gr.ctx().fillText("scaling: %.2f, draw calls: %d".formatted(scaling, drawCallCount), canvas.getWidth() * 0.5, 16 * scaling);
+            gr.ctx().restore();
         }
-        drawCallCount += 1;
     }
 }

pacman-ui/src/main/java/de/amr/pacmanfx/ui/layout/PlayView.java

@@ -86,7 +86,7 @@ public PlayView(GameUI ui, Scene parentScene) {
         dashboard = new Dashboard(ui);
         dashboard.setVisible(false);
 
-        configureMiniView();
+        miniView.setGameUI(ui);
         configureCanvasContainer();
         createLayout();
         configurePropertyBindings();
@@ -175,7 +175,7 @@ public void draw() {
         });
 
         if (miniView.isVisible() && ui.isCurrentGameSceneID(SCENE_ID_PLAY_SCENE_3D) && ui.theGameContext().optGameLevel().isPresent()) {
-            miniView.draw(ui, ui.theGameContext().theGameLevel());
+            miniView.draw();
         }
 
         // Dashboard updates must be called from permanent clock task too!
@@ -211,7 +211,7 @@ public void onGameEvent(GameEvent gameEvent) {
                     ActorAnimationMap ghostAnimationMap = config.createGhostAnimations(ghost);
                     ghost.setAnimations(ghostAnimationMap);
                 });
-                miniView.onLevelCreated(ui, gameLevel);
+                miniView.setGameLevel(gameLevel);
 
                 // size of game scene might have changed, so re-embed
                 ui.currentGameScene().ifPresent(gameScene -> embedGameScene(parentScene, gameScene));
@@ -310,17 +310,6 @@ private void embedGameScene2DWithoutSubScene(GameScene2D gameScene2D) {
 
     // -----------------------------------------------------------------------------------------------------------------
 
-    private void configureMiniView() {
-        miniView.backgroundColorProperty().bind(GameUI.PROPERTY_CANVAS_BACKGROUND_COLOR);
-        miniView.debugProperty().bind(GameUI.PROPERTY_DEBUG_INFO_VISIBLE);
-        miniView.canvasHeightProperty().bind(GameUI.PROPERTY_MINI_VIEW_HEIGHT);
-        miniView.opacityProperty().bind(GameUI.PROPERTY_MINI_VIEW_OPACITY_PERCENT.divide(100.0));
-        miniView.visibleProperty().bind(Bindings.createObjectBinding(
-            () -> GameUI.PROPERTY_MINI_VIEW_ON.get() && ui.isCurrentGameSceneID(SCENE_ID_PLAY_SCENE_3D),
-            GameUI.PROPERTY_MINI_VIEW_ON, GameUI.PROPERTY_CURRENT_GAME_SCENE
-        ));
-    }
-
     private void configureCanvasContainer() {
         canvasContainer.setMinScaling(0.5);
         // 28*TS x 36*TS = Arcade map size in pixels