OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

deduplicate code

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2024-10-06 20:56:59 -03:00 • committed by Magnus Norddahl
commit f11ed26eb8
5 changed files with 27 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rendering/hwrenderer/scene/hw_spritelight.cpp
View file

@ -113,7 +113,7 @@ public:
//==========================================================================
float inverseSquareAttenuation(FVector3 lightpos, float dist, float radius)
float inverseSquareAttenuation(float dist, float radius)
{
float strength = 1500.0;
float a = dist / radius;
@ -178,7 +178,7 @@ void HWDrawInfo::GetDynSpriteLight(AActor *self, float x, float y, float z, FLig
{
if(level.info->lightattenuationmode == ELightAttenuationMode::INVERSE_SQUARE)
{
frac = (inverseSquareAttenuation(L, std::max(dist, sqrt(radius) * 2), radius));
frac = (inverseSquareAttenuation(std::max(dist, sqrt(radius) * 2), radius));
}
else
{

22
wadsrc/static/shaders/scene/lightmodel_normal.glsl
View file

@ -1,22 +1,4 @@
#ifdef LIGHT_ATTENUATION_INVERSE_SQUARE
float distanceAttenuation(vec4 lightpos, float d)
{
float strength = 1500.0;
float r = lightpos.w;
float a = d / r;
float b = clamp(1.0 - a * a * a * a, 0.0, 1.0);
return (b * b) / (d * d + 1.0) * strength;
}
#else //elif defined(LIGHT_ATTENUATION_LINEAR)
float distanceAttenuation(vec4 lightpos, float d)
{
return clamp((lightpos.w - d) / lightpos.w, 0.0, 1.0);
}
#endif
#include "shaders/scene/lightmodel_shared.glsl"
vec3 lightContribution(int i, vec3 normal)
{
@ -33,7 +15,7 @@ vec3 lightContribution(int i, vec3 normal)
float dotprod = dot(normal, lightdir);
if (dotprod < -0.0001) return vec3(0.0); // light hits from the backside. This can happen with full sector light lists and must be rejected for all cases. Note that this can cause precision issues.
float attenuation = distanceAttenuation(lightpos, lightdistance);
float attenuation = distanceAttenuation(lightdistance, lightpos.w);
if (lightspot1.w == 1.0)
attenuation *= spotLightAttenuation(lightpos, lightspot1.xyz, lightspot2.x, lightspot2.y);

26
wadsrc/static/shaders/scene/lightmodel_pbr.glsl
View file

@ -1,24 +1,4 @@
#ifdef LIGHT_ATTENUATION_INVERSE_SQUARE
float distanceAttenuation(vec4 lightpos)
{
float strength = 1500.0;
float d = distance(lightpos.xyz, pixelpos.xyz);
float r = lightpos.w;
float a = d / r;
float b = clamp(1.0 - a * a * a * a, 0.0, 1.0);
return (b * b) / (d * d + 1.0) * strength;
}
#else //elif defined(LIGHT_ATTENUATION_LINEAR)
float distanceAttenuation(vec4 lightpos)
{
float lightdistance = distance(lightpos.xyz, pixelpos.xyz);
return clamp((lightpos.w - lightdistance) / lightpos.w, 0.0, 1.0);
}
#endif
#include "shaders/scene/lightmodel_shared.glsl"
const float PI = 3.14159265359;
@ -101,7 +81,7 @@ vec3 ProcessMaterialLight(Material material, vec3 ambientLight)
vec3 L = normalize(lightpos.xyz - worldpos);
vec3 H = normalize(V + L);
float attenuation = distanceAttenuation(lightpos);
float attenuation = distanceAttenuation(distance(lightpos.xyz, pixelpos.xyz), lightpos.w);
if (lightspot1.w == 1.0)
attenuation *= spotLightAttenuation(lightpos, lightspot1.xyz, lightspot2.x, lightspot2.y);
if (lightcolor.a < 0.0)
@ -141,7 +121,7 @@ vec3 ProcessMaterialLight(Material material, vec3 ambientLight)
vec3 L = normalize(lightpos.xyz - worldpos);
vec3 H = normalize(V + L);
float attenuation = distanceAttenuation(lightpos);
float attenuation = distanceAttenuation(distance(lightpos.xyz, pixelpos.xyz), lightpos.w);
if (lightspot1.w == 1.0)
attenuation *= spotLightAttenuation(lightpos, lightspot1.xyz, lightspot2.x, lightspot2.y);
if (lightcolor.a < 0.0)

18
wadsrc/static/shaders/scene/lightmodel_shared.glsl Normal file
View file

@ -0,0 +1,18 @@
#ifdef LIGHT_ATTENUATION_INVERSE_SQUARE
float distanceAttenuation(float dist, float radius)
{
float strength = 1500.0;
float a = dist / radius;
float b = clamp(1.0 - a * a * a * a, 0.0, 1.0);
return (b * b) / (dist * dist + 1.0) * strength;
}
#else //elif defined(LIGHT_ATTENUATION_LINEAR)
float distanceAttenuation(float dist, float radius)
{
return clamp((radius - dist) / radius, 0.0, 1.0);
}
#endif

22
wadsrc/static/shaders/scene/lightmodel_specular.glsl
View file

@ -1,22 +1,4 @@
#ifdef LIGHT_ATTENUATION_INVERSE_SQUARE
float distanceAttenuation(vec4 lightpos, float d)
{
float strength = 1500.0;
float r = lightpos.w;
float a = d / r;
float b = clamp(1.0 - a * a * a * a, 0.0, 1.0);
return (b * b) / (d * d + 1.0) * strength;
}
#else //elif defined(LIGHT_ATTENUATION_LINEAR)
float distanceAttenuation(vec4 lightpos, float d)
{
return clamp((lightpos.w - d) / lightpos.w, 0.0, 1.0);
}
#endif
#include "shaders/scene/lightmodel_shared.glsl"
vec2 lightAttenuation(int i, vec3 normal, vec3 viewdir, float lightcolorA, float glossiness, float specularLevel)
{
@ -28,7 +10,7 @@ vec2 lightAttenuation(int i, vec3 normal, vec3 viewdir, float lightcolorA, float
if (lightpos.w < lightdistance)
return vec2(0.0); // Early out lights touching surface but not this fragment
float attenuation = distanceAttenuation(lightpos, lightdistance);
float attenuation = distanceAttenuation(lightdistance, lightpos.w);
if (lightspot1.w == 1.0)
attenuation *= spotLightAttenuation(lightpos, lightspot1.xyz, lightspot2.x, lightspot2.y);