From 99983b37cad75d365679cf2546f5bf0ab55f261e Mon Sep 17 00:00:00 2001 From: nashmuhandes Date: Mon, 11 Sep 2023 08:29:38 +0800 Subject: [PATCH] Update ZDRay UDMF specs and remove deleted features. --- specs/udmf_zdoom.txt | 18 ++++++++++++++++++ src/maploader/udmf.cpp | 13 ------------- src/namedef_custom.h | 11 ----------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/specs/udmf_zdoom.txt b/specs/udmf_zdoom.txt index 8218feeb13..957a33ce9d 100644 --- a/specs/udmf_zdoom.txt +++ b/specs/udmf_zdoom.txt @@ -152,6 +152,11 @@ Note: All 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 = ; // 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 = ; // 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 = ; // 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 = ; // 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 @@ -221,6 +226,11 @@ Note: All fields default to false unless mentioned otherwise. colorization_top = ; // Sets a colorization record for the upper texture. Colorization records must be defined in TEXTURES. colorization_mid = ; // Sets a colorization record for the middle texture. Colorization records must be defined in TEXTURES. colorization_bottom = ; // Sets a colorization record for the lower texture. Colorization records must be defined in TEXTURES. + + lm_sampledist_line = ; // 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 = ; // 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 = ; // 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 = ; // 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 @@ -326,6 +336,8 @@ Note: All 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 = ; // 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 = ; // 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 @@ -356,6 +368,9 @@ Note: All fields default to false unless mentioned otherwise. scale = ; // Vertical and horizontal scaling on thing. Default = 0 (ignored). floatbobphase = ; // Sets the thing's floatbobphase. Valid phase values are 0-63. Default = -1 (use actor class default). + lm_sampledistance = ; // 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 = ; // 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 @@ -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 =============================================================================== diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp index ed0ec0cd34..941b33e0dc 100644 --- a/src/maploader/udmf.cpp +++ b/src/maploader/udmf.cpp @@ -755,7 +755,6 @@ public: case NAME_lm_suncolor: case NAME_lm_sampledistance: - case NAME_lm_gridsize: CHECK_N(Zd | Zdt) break; @@ -1129,9 +1128,6 @@ public: 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: @@ -1481,9 +1477,6 @@ public: 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: @@ -1999,12 +1992,6 @@ public: 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) diff --git a/src/namedef_custom.h b/src/namedef_custom.h index d0964ce7ff..a5604475d4 100644 --- a/src/namedef_custom.h +++ b/src/namedef_custom.h @@ -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) @@ -867,6 +857,5 @@ xx(lm_sampledist_floor) xx(lm_sampledist_ceiling) xx(lm_suncolor) xx(lm_sampledistance) -xx(lm_gridsize) xx(Corona)