Merge pull request #10 from sabino/doomgeo-ceiling-forward-motion

Restore ceiling plane in texture experiment

Author: sabino

Makefile

@@ -69,6 +69,7 @@ DOOM_INPUT_DEBUG?=0
 DOOM_CHUNK_MOVEMENT_TEST?=0
 DOOM_CHUNK_MOVEMENT_START_DELAY?=0
 DOOM_SKIP_INTRO?=0
+DOOM_TITLEPIC?=1
 DOOM_WALL_UPLOAD_COLUMNS?=
 DOOM_WALL_UPLOAD_OVERRUN_COLUMNS?=
 ifeq ($(DOOM_SIMPLE_MAP),1)
@@ -93,6 +94,7 @@ DOOM_FLAT_PLANES?=0
 DOOM_CROM_FILE_BYTES?=4194304
 DOOM_PLANE_PHASE_SHIFT?=15
 DOOM_E1M1_MULTIFLOOR_SPRITES=3004:POSSA1,3004:POSSA2A8,3004:POSSA3A7,3004:POSSA4A6,3004:POSSA5,3004:POSSB1,3004:POSSB2B8,3004:POSSB3B7,3004:POSSB4B6,3004:POSSB5,3001:TROOA1,3001:TROOA2A8,3001:TROOA3A7,3001:TROOA4A6,3001:TROOA5,3001:TROOB1,3001:TROOB2B8,3001:TROOB3B7,3001:TROOB4B6,3001:TROOB5,9010:POSSH0,9015:POSSI0,9020:POSSJ0,9032:POSSK0,9001:POSSL0,9012:TROOI0,9017:TROOJ0,9022:TROOK0,9034:TROOL0,9003:TROOR0,5:BKEYA0,6:YKEYA0,13:RKEYA0,2001:SHOTA0,2002:MGUNA0,2003:LAUNA0,2007:CLIPA0,2008:SHELA0,2011:STIMA0,2012:MEDIA0,2014:BON1A0,2015:BON2A0,2018:ARM1A0,2019:ARM2A0,2046:BROKA0,2048:AMMOA0,2049:SBOXA0,2035:BAR1A0,9000:BEXPC0,9006:BAL1A0
+DOOM_SIMPLE_EXPERIMENT_SPRITES=3004:POSSA1,3004:POSSA2A8,3004:POSSA3A7,3004:POSSA4A6,3004:POSSA5,3001:TROOA1,3001:TROOA2A8,3001:TROOA3A7,3001:TROOA4A6,3001:TROOA5,9010:POSSH0,9015:POSSI0,9020:POSSJ0,9032:POSSK0,9001:POSSL0,9012:TROOI0,9017:TROOJ0,9022:TROOK0,9034:TROOL0,9003:TROOR0,5:BKEYA0,2001:SHOTA0,2007:CLIPA0,2011:STIMA0,2018:ARM1A0,2035:BAR1A0,9000:BEXPC0,9006:BAL1A0
 ifeq ($(DOOM_MULTIFLOOR_RENDER),1)
 DOOM_MONSTER_SPRITES?=$(DOOM_E1M1_MULTIFLOOR_SPRITES)
 DOOM_SPRITE_SCALES?=1.00,0.75,0.50,0.33,0.25
