zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2025-03-13 11:43:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Unify the custom sample distance variable names

Browse source 
- Fix wrong type for the sun color
This commit is contained in:
nashmuhandes 2023-10-03 18:36:50 +08:00
parent 9b9663e3d0
commit baa1ead6e9
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -48,8 +48,8 @@ Usage: zdray [options] sourcefile.wad
thing // ZDRayInfo (ZDRay properties for the map) thing // ZDRayInfo (ZDRay properties for the map)
{ {
type = 9890; type = 9890;
lm_suncolor = <string> (default: "FFFFFF", hex color value of the sun) lm_suncolor = <int> (default: 16777215, color value of the sun)
lm_sampledistance = <int> (default: 16, map units each lightmap texel covers, must be in powers of two) lm_sampledist = <int> (default: 16, map units each lightmap texel covers, must be in powers of two)
} }
thing // Lightmap point light (Light color and distance properties use the same args as dynamic lights) thing // Lightmap point light (Light color and distance properties use the same args as dynamic lights)
@ -65,7 +65,7 @@ thing // Lightmap spotlight (Light color, distance and angle properties use the
linedef linedef
{ {
// Customizable sampling distance per line surface. Will use the value from the ZDRayInfo actor by default. // Customizable sampling distance per line surface. Will use the value from the ZDRayInfo actor by default.
lm_sampledist_line = <int> (default: 0) lm_sampledist = <int> (default: 0)
lm_sampledist_top = <int> (default: 0) lm_sampledist_top = <int> (default: 0)
lm_sampledist_mid = <int> (default: 0) lm_sampledist_mid = <int> (default: 0)
lm_sampledist_bot = <int> (default: 0) lm_sampledist_bot = <int> (default: 0)
@ -74,7 +74,7 @@ linedef
sidedef sidedef
{ {
// Customizable sampling distance per sidedef. Will use the value from the ZDRayInfo actor by default. // Customizable sampling distance per sidedef. Will use the value from the ZDRayInfo actor by default.
lm_sampledist_line = <int> (default: 0) lm_sampledist = <int> (default: 0)
lm_sampledist_top = <int> (default: 0) lm_sampledist_top = <int> (default: 0)
lm_sampledist_mid = <int> (default: 0) lm_sampledist_mid = <int> (default: 0)
lm_sampledist_bot = <int> (default: 0) lm_sampledist_bot = <int> (default: 0)

2
src/level/level_light.cpp
View file

@ -73,7 +73,7 @@ void FLevel::SetupLights()
lightcolor = atoi(key.value); lightcolor = atoi(key.value);
printf(" Sun color: %d (%X)\n", lightcolor, lightcolor); printf(" Sun color: %d (%X)\n", lightcolor, lightcolor);
} }
else if (!stricmp(key.key, "lm_sampledistance")) else if (!stricmp(key.key, "lm_sampledist"))
{ {
DefaultSamples = atoi(key.value); DefaultSamples = atoi(key.value);
if (DefaultSamples < 8) DefaultSamples = 8; if (DefaultSamples < 8) DefaultSamples = 8;

4
src/level/level_udmf.cpp
View file

@ -325,7 +325,7 @@ void FProcessor::ParseLinedef(IntLineDef *ld)
ld->ids.Clear(); ld->ids.Clear();
if (id != -1) ld->ids.Push(id); if (id != -1) ld->ids.Push(id);
} }
else if (stricmp(key, "lm_sampledist_line") == 0) else if (stricmp(key, "lm_sampledist") == 0)
{ {
ld->sampling.SetGeneralSampleDistance(CheckInt(key)); ld->sampling.SetGeneralSampleDistance(CheckInt(key));
} }
@ -415,7 +415,7 @@ void FProcessor::ParseSidedef(IntSideDef *sd)
{ {
sd->rowoffset = CheckInt(key); sd->rowoffset = CheckInt(key);
} }
else if (stricmp(key, "lm_sampledist_line") == 0) else if (stricmp(key, "lm_sampledist") == 0)
{ {
sd->sampling.SetGeneralSampleDistance(CheckInt(key)); sd->sampling.SetGeneralSampleDistance(CheckInt(key));
} }