Skip to content

Update and correct ZDRay-related stuff in the specs and also in the n… #2503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Update and correct ZDRay-related stuff in the specs and also in the n… #2503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8143b6e
Update and correct ZDRay-related stuff in the specs and also in the n…
nashmuhandes Apr 17, 2024
d819eb4
Fix compile error
nashmuhandes Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions specs/udmf_zdoom.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading