Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support BRGHTMPS lump from Doom Retro #846

Merged
merged 28 commits into from
Jan 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ac74993
support BRGHTMPS lump from Doom Retro
rfomin Dec 16, 2022
db19de5
fix gcc build
rfomin Dec 16, 2022
f53ea89
fix declarations
rfomin Dec 16, 2022
e8a86c9
add `const`
rfomin Dec 16, 2022
b694f5a
fix skipping optional `DOOM1|DOOM2` flags
rfomin Dec 18, 2022
95bd8e6
u_scanner: make internal functions `static`
rfomin Dec 18, 2022
199850d
fix `static` declarations
rfomin Dec 18, 2022
ad7c367
add support for `SPRITE` and `FLAT`
rfomin Dec 19, 2022
ca4cf40
remove unused function
rfomin Dec 19, 2022
1417bb1
add `brightmaps` checks
rfomin Dec 19, 2022
22f8427
add more error reporting
rfomin Dec 19, 2022
fac8a25
Merge branch 'master' into brghtmps
rfomin Jan 7, 2023
98bd4ce
scan multiple BRGHTMPS lumps, move data to autoload directory
rfomin Jan 8, 2023
5503886
fix cppcheck
rfomin Jan 8, 2023
e46b9e3
remove unnecessary BIGHTMAP declarations, formatting
rfomin Jan 8, 2023
3aacf27
do not scan twice (BRIGHTMAP must be defined before use)
rfomin Jan 8, 2023
4541e9f
rename R_InitBrightmaps->R_ScanBrightmaps
rfomin Jan 8, 2023
91ac161
implement states
rfomin Jan 8, 2023
d761728
skip BRGHTMPS lumps in demo footer
rfomin Jan 9, 2023
7a75078
must get integers in ReadColormask()
rfomin Jan 9, 2023
59c8124
Merge branch 'master' into brghtmps
rfomin Jan 9, 2023
b31547e
convert comments in hacx.wad/brghtmps.lmp
rfomin Jan 9, 2023
3c5ee4a
add chex2.wad directory, add NOBRIGHTMAP special case
rfomin Jan 9, 2023
c12278f
implement optional DOOM|DOOM2 fields
rfomin Jan 10, 2023
a9d8ddf
search from the end of the array to find the latest version of the el…
rfomin Jan 10, 2023
8773648
fix cppcheck
rfomin Jan 10, 2023
7122f70
generalize arrays
rfomin Jan 10, 2023
54ea0d4
fix cppcheck
rfomin Jan 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions autoload/chex.wad/brghtmps.lmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
BRIGHTMAP NOTGRAY 4,9-79,112-255
BRIGHTMAP GREENONLY1 112-127
BRIGHTMAP GREENONLY2 112-125
BRIGHTMAP GREENONLY3 112-123
BRIGHTMAP REDANDGREEN 16-47,112-127,173-191
BRIGHTMAP CHEXRED 176-177
BRIGHTMAP CHEXGREEN 112-115
BRIGHTMAP CHEXREDGREEN 45,112-118,174-177

TEXTURE BIGDOOR1 GREENONLY3
// TEXTURE BIGDOOR4 GREENONLY3 // C1: some stray green pixels, C2: many stray green pixels
// TEXTURE BRNBIGL GREENONLY3
// TEXTURE BRNBIGR GREENONLY3 // C1, C2: one stray green pixel
// TEXTURE BRNSMAL2 GREENONLY3 // C1, C2: many stray green pixels
TEXTURE COMP2 NOTGRAY
// TEXTURE COMPTALL NOTGRAY
TEXTURE COMPUTE2 NOTGRAY
TEXTURE LITE5 GREENONLY2
TEXTURE STARTAN3 GREENONLY2
TEXTURE SW1BRCOM CHEXRED
TEXTURE SW1BRN1 CHEXGREEN
TEXTURE SW1BRN2 CHEXRED
TEXTURE SW1BRNGN CHEXRED
TEXTURE SW1BROWN CHEXRED
TEXTURE SW1COMM CHEXRED
TEXTURE SW1COMP CHEXRED
TEXTURE SW1DIRT CHEXGREEN
TEXTURE SW1METAL CHEXREDGREEN
TEXTURE SW1PIPE CHEXGREEN
TEXTURE SW1STARG CHEXRED
TEXTURE SW1STON1 CHEXRED
TEXTURE SW1STRTN CHEXRED
TEXTURE SW2BRCOM CHEXGREEN
TEXTURE SW2BRN1 CHEXRED
TEXTURE SW2BRN2 CHEXGREEN
TEXTURE SW2BRNGN CHEXGREEN
TEXTURE SW2BROWN CHEXGREEN
TEXTURE SW2COMM CHEXGREEN
TEXTURE SW2COMP CHEXGREEN
TEXTURE SW2DIRT CHEXRED
TEXTURE SW2METAL CHEXREDGREEN
TEXTURE SW2PIPE CHEXRED
TEXTURE SW2STARG CHEXGREEN
TEXTURE SW2STON1 CHEXGREEN
TEXTURE SW2STONE CHEXGREEN
TEXTURE SW2STRTN CHEXGREEN
// TEXTURE BIGDOOR5 GREENONLY1 // C1, C2: some stray green pixels
// TEXTURE BIGDOOR6 GREENONLY1 // C1, C2: some stray green pixels
TEXTURE CEMENT3 GREENONLY3
TEXTURE SKINFACE GREENONLY1
TEXTURE SKINTEK1 GREENONLY1
TEXTURE SKSPINE2 GREENONLY3
TEXTURE SW1BLUE CHEXGREEN
TEXTURE SW1HOT CHEXGREEN
TEXTURE SW1SKIN CHEXGREEN
TEXTURE SW1VINE CHEXGREEN // C1: some stray green pixels in the vines
TEXTURE SW1WOOD CHEXGREEN
TEXTURE SW2BLUE CHEXRED
TEXTURE SW2CMT CHEXGREEN
TEXTURE SW2GSTON CHEXRED
TEXTURE SW2HOT CHEXRED
TEXTURE SW2SKIN CHEXRED
TEXTURE SW2VINE CHEXRED
TEXTURE SW2WOOD CHEXRED
TEXTURE WOOD4 CHEXREDGREEN
TEXTURE WOODGARG CHEXRED
TEXTURE WOODSKUL CHEXREDGREEN

