Skip to content

Commit

Permalink
Update ZDRay UDMF specs and remove deleted features.
Browse files Browse the repository at this point in the history
  • Loading branch information
nashmuhandes committed Sep 11, 2023
1 parent a44f7a7 commit f1aa068
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 24 deletions.
18 changes: 18 additions & 0 deletions specs/udmf_zdoom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,11 @@ Note: All <bool> fields default to false unless mentioned otherwise.

For lines with ACS specials (80-86 and 226), if arg0str is present and non-null, it
will be used as the name of the script to execute, and arg0 will be ignored.

lm_sampledist_line = <int>; // ZDRay customizable sampling distance for this line. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
lm_sampledist_top = <int>; // ZDRay customizable sampling distance for this line's top part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
lm_sampledist_mid = <int>; // ZDRay customizable sampling distance for this line's middle part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
lm_sampledist_bot = <int>; // ZDRay customizable sampling distance for this line's bottom part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
}

sidedef
Expand Down Expand Up @@ -221,6 +226,11 @@ Note: All <bool> fields default to false unless mentioned otherwise.
colorization_top = <int>; // Sets a colorization record for the upper texture. Colorization records must be defined in TEXTURES.
colorization_mid = <int>; // Sets a colorization record for the middle texture. Colorization records must be defined in TEXTURES.
colorization_bottom = <int>; // Sets a colorization record for the lower texture. Colorization records must be defined in TEXTURES.

lm_sampledist_line = <int>; // ZDRay customizable sampling distance for this sidedef. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
lm_sampledist_top = <int>; // ZDRay customizable sampling distance for this sidedef's top part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
lm_sampledist_mid = <int>; // ZDRay customizable sampling distance for this sidedef's middle part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
lm_sampledist_bot = <int>; // ZDRay customizable sampling distance for this sidedef's bottom part. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
}

sector
Expand Down Expand Up @@ -326,6 +336,8 @@ Note: All <bool> fields default to false unless mentioned otherwise.
for Doom format maps so any map converter converting to the ZDoomTranslated namespace should
set this flag for each tagged sector.

lm_sampledist_floor = <int>; // ZDRay customizable sampling distance for this sector's floor. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
lm_sampledist_ceiling = <int>; // ZDRay customizable sampling distance for this sector's ceiling. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 0
}

thing
Expand Down Expand Up @@ -356,6 +368,9 @@ Note: All <bool> fields default to false unless mentioned otherwise.
scale = <float>; // Vertical and horizontal scaling on thing. Default = 0 (ignored).
floatbobphase = <int>; // Sets the thing's floatbobphase. Valid phase values are 0-63. Default = -1 (use actor class default).

lm_sampledistance = <int>; // ZDRay lightmap sample distance for the entire map. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 16
lm_suncolor = <string>; // ZDRay lightmap sun color in hex. Default: "FFFFFF"

* Note about arg0str

For things with ACS specials (80-86 and 226), if arg0str is present and non-null, it
Expand Down Expand Up @@ -519,6 +534,9 @@ Blocklandmonsters MBF21 flag
1.33 06.11.2021
Added separate light levels for sidedef tiers (top/mid/bottom)

1.34 09.11.2023
Added/updated ZDRay/lightmap-related properties.

===============================================================================
EOF
===============================================================================
13 changes: 0 additions & 13 deletions src/maploader/udmf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -755,7 +755,6 @@ class UDMFParser : public UDMFParserBase

case NAME_lm_suncolor:
case NAME_lm_sampledistance:
case NAME_lm_gridsize:
CHECK_N(Zd | Zdt)
break;

Expand Down Expand Up @@ -1129,9 +1128,6 @@ class UDMFParser : public UDMFParserBase
ld->healthgroup = CheckInt(key);
break;

case NAME_lm_lightcolorline:
case NAME_lm_lightintensityline:
case NAME_lm_lightdistanceline:
case NAME_lm_sampledist_line:
case NAME_lm_sampledist_top:
case NAME_lm_sampledist_mid:
Expand Down Expand Up @@ -1481,9 +1477,6 @@ class UDMFParser : public UDMFParserBase
sd->Flags |= WALLF_EXTCOLOR;
break;

case NAME_lm_lightcolorline:
case NAME_lm_lightintensityline:
case NAME_lm_lightdistanceline:
case NAME_lm_sampledist_line:
case NAME_lm_sampledist_top:
case NAME_lm_sampledist_mid:
Expand Down Expand Up @@ -1999,12 +1992,6 @@ class UDMFParser : public UDMFParserBase
sec->health3dgroup = CheckInt(key);
break;

case NAME_lm_lightcolorfloor:
case NAME_lm_lightintensityfloor:
case NAME_lm_lightdistancefloor:
case NAME_lm_lightcolorceiling:
case NAME_lm_lightintensityceiling:
case NAME_lm_lightdistanceceiling:
case NAME_lm_sampledist_floor:
case NAME_lm_sampledist_ceiling:
CHECK_N(Zd | Zdt)
Expand Down
11 changes: 0 additions & 11 deletions src/namedef_custom.h
Original file line number Diff line number Diff line change
Expand Up @@ -849,16 +849,6 @@ xx(Sky)
xx(Pagename)

// Lightmap/ZDRay keywords
// (Surface lights are temporarily disabled and don't do anything)
xx(lm_lightcolorline)
xx(lm_lightintensityline)
xx(lm_lightdistanceline)
xx(lm_lightcolorfloor)
xx(lm_lightintensityfloor)
xx(lm_lightdistancefloor)
xx(lm_lightcolorceiling)
xx(lm_lightintensityceiling)
xx(lm_lightdistanceceiling)
xx(lm_sampledist_line)
xx(lm_sampledist_top)
xx(lm_sampledist_mid)
Expand All @@ -867,6 +857,5 @@ xx(lm_sampledist_floor)
xx(lm_sampledist_ceiling)
xx(lm_suncolor)
xx(lm_sampledistance)
xx(lm_gridsize)

xx(Corona)

0 comments on commit f1aa068

Please sign in to comment.