Skip to content

Commit 6226f03

Browse files
authored
Update and correct ZDRay-related stuff in the specs and also in the n… (#2503)
* Update and correct ZDRay-related stuff in the specs and also in the namedef table * Fix compile error
1 parent 178896d commit 6226f03

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

specs/udmf_zdoom.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ Note: All <bool> fields default to false unless mentioned otherwise.
386386

387387
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
388388
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
389+
lm_dynamic = <bool>; // 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
389390
}
390391

391392
thing
@@ -416,8 +417,9 @@ Note: All <bool> fields default to false unless mentioned otherwise.
416417
scale = <float>; // Vertical and horizontal scaling on thing. Default = 0 (ignored).
417418
floatbobphase = <int>; // Sets the thing's floatbobphase. Valid phase values are 0-63. Default = -1 (use actor class default).
418419

419-
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
420-
lm_suncolor = <string>; // ZDRay lightmap sun color in hex. Default: "FFFFFF"
420+
lm_sampledist = <int>; // ZDRay lightmap sample distance for the entire map. Defines the map units each lightmap texel covers. Must be in powers of two. Default = 8
421+
lm_suncolor = <string>; // ZDRay lightmap sun color in hex. Default = "FFFFFF"
422+
sourceradius = <float>; // ZDRay lightmap light soft shadow amount. Higher values produce softer shadows. Default = 5.0
421423

422424
* Note about arg0str
423425

src/maploader/udmf.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ class UDMFParser : public UDMFParserBase
792792
break;
793793

794794
case NAME_lm_suncolor:
795-
case NAME_lm_sampledistance:
795+
case NAME_lm_sampledist:
796796
CHECK_N(Zd | Zdt)
797797
break;
798798

src/namedef_custom.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,8 +858,10 @@ xx(lm_sampledist_mid)
858858
xx(lm_sampledist_bot)
859859
xx(lm_sampledist_floor)
860860
xx(lm_sampledist_ceiling)
861+
xx(lm_dynamic)
861862
xx(lm_suncolor)
862-
xx(lm_sampledistance)
863+
xx(lm_sampledist)
864+
xx(sourceradius)
863865

864866
xx(skew_bottom_type)
865867
xx(skew_middle_type)

0 commit comments

Comments
 (0)