// Chainsaw
SPRITE CSAW REDANDGREEN
// Shotgun
SPRITE SHOT REDANDGREEN
// Chaingun
SPRITE MGUN REDANDGREEN
// Rocket launcher
SPRITE LAUN REDANDGREEN
// Plasmagun
SPRITE PLAS REDANDGREEN
// BFG9000
SPRITE BFUG REDANDGREEN
5 changes: 5 additions & 0 deletions autoload/chex2.wad/brghtmps.lmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// TEXTURE COMPTALL GREENONLY3 // C2: many stray green pixels
TEXTURE LITE5 NOBRIGHTMAP
TEXTURE SKINTEK1 NOBRIGHTMAP
TEXTURE SW1VINE NOBRIGHTMAP // C1: some stray green pixels in the vines
TEXTURE SW2VINE NOBRIGHTMAP
112 changes: 112 additions & 0 deletions autoload/doom-all/brghtmps.lmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
BRIGHTMAP NOTGRAY 4,9-79,112-255
BRIGHTMAP NOTGRAYORBROWN 4,9-63,112-125,152-255
BRIGHTMAP NOTGRAYORBROWN2 4,9-63,112-125,152-157,160-255
BRIGHTMAP BLUEGREENBROWNRED 43,65-68,116,121-125,164-167,172,175,205-207,240-245
BRIGHTMAP BLUEGREENBROWN 45,65-68,70,73,76,121-124,164-167,190,206-207,240-241,243
BRIGHTMAP BLUEANDORANGE 45,164-167,190,206-207,240-241,243
BRIGHTMAP REDONLY 45,173-191
BRIGHTMAP REDONLY2 173-183
BRIGHTMAP GREENONLY1 112-127
BRIGHTMAP GREENONLY2 112-125
BRIGHTMAP GREENONLY3 112-123
BRIGHTMAP YELLOWONLY 160-167,224-231,249
BRIGHTMAP REDANDGREEN 16-47,112-127,173-191
BRIGHTMAP BLUEANDGREEN 112-124,192-207,240-245
BRIGHTMAP BRIGHTTAN 56,58,60-62,64-65,67,69,139,143,147-148,150

