ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2026-05-13 21:34:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

HD lights rendering in exterior and lodlights switching, lights falloff fix

Browse Source
This commit is contained in:
dexy
2021-05-03 22:59:31 +10:00
Unverified
parent 18285265ca
commit 5ebda6f0bb
12 changed files with 206 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CodeWalker.Shaders/LightPS.hlsli
+13 -7
View File
@@ -92,6 +92,12 @@ float4 GetLineSegmentNearestPoint(float3 v, float3 a, float3 b)
}
}
float GetAttenuation(float ldist, float falloff, float falloffExponent)
{
float d = ldist / falloff;
return saturate((1 - d) / (1 + d*d*falloffExponent));
}
float3 DeferredDirectionalLight(float3 camRel, float3 norm, float4 diffuse, float4 specular, float4 irradiance)
{
@@ -123,14 +129,14 @@ float4 DeferredLODLight(float3 camRel, float3 norm, float4 diffuse, float4 specu
if (ldist <= 0) return 0;
float4 rgbi = Unpack4x8UNF(lodlight.Colour).gbar;
float3 lcol = rgbi.rgb * rgbi.a * 5.0f;
float3 lcol = rgbi.rgb * rgbi.a * 100.0f;
float3 ldir = srpos / ldist;
float pclit = saturate(dot(ldir, norm));
float lamt = 1;
if (LightType == 1)//point (sphere)
{
lamt *= pow(saturate(1 - (ldist / lodlight.Falloff)), lodlight.FalloffExponent);
lamt *= GetAttenuation(ldist, lodlight.Falloff, lodlight.FalloffExponent);
}
else if (LightType == 2)//spot (cone)
{
@@ -139,11 +145,11 @@ float4 DeferredLODLight(float3 camRel, float3 norm, float4 diffuse, float4 specu
float oang = lodlight.OuterAngleOrCapExt;
if (ang > oang) return 0;
lamt *= saturate(1 - ((ang - iang) / (oang - iang)));
lamt *= pow(saturate(1 - (ldist / lodlight.Falloff)), lodlight.FalloffExponent);
lamt *= GetAttenuation(ldist, lodlight.Falloff, lodlight.FalloffExponent);
}
else if (LightType == 4)//capsule
{
lamt *= pow(saturate(1 - (ldist / lodlight.Falloff)), lodlight.FalloffExponent); //TODO! proper capsule lighting... (use point-line dist!)
lamt *= GetAttenuation(ldist, lodlight.Falloff, lodlight.FalloffExponent); //TODO! proper capsule lighting... (use point-line dist!)
}
pclit *= lamt;
@@ -185,7 +191,7 @@ float4 DeferredLight(float3 camRel, float3 norm, float4 diffuse, float4 specular
if (InstType == 1)//point (sphere)
{
lamt *= pow(saturate(1 - (ldist / InstFalloff)), InstFalloffExponent);
lamt *= GetAttenuation(ldist, InstFalloff, InstFalloffExponent);
}
else if (InstType == 2)//spot (cone)
{
@@ -194,11 +200,11 @@ float4 DeferredLight(float3 camRel, float3 norm, float4 diffuse, float4 specular
float oang = InstConeOuterAngle;
if (ang > oang) return 0;
lamt *= saturate(1 - ((ang - iang) / (oang - iang)));
lamt *= pow(saturate(1 - (ldist / InstFalloff)), InstFalloffExponent);
lamt *= GetAttenuation(ldist, InstFalloff, InstFalloffExponent);
}
else if (InstType == 4)//capsule
{
lamt *= pow(saturate(1 - (ldist / InstFalloff)), InstFalloffExponent);
lamt *= GetAttenuation(ldist, InstFalloff, InstFalloffExponent);
}
pclit *= lamt;