@@ -133,6 +135,7 @@ DOOM_MAP_CLEANUP_ARGS=$(if $(filter 1 yes true,$(DOOM_MAP_READABILITY_CLEANUP)),
 GFX_SIMPLE_MAP_ARG=$(if $(filter 1 yes true,$(DOOM_SIMPLE_MAP)),--simple-map,)
 GFX_PLANE_PHASE_ARGS=--floor-forward-phases $(DOOM_PLANE_FLOOR_FORWARD_PHASES) --ceiling-forward-phases $(DOOM_PLANE_CEILING_FORWARD_PHASES)
 GFX_CEILING_ARG=$(if $(filter 0 no false,$(DOOM_CEILING_PERSPECTIVE)),--no-ceiling-perspective,)
+GFX_TITLEPIC_ARG=$(if $(filter 0 no false,$(DOOM_TITLEPIC)),--no-titlepic,)
 GFX_CROM_BYTES_ARG=--crom-file-bytes $(DOOM_CROM_FILE_BYTES)
 GFX_MONSTER_SPRITES_ARG=$(if $(strip $(DOOM_MONSTER_SPRITES)),--monster-sprites '$(DOOM_MONSTER_SPRITES)',)
 GFX_SPRITE_SCALES_ARG=$(if $(strip $(DOOM_SPRITE_SCALES)),--sprite-scales '$(DOOM_SPRITE_SCALES)',)
@@ -168,6 +171,9 @@ endif
 ifeq ($(DOOM_SKIP_INTRO),1)
 override CFLAGS += -DDOOM_SKIP_INTRO=1
 endif
+ifeq ($(DOOM_TITLEPIC),0)
+override CFLAGS += -DDOOM_TITLEPIC=0
+endif
 override CFLAGS += -DDOOM_WALL_LAYERS=$(DOOM_WALL_LAYERS)
 ifeq ($(DOOM_MULTIFLOOR_RENDER),1)
 override CFLAGS += -DDOOM_MULTIFLOOR_RENDER=1
@@ -580,9 +586,10 @@ EXPERIMENT_GFX_ROM_DIR=$(EXPERIMENT_DIR)/assets
 EXPERIMENT_MANIFEST=$(EXPERIMENT_DIR)/manifest.txt
 RENDER_EXPERIMENT_COMMON=DOOM_MAP=E1M1 DOOM_DETAIL=quality DOOM_SKIP_INTRO=1 DOOM_WALL_TEXTURE=STARTAN3 DOOM_WALL_UPLOAD_COLUMNS=255 DOOM_WALL_UPLOAD_OVERRUN_COLUMNS=255
 RENDER_EXPERIMENT_E1M1_ASSETS=DOOM_MONSTER_SPRITES=$(DOOM_E1M1_MULTIFLOOR_SPRITES) DOOM_SPRITE_SCALES=1.00,0.75,0.50,0.33,0.25 DOOM_CROM_FILE_BYTES=1048576
+RENDER_EXPERIMENT_SIMPLE_ASSETS=DOOM_MONSTER_SPRITES=$(DOOM_SIMPLE_EXPERIMENT_SPRITES) DOOM_SPRITE_SCALES=1.00,0.75,0.50,0.33 DOOM_CROM_FILE_BYTES=1048576
 
 EXPERIMENT_DESC_texture_columns=Generated STARTAN3 texture columns on the stable simple-map raycaster.
-EXPERIMENT_FLAGS_texture_columns=$(RENDER_EXPERIMENT_COMMON) $(RENDER_EXPERIMENT_E1M1_ASSETS) DOOM_SIMPLE_MAP=1 DOOM_CHUNKED_SIMPLE_MAP=0 DOOM_CEILING_PERSPECTIVE=0 DOOM_FLAT_PLANES=0
+EXPERIMENT_FLAGS_texture_columns=$(RENDER_EXPERIMENT_COMMON) $(RENDER_EXPERIMENT_SIMPLE_ASSETS) DOOM_SIMPLE_MAP=1 DOOM_CHUNKED_SIMPLE_MAP=0 DOOM_TITLEPIC=0 DOOM_CEILING_PERSPECTIVE=1 DOOM_PLANE_FLOOR_FORWARD_PHASES=2 DOOM_PLANE_CEILING_FORWARD_PHASES=2 DOOM_BG_SCROLL_COLUMNS=20 DOOM_BG_SCROLL_OVERRUN_COLUMNS=20 DOOM_FLAT_PLANES=0
 EXPERIMENT_PROBES_texture_columns=simple-enemy-visibility-check
 
 EXPERIMENT_DESC_ripdoom_flat=Actual E1M1 RIPDOOM geometry, one wall layer, flat floor/ceiling backdrop.
@@ -749,7 +756,7 @@ $(GFX_ROM_DIR)/c1.bin $(GFX_ROM_DIR)/c2.bin $(GFX_ROM_DIR)/s1.bin $(GFX_ROM_DIR)
 	@test -f $@
 
 $(GFX_STAMP): tools/gen_gfx.py tools/doom_convert.py config.h $(DOOM_MAP_HEADER) $(DOOM_IWAD) | $(BUILDDIR) $(GFX_ROM_DIR)
-	$(PYTHON) tools/gen_gfx.py --iwad $(DOOM_IWAD) --map $(DOOM_MAP) --wall-texture $(DOOM_WALL_TEXTURE) --detail $(DOOM_DETAIL) $(GFX_SIMPLE_MAP_ARG) $(GFX_PLANE_PHASE_ARGS) $(GFX_CEILING_ARG) $(GFX_CROM_BYTES_ARG) $(GFX_MONSTER_SPRITES_ARG) $(GFX_SPRITE_SCALES_ARG) --palette-header $(GFX_HEADER) --out-dir $(GFX_ROM_DIR)
+	$(PYTHON) tools/gen_gfx.py --iwad $(DOOM_IWAD) --map $(DOOM_MAP) --wall-texture $(DOOM_WALL_TEXTURE) --detail $(DOOM_DETAIL) $(GFX_SIMPLE_MAP_ARG) $(GFX_PLANE_PHASE_ARGS) $(GFX_CEILING_ARG) $(GFX_TITLEPIC_ARG) $(GFX_CROM_BYTES_ARG) $(GFX_MONSTER_SPRITES_ARG) $(GFX_SPRITE_SCALES_ARG) --palette-header $(GFX_HEADER) --out-dir $(GFX_ROM_DIR)
 	touch $@
 
 $(GFX_ROM_DIR):

config.h

@@ -345,6 +345,9 @@
 #ifndef DOOM_CEILING_PERSPECTIVE
 #define DOOM_CEILING_PERSPECTIVE 1
 #endif
+#ifndef DOOM_TITLEPIC
+#define DOOM_TITLEPIC 1
+#endif
 #ifndef DOOM_DYNAMIC_SECTOR_FLATS
 #if DOOM_MULTIFLOOR_RENDER
 #define DOOM_DYNAMIC_SECTOR_FLATS 0
@@ -411,8 +414,13 @@
 #define TILE_CEILING_PERSPECTIVE_BASE (TILE_HUD_SMALL_DIGIT_BASE + TILE_HUD_SMALL_DIGIT_COUNT)
 #define TILE_FLOOR_PERSPECTIVE_BASE (TILE_CEILING_PERSPECTIVE_BASE + TILE_CEILING_PERSPECTIVE_TILES)
 #define TILE_TITLEPIC_BASE (TILE_FLOOR_PERSPECTIVE_BASE + TILE_FLOOR_PERSPECTIVE_TILES)
+#if DOOM_TITLEPIC
 #define TILE_TITLEPIC_COLS 20
 #define TILE_TITLEPIC_ROWS 13
+#else
+#define TILE_TITLEPIC_COLS 0
+#define TILE_TITLEPIC_ROWS 0
+#endif
 #define TILE_TITLEPIC_TILES (TILE_TITLEPIC_COLS * TILE_TITLEPIC_ROWS)
 #define TILE_FLASH_CHECKER (TILE_TITLEPIC_BASE + TILE_TITLEPIC_TILES)
 #define TILE_FLASH_CHECKER_COUNT 1

docs/renderer-experiments.md

@@ -50,8 +50,8 @@ real hardware/performance tradeoff.
 `texture_columns`
 
 Generated STARTAN3 texture columns on the stable simple-map raycaster. Use this
-as the baseline for texture readability, column density, and classic floor
-motion before adding real WAD geometry.
+as the baseline for texture readability, column density, matched ceiling/floor
+plane motion, and full-frame backdrop refresh before adding real WAD geometry.
 
 `ripdoom_flat`
 

tools/gen_gfx.py

@@ -243,6 +243,19 @@ def apply_ceiling_perspective(enabled: bool) -> None:
     recompute_layout()
 
 
+def apply_titlepic(enabled: bool) -> None:
+    global TITLEPIC_COLS, TITLEPIC_ROWS, TITLEPIC_TILES
+
+    if enabled:
+        TITLEPIC_COLS = 20
+        TITLEPIC_ROWS = 13
+    else:
+        TITLEPIC_COLS = 0
+        TITLEPIC_ROWS = 0
+    TITLEPIC_TILES = TITLEPIC_COLS * TITLEPIC_ROWS
+    recompute_layout()
+
+
 def encode_tile(px):
     """px: 16x16 list-of-lists of palette indices (0..15) -> (c1, c2) bytes."""
     c1, c2 = bytearray(), bytearray()
@@ -830,6 +843,8 @@ def patch_grid_tiles(iwad, zip_member, patch_name, cols, rows):
 
 
 def titlepic_tiles(iwad, zip_member):
+    if TITLEPIC_TILES == 0:
+        return [], "disabled-title", [], 0, 0
     if not iwad:
         palette = [(6, 6, 8), (54, 40, 26), (118, 26, 18), (170, 146, 74), (210, 198, 150)] * 3
         return [tile_solid() for _ in range(TITLEPIC_TILES)], "fallback-title", palette, TITLEPIC_COLS * 16, 200
@@ -1393,6 +1408,7 @@ def main():
     ap.add_argument("--floor-forward-phases", type=int, help="Forward-motion floor plane cache phases")
     ap.add_argument("--ceiling-forward-phases", type=int, help="Forward-motion ceiling plane cache phases")
     ap.add_argument("--no-ceiling-perspective", action="store_true", help="Use a flat ceiling fill instead of baking ceiling perspective tiles")
+    ap.add_argument("--no-titlepic", action="store_true", help="Omit title picture C-ROM tiles for skip-intro experiment builds")
     ap.add_argument("--crom-file-bytes", type=lambda value: int(value, 0), default=C_PAD, help="Per-file C-ROM byte budget for live encoded tiles before padding")
     ap.add_argument("--map", default="E1M1", help="Doom map used to select player-start floor and ceiling flats")
     ap.add_argument("--palette-header", help="Generated wall palette header")
@@ -1453,6 +1469,7 @@ def main():
         args.ceiling_forward_phases if args.ceiling_forward_phases is not None else (2 if args.simple_map else 1),
     )
     apply_ceiling_perspective(not args.no_ceiling_perspective)
+    apply_titlepic(not args.no_titlepic)
 
     here = os.path.dirname(os.path.abspath(__file__))
     out = args.out_dir if args.out_dir else os.path.join(here, "..", "rom")

tools/simple_enemy_visibility_probe.py

@@ -223,6 +223,9 @@ def main() -> int:
 
     try:
         defs, scales = parse_generated_sprites(args.gfx_header)
+        assert_sprite_fits("live former human walk frames", defs, scales, 3004, {1, 2, 3, 4, 5, 6, 7, 8}, args.crom_file_bytes)
+        assert_sprite_fits("former human corpse frame", defs, scales, 9001, {0}, args.crom_file_bytes)
+        assert_sprite_fits("former human death frames", defs, scales, 9010, {0}, args.crom_file_bytes)
         assert_sprite_fits("live imp walk frames", defs, scales, 3001, {1, 2, 3, 4, 5, 6, 7, 8}, args.crom_file_bytes)
         assert_sprite_fits("imp corpse frame", defs, scales, 9003, {0}, args.crom_file_bytes)
         assert_sprite_fits("imp death frames", defs, scales, 9012, {0}, args.crom_file_bytes)