From f22826ea94f7591070418eb10755b34ba6b11c07 Mon Sep 17 00:00:00 2001 From: dexy Date: Wed, 4 Dec 2019 01:28:58 +1100 Subject: [PATCH] Fixed light cone angles --- CodeWalker.Shaders/LightVS.hlsl | 4 ++-- Shaders/LightVS.cso | Bin 3056 -> 2548 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CodeWalker.Shaders/LightVS.hlsl b/CodeWalker.Shaders/LightVS.hlsl index e22ab5f..2e15899 100644 --- a/CodeWalker.Shaders/LightVS.hlsl +++ b/CodeWalker.Shaders/LightVS.hlsl @@ -50,8 +50,8 @@ VS_Output main(float4 ipos : POSITION, uint iid : SV_InstanceID) } else if (LightType == 2)//spot (cone) { - float arads = lodlight.OuterAngleOrCapExt * 0.01745329 * 1.5;//is this right? - float3 cpos = ipos.xyz * (atan(arads) * extent); + float arads = lodlight.OuterAngleOrCapExt * 0.01745329 * 0.5; // deg -> rad + float3 cpos = ipos.xyz * (tan(arads) * extent); cpos.y += ipos.w * extent; opos = (cpos.x * lodlight.TangentX.xyz) + (cpos.y * lodlight.Direction.xyz) + (cpos.z * lodlight.TangentY.xyz); } diff --git a/Shaders/LightVS.cso b/Shaders/LightVS.cso index 3d1f79966453fa1753663ebc4c1af5eb3fe4cfdf..eea120a951b34da894f91704ee99d00479dff08e 100644 GIT binary patch delta 194 zcmew${zcf#CBn(M^yf`|>kMYu%PX8@@+a|JWMp7q_`=D+zy_o(fVhO2f#D1gd$2Gt zWB|o0I5(P!v2aSTGB7wWFfzDJ4rR$_zQRWfl4^Q3KnivFtQVa}M3<3>} zKpF%X9YAD*y$MvF3CP1H&&R;P1=0_aXL0}%Kt0G9s0SYtH+AM0_UTkVWW`p#A)I2J)u)|bS4>1s?h(&hgKA0ky zLtr#ajm7tRdzeo^VjxSPAqVz|AuzO*fMUSFhle0g4Lnp~=7aS{Be@W${s1G;rMLM{ z+5-&)2Ng(>6x1-7Z(s(%EQQg?4h2Rj`{V$25l>J&fLsI$J`eyI0;L-q!7K&_b7=fQ u#Zly8hBIzvWUFVE1tl+FG6DluAgK(*ASEEXnI~W5l%KqZQ-l%3QU(A9fKB88