Refac 2D rendering

Author: armin-reichert

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

@@ -9,18 +9,51 @@
 import de.amr.pacmanfx.uilib.assets.SpriteSheet;
 import javafx.scene.image.Image;
 
+import static de.amr.pacmanfx.Globals.TS;
 import static de.amr.pacmanfx.lib.RectShort.rect;
 
 public record NonArcadeMapsSpriteSheet(Image sourceImage) implements SpriteSheet<NonArcadeMapsSpriteSheet.MazeID> {
 
     public enum MazeID {
-        MAZE15;
+        MAZE1, MAZE2, MAZE3, MAZE4, MAZE5, MAZE6, MAZE7, MAZE8, MAZE9, MAZE10,
+        MAZE11, MAZE12, MAZE13, MAZE14, MAZE15, MAZE16, MAZE17, MAZE18, MAZE19,
+        MAZE20, MAZE21, MAZE22, MAZE23, MAZE24, MAZE25, MAZE26, MAZE27, MAZE28,
+        MAZE29, MAZE30, MAZE31, MAZE32, MAZE33, MAZE34, MAZE35, MAZE36
     }
 
     private static final SpriteMap<MazeID> SPRITE_MAP = new SpriteMap<>(MazeID.class);
 
+    // Map row counts as they appear in the non-ARCADE mazes sprite sheet (row by row)
+    private static final byte[] NON_ARCADE_MAP_ROW_COUNTS = {
+        31, 31, 31, 31, 31, 31, 30, 31,
+        31, 37, 31, 31, 31, 37, 31, 25,
+        37, 31, 37, 37, 37, 37, 37, 31,
+        37, 37, 31, 25, 31, 25, 31, 31, 37,
+        25, 25, 25, 25,
+    };
+
     static {
-        SPRITE_MAP.add(MazeID.MAZE15,
+        MazeID[] ids = MazeID.values();
+        int idNumber = 1;
+
+        int width = 28 * TS;
+        int[] ys = {0, 248, 544, 840, 1136};
+
+        // first 4 rows
+        for (int row = 0; row < 5; ++row) {
+            for (int col = 0; col < 8; ++col) {
+                int height = NON_ARCADE_MAP_ROW_COUNTS[col] * TS;
+                if (idNumber != 32) {
+                    SPRITE_MAP.add(ids[idNumber - 1], new RectShort(col * width, ys[row], width, height));
+                    ++idNumber;
+                }
+                if (row == 4 && col == 3) {
+                    break; // last maze in sprite sheet reached
+                }
+            }
+        }
+        // Maze #32 is special and has 3 animation frames
+        SPRITE_MAP.add(MazeID.MAZE32,
             rect(1568, 840, 224, 248), rect(1568, 1088, 224, 248), rect(1568, 1336, 224, 248)
         );
     }

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

@@ -35,7 +35,6 @@
 import static de.amr.pacmanfx.Globals.TS;
 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.rendering.NonArcadeMapsSpriteSheet.MazeID.MAZE15;
 import static java.util.Objects.requireNonNull;
 import static java.util.function.Predicate.not;
 
@@ -240,10 +239,10 @@ public void drawLevel(
         var game = (TengenMsPacMan_GameModel) gameContext.game();
         int mapNumber = level.worldMap().getConfigValue("mapNumber");
         if (game.mapCategory() == MapCategory.STRANGE && mapNumber == 15) {
-            int spriteIndex = strangeMap15SpriteIndex(tick);
+            int spriteIndex = mazeAnimationSpriteIndex(tick);
             drawLevelWithMaze(gameContext, level,
                 uiConfig.recoloredMazeSprites().mazeSprite().image(),
-                uiConfig.nonArcadeMapsSpriteSheet().spriteSequence(MAZE15)[spriteIndex]);
+                uiConfig.nonArcadeMapsSpriteSheet().spriteSequence(NonArcadeMapsSpriteSheet.MazeID.MAZE32)[spriteIndex]);
         } else {
             drawLevelWithMaze(gameContext, level,
                 uiConfig.recoloredMazeSprites().mazeSprite().image(),
@@ -252,10 +251,10 @@ public void drawLevel(
     }
 
     /*
-       Strange map #15: psychedelic animation:
+       Strange map #15 (maze #32): psychedelic animation:
        Frame pattern: (00000000 11111111 22222222 11111111)+, numFrames = 4, frameDuration = 8
      */
-    private int strangeMap15SpriteIndex(long tick) {
+    private int mazeAnimationSpriteIndex(long tick) {
         long block = (tick % 32) / 8;
         return (int) (block < 3 ? block : 1);
     }