TEXTURE COMP2 BLUEANDGREEN
TEXTURE COMPSTA1 NOTGRAY
TEXTURE COMPSTA2 NOTGRAY
TEXTURE COMPUTE1 BLUEGREENBROWNRED
TEXTURE COMPUTE2 BLUEGREENBROWN
TEXTURE COMPUTE3 BLUEANDORANGE
TEXTURE EXITSIGN NOTGRAY
TEXTURE EXITSTON REDONLY
TEXTURE PLANET1 NOTGRAY
TEXTURE SILVER2 NOTGRAY
TEXTURE SILVER3 NOTGRAYORBROWN2
TEXTURE SLADSKUL REDONLY
TEXTURE SW1BRCOM REDONLY
TEXTURE SW1BRIK REDONLY
TEXTURE SW1COMM REDONLY
TEXTURE SW1DIRT REDONLY
TEXTURE SW1MET2 REDONLY
TEXTURE SW1STON1 REDONLY
TEXTURE SW1STONE REDONLY
TEXTURE SW1STRTN REDONLY
TEXTURE SW2BLUE REDONLY
TEXTURE SW2BRCOM GREENONLY2
TEXTURE SW2BRIK GREENONLY1
TEXTURE SW2BRN1 GREENONLY2
TEXTURE SW2BRN2 GREENONLY1
TEXTURE SW2BRNGN GREENONLY3
TEXTURE SW2COMM GREENONLY1
TEXTURE SW2COMP REDONLY
TEXTURE SW2DIRT GREENONLY2
TEXTURE SW2EXIT NOTGRAY
TEXTURE SW2GRAY NOTGRAY
TEXTURE SW2GRAY1 NOTGRAY
TEXTURE SW2GSTON REDONLY
// [crispy] Special case: fewer colors lit.
TEXTURE SW2HOT REDONLY2
TEXTURE SW2MET2 GREENONLY1
TEXTURE SW2METAL GREENONLY3
TEXTURE SW2MOD1 GREENONLY1
TEXTURE SW2PANEL REDONLY
TEXTURE SW2ROCK REDONLY
TEXTURE SW2SLAD REDONLY
TEXTURE SW2STON1 GREENONLY3
TEXTURE SW2STON6 REDONLY
TEXTURE SW2STONE GREENONLY2
TEXTURE SW2STRTN GREENONLY1
TEXTURE SW2TEK GREENONLY1
TEXTURE SW2VINE GREENONLY1
TEXTURE SW2WOOD REDONLY
TEXTURE SW2ZIM REDONLY
TEXTURE WOOD4 REDONLY
TEXTURE WOODGARG REDONLY
TEXTURE WOODSKUL REDONLY
//TEXTURE ZELDOOR REDONLY
TEXTURE LITEBLU1 NOTGRAY
TEXTURE LITEBLU2 NOTGRAY
TEXTURE SW2SATYR BRIGHTTAN
TEXTURE SW2LION BRIGHTTAN
TEXTURE SW2GARG BRIGHTTAN
TEXTURE SW2STON2 REDONLY DOOM
TEXTURE SW1BRN1 REDONLY DOOM2
TEXTURE SW1STARG REDONLY DOOM2
TEXTURE SW1STON2 REDONLY DOOM2
TEXTURE SW2MARB REDONLY DOOM2
TEXTURE SW2STARG GREENONLY2 DOOM2
TEXTURE SW2STON2 GREENONLY2 DOOM2
TEXTURE SPCDOOR3 GREENONLY1 DOOM2
TEXTURE PIPEWAL1 GREENONLY1 DOOM2
TEXTURE TEKLITE2 GREENONLY1 DOOM2
TEXTURE TEKBRON2 YELLOWONLY DOOM2
//TEXTURE SW2SKULL GREENONLY2 DOOM2
// [crispy] Final Doom textures
// Plutonia exclusive
//TEXTURE SW2SKULL REDONLY

// Armor Bonus
SPRITE BON2 GREENONLY2
// Cell Charge
SPRITE CELL GREENONLY2
// Barrel
SPRITE BAR1 GREENONLY3
// Cell Charge Pack
SPRITE CELP YELLOWONLY
// BFG9000
SPRITE BFUG REDONLY
// Plasmagun
SPRITE PLAS REDONLY

// [crispy] only three select brightmapped flats
FLAT CONS1_1 NOTGRAYORBROWN
FLAT CONS1_5 NOTGRAYORBROWN
FLAT CONS1_7 NOTGRAYORBROWN

STATE 84 REDONLY // S_BFG1
STATE 85 REDONLY // S_BFG2
STATE 86 REDONLY // S_BFG3
STATE 87 REDONLY // S_BFG4
82 changes: 82 additions & 0 deletions autoload/hacx.wad/brghtmps.lmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
BRIGHTMAP NOTGRAYORBROWN 4,9-63,112-125,152-255
BRIGHTMAP REDONLY 45,173-191
BRIGHTMAP GREENONLY1 112-127
BRIGHTMAP REDANDGREEN 16-47,112-127,173-191
BRIGHTMAP CHEXRED 176-177
BRIGHTMAP HACXLIGHTNING 4,168,192-199,208,224

