Skip to content

Commit

Permalink
Update and correct ZDRay-related stuff in the specs and also in the n… (
Browse files Browse the repository at this point in the history
ZDoom#2503)

* Update and correct ZDRay-related stuff in the specs and also in the namedef table

* Fix compile error
  • Loading branch information
nashmuhandes authored Apr 17, 2024
1 parent 178896d commit 6226f03
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
6 changes: 4 additions & 2 deletions specs/udmf_zdoom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,7 @@ Note: All <bool> fields default to false unless mentioned otherwise.

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
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
}

thing
Expand Down Expand Up @@ -416,8 +417,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"
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
lm_suncolor = <string>; // ZDRay lightmap sun color in hex. Default = "FFFFFF"
sourceradius = <float>; // ZDRay lightmap light soft shadow amount. Higher values produce softer shadows. Default = 5.0

* Note about arg0str

Expand Down
2 changes: 1 addition & 1 deletion src/maploader/udmf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 3 additions & 1 deletion src/namedef_custom.h
Original file line number Diff line number Diff line change
Expand Up @@ -858,8 +858,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)
Expand Down

0 comments on commit 6226f03

Please sign in to comment.