From 8143b6e4f262c298cc41db5f53fc609cc2d13407 Mon Sep 17 00:00:00 2001 From: nashmuhandes Date: Thu, 18 Apr 2024 01:34:43 +0800 Subject: [PATCH 1/2] Update and correct ZDRay-related stuff in the specs and also in the namedef table --- specs/udmf_zdoom.txt | 6 ++++-- src/namedef_custom.h | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/specs/udmf_zdoom.txt b/specs/udmf_zdoom.txt index ebc831d574a..b82ea4a0210 100644 --- a/specs/udmf_zdoom.txt +++ b/specs/udmf_zdoom.txt @@ -386,6 +386,7 @@ Note: All fields default to false unless mentioned otherwise. 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 + lm_dynamic = ; // ZDRay marks a sector's lightmaps as dynamic so that they may be updated in realtime (used for flickering lights, changing a lightmap light's position, color etc). Default = false } thing @@ -416,8 +417,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" + lm_sampledist = ; // ZDRay lightmap sample distance for the entire map. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 8 + lm_suncolor = ; // ZDRay lightmap sun color in hex. Default = "FFFFFF" + sourceradius = ; // ZDRay lightmap light soft shadow amount. Higher values produce softer shadows. Default = 5.0 * Note about arg0str diff --git a/src/namedef_custom.h b/src/namedef_custom.h index a62974bd03e..caa1494bb1c 100644 --- a/src/namedef_custom.h +++ b/src/namedef_custom.h @@ -859,8 +859,10 @@ xx(lm_sampledist_mid) xx(lm_sampledist_bot) xx(lm_sampledist_floor) xx(lm_sampledist_ceiling) +xx(lm_dynamic) xx(lm_suncolor) -xx(lm_sampledistance) +xx(lm_sampledist) +xx(sourceradius) xx(skew_bottom_type) xx(skew_middle_type) From d819eb4b4e7a035ddef4c2b32cb0b8cac890d5a1 Mon Sep 17 00:00:00 2001 From: nashmuhandes Date: Thu, 18 Apr 2024 06:26:03 +0800 Subject: [PATCH 2/2] Fix compile error --- src/maploader/udmf.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp index ea3e03b8786..6601bf1f694 100644 --- a/src/maploader/udmf.cpp +++ b/src/maploader/udmf.cpp @@ -792,7 +792,7 @@ class UDMFParser : public UDMFParserBase break; case NAME_lm_suncolor: - case NAME_lm_sampledistance: + case NAME_lm_sampledist: CHECK_N(Zd | Zdt) break;