// TEXTURE BFALL1 REDANDGREEN
// TEXTURE BFALL2 REDANDGREEN
// TEXTURE BFALL3 REDANDGREEN
// TEXTURE BFALL4 REDANDGREEN
TEXTURE BRNSMALR GREENONLY1
TEXTURE DOORRED REDANDGREEN
TEXTURE SLADWALL CHEXRED
// TEXTURE SW1BRCOM REDONLY
// TEXTURE SW1BRN1 REDANDGREEN
TEXTURE SW1BRN2 NOTGRAYORBROWN
TEXTURE SW1BRNGN NOTGRAYORBROWN
// TEXTURE SW1BROWN NOTGRAYORBROWN
// TEXTURE SW2BRCOM GREENONLY1
// TEXTURE SW2BRN1 REDANDGREEN
TEXTURE SW2BRN2 NOTGRAYORBROWN
// TEXTURE SW2BROWN NOTGRAYORBROWN
TEXTURE COMPSPAN GREENONLY1
TEXTURE COMPSTA1 NOTGRAYORBROWN
// TEXTURE COMPSTA2 NOTGRAYORBROWN
TEXTURE HD5 REDANDGREEN
// TEXTURE HD8 REDANDGREEN
// TEXTURE HD9 REDANDGREEN
TEXTURE BLAKWAL2 REDANDGREEN
TEXTURE CEMENT7 GREENONLY1
TEXTURE ROCK4 REDONLY
// TEXTURE SLOPPY1 NOTGRAYORBROWN
// TEXTURE SPCDOOR4 NOTGRAYORBROWN
TEXTURE ZZZFACE1 GREENONLY1
TEXTURE ZZZFACE2 REDANDGREEN
TEXTURE HW166 REDANDGREEN
TEXTURE HW510 NOTGRAYORBROWN
TEXTURE HW511 NOTGRAYORBROWN
TEXTURE HW512 NOTGRAYORBROWN

// Chainsaw
SPRITE CSAW REDONLY
// Plasmagun
SPRITE PLAS REDONLY
// Cell Charge
SPRITE CELL REDONLY
// Cell Charge Pack
SPRITE CELP REDONLY
// Rocket launcher
SPRITE LAUN REDANDGREEN
// Medikit
SPRITE MEDI REDANDGREEN
// Rocket
SPRITE ROCK GREENONLY1
// Box of rockets
SPRITE BROK GREENONLY1
// Health Bonus
SPRITE BON1 NOTGRAYORBROWN
// Stimpack
SPRITE STIM NOTGRAYORBROWN

FLAT FLOOR1_1 NOTGRAYORBROWN
FLAT FLOOR1_7 NOTGRAYORBROWN
FLAT FLOOR3_3 NOTGRAYORBROWN
FLAT NUKAGE1 NOTGRAYORBROWN
FLAT NUKAGE2 NOTGRAYORBROWN
FLAT NUKAGE3 NOTGRAYORBROWN
FLAT BLOOD1 GREENONLY1
FLAT BLOOD2 GREENONLY1
FLAT BLOOD3 GREENONLY1
FLAT SLIME13 NOTGRAYORBROWN
FLAT SLIME14 NOTGRAYORBROWN
FLAT SLIME15 NOTGRAYORBROWN

STATE 72 HACXLIGHTNING // S_SAW2
STATE 73 HACXLIGHTNING // S_SAW3
fabiangreffrath marked this conversation as resolved.
Show resolved Hide resolved
STATE 57 REDANDGREEN // S_MISSILE
STATE 67 REDONLY // S_SAW
STATE 68 REDONLY // S_SAWB
STATE 74 REDONLY // S_PLASMA
STATE 78 REDONLY // S_PLASMA2
22 changes: 22 additions & 0 deletions autoload/tnt.wad/brghtmps.lmp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// [crispy] Final Doom textures
rfomin marked this conversation as resolved.
Show resolved Hide resolved
// TNT - Evilution exclusive
TEXTURE PNK4EXIT REDONLY
TEXTURE SLAD2 NOTGRAYORBROWN
TEXTURE SLAD3 NOTGRAYORBROWN
TEXTURE SLAD4 NOTGRAYORBROWN
TEXTURE SLAD5 NOTGRAYORBROWN
TEXTURE SLAD6 NOTGRAYORBROWN
TEXTURE SLAD7 NOTGRAYORBROWN
TEXTURE SLAD8 NOTGRAYORBROWN
TEXTURE SLAD9 NOTGRAYORBROWN
TEXTURE SLAD10 NOTGRAYORBROWN
TEXTURE SLAD11 NOTGRAYORBROWN
TEXTURE SLADRIP1 NOTGRAYORBROWN
TEXTURE SLADRIP3 NOTGRAYORBROWN
TEXTURE M_TEC GREENONLY2
TEXTURE LITERED2 REDONLY
TEXTURE BTNTMETL NOTGRAYORBROWN
TEXTURE BTNTSLVR NOTGRAYORBROWN
TEXTURE LITEYEL2 YELLOWONLY
TEXTURE LITEYEL3 YELLOWONLY
TEXTURE YELMETAL YELLOWONLY
Loading