zdoom/zdray
0
0
Fork 0
mirror of https://github.com/ZDoom/ZDRay.git synced 2025-02-16 16:41:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add SunLight thing support

Browse source
This commit is contained in:
Magnus Norddahl 2021-10-04 23:47:19 +02:00
parent d8bf0bafc4
commit 3a1968782d
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/level/doomdata.h
View file

@ -327,6 +327,9 @@ struct FLevel
TArray<SurfaceLightDef> SurfaceLights;
TArray<int> ThingLightProbes;
Vec3 defaultSunColor = Vec3(1, 1, 1);
Vec3 defaultSunDirection = Vec3(0.45f, 0.3f, 0.9f);
void FindMapBounds ();
void RemoveExtraLines ();
void RemoveExtraSides ();

43
src/level/level_light.cpp
View file

@ -38,9 +38,6 @@
// convert from fixed point(FRACUNIT) to floating point
#define F(x) (((float)(x))/65536.0f)
static const Vec3 defaultSunColor(1, 1, 1);
static const Vec3 defaultSunDirection(0.45f, 0.3f, 0.9f);
void FLevel::SetupLights()
{
CheckSkySectors();
@ -90,10 +87,48 @@ void FLevel::SetupLights()
for (int i = 0; i < (int)Things.Size(); ++i)
{
IntThing* thing = &Things[i];
if (thing->type == 9875)
if (thing->type == 9875) // LightProbe
{
ThingLightProbes.Push(i);
}
else if (thing->type == 9876) // SunLight
{
uint32_t lightcolor = 0xffffff;
Vec3 sundir(0.0f, 0.0f, 0.0f);
Vec3 suncolor(1.0f, 1.0f, 1.0f);
for (unsigned int propIndex = 0; propIndex < thing->props.Size(); propIndex++)
{
const UDMFKey& key = thing->props[propIndex];
if (!stricmp(key.key, "suncolor"))
{
lightcolor = atoi(key.value);
}
else if (!stricmp(key.key, "sundirx"))
{
sundir.x = atof(key.value);
}
else if (!stricmp(key.key, "sundiry"))
{
sundir.y = atof(key.value);
}
else if (!stricmp(key.key, "sundirz"))
{
sundir.z = atof(key.value);
}
}
if (Vec3::Dot(sundir, sundir) > 0.01f)
{
sundir.Normalize();
suncolor.x = ((lightcolor >> 16) & 0xff) / 255.0f;
suncolor.y = ((lightcolor >> 8) & 0xff) / 255.0f;
suncolor.z = (lightcolor & 0xff) / 255.0f;
defaultSunColor = suncolor;
defaultSunDirection = sundir;
}
}
}
CreateLights();