zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-04-21 18:30:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Add static variants of pulsing and flickering lights

Browse source 
- Clean up and reorganize dynlights.zs
This commit is contained in:
nashmuhandes 2023-09-16 14:58:18 +08:00 committed by Christoph Oelckers
parent 11e6e1d049
commit d4dae83cf4
2 changed files with 63 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
wadsrc/static/mapinfo/common.txt
View file

@ -136,9 +136,15 @@ DoomEdNums
9872 = SpotLightFlickerAttenuated
9873 = SectorSpotLightAttenuated
9874 = SpotLightFlickerRandomAttenuated
9876 = PointLightTraceAttenuated // ZDRay static point light
9881 = SpotLightTraceAttenuated // ZDRay static spotlight
9890 = None // ZDRayInfo
9876 = PointLightTraceAttenuated // ZDRay static point light
9877 = PointLightPulseTraceAttenuated // ZDRay static point light (pulsing)
9878 = PointLightFlickerTraceAttenuated // ZDRay static point light (flickering)
9879 = PointLightFlickerRandomTraceAttenuated // ZDRay static point light (random flickering)
9881 = SpotLightTraceAttenuated // ZDRay static spotlight
9882 = SpotLightPulseTraceAttenuated // ZDRay static spotlight (pulsing)
9883 = SpotLightFlickerTraceAttenuated // ZDRay static spotlight (flickering)
9884 = SpotLightFlickerRandomTraceAttenuated // ZDRay static spotlight (random flickering)
9890 = None // ZDRayInfo
9982 = SecActEyesAboveC
9983 = SecActEyesBelowC
9988 = CustomSprite

73
wadsrc/static/zscript/actors/shared/dynlights.zs
View file

@ -442,25 +442,6 @@ class SpotLightFlickerRandomAttenuated : SpotLightFlickerRandom
}
}
class PointLightTraceAttenuated : PointLightAttenuated
{
Default
{
+DYNAMICLIGHT.TRACE
+DYNAMICLIGHT.DONTLIGHTMAP
}
}
class SpotLightTraceAttenuated : SpotLightAttenuated
{
Default
{
+DYNAMICLIGHT.TRACE
+DYNAMICLIGHT.DONTLIGHTMAP
}
}
class VavoomLight : DynamicLight
{
Default
@ -501,4 +482,58 @@ class VavoomLightColor : VavoomLight
}
}
//==========================================================================
//
// ZDRay Lights
//
//==========================================================================
// to reduce copy/pasting
mixin class TraceLightDefaults
{
Default
{
+DYNAMICLIGHT.TRACE
+DYNAMICLIGHT.DONTLIGHTMAP
}
}
class PointLightTraceAttenuated : PointLightAttenuated
{
mixin TraceLightDefaults;
}
class PointLightPulseTraceAttenuated : PointLightPulseAttenuated
{
mixin TraceLightDefaults;
}
class PointLightFlickerTraceAttenuated : PointLightFlickerAttenuated
{
mixin TraceLightDefaults;
}
class PointLightFlickerRandomTraceAttenuated : PointLightFlickerRandomAttenuated
{
mixin TraceLightDefaults;
}
class SpotLightTraceAttenuated : SpotLightAttenuated
{
mixin TraceLightDefaults;
}
class SpotLightPulseTraceAttenuated : SpotLightPulseAttenuated
{
mixin TraceLightDefaults;
}
class SpotLightFlickerTraceAttenuated : SpotLightFlickerAttenuated
{
mixin TraceLightDefaults;
}
class SpotLightFlickerRandomTraceAttenuated : SpotLightFlickerRandomAttenuated
{
mixin TraceLightDefaults;
}