From fc7b9ec9a8b9c34550ca46c1fbc4d29f56dc6610 Mon Sep 17 00:00:00 2001 From: ZZYZX Date: Wed, 1 Feb 2017 16:53:19 +0200 Subject: [PATCH] Removed dynlight-surface angle clip threshold - it didn't work properly anyway --- Source/Core/Properties/AssemblyInfo.cs | 4 ++-- Source/Core/Resources/world3d.fx | 4 ++-- Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Properties/AssemblyInfo.cs b/Source/Core/Properties/AssemblyInfo.cs index 7fdc0020..080bab13 100755 --- a/Source/Core/Properties/AssemblyInfo.cs +++ b/Source/Core/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ using CodeImp.DoomBuilder; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.2851")] +[assembly: AssemblyVersion("2.3.0.2852")] [assembly: NeutralResourcesLanguageAttribute("en")] -[assembly: AssemblyHash("42c2fc2")] +[assembly: AssemblyHash("469942d")] diff --git a/Source/Core/Resources/world3d.fx b/Source/Core/Resources/world3d.fx index 72af1c90..a0d37e49 100755 --- a/Source/Core/Resources/world3d.fx +++ b/Source/Core/Resources/world3d.fx @@ -234,12 +234,12 @@ float4 ps_vertex_color(PixelData pd) : COLOR } //mxd. dynamic light pixel shader pass, dood! -float4 ps_lightpass(LitPixelData pd) : COLOR +float4 ps_lightpass(LitPixelData pd) : COLOR { //is face facing away from light source? // [ZZ] oddly enough pd.normal is not a proper normal, so using dot on it returns rather unexpected results. wrapped in normalize(). float diffuseContribution = dot(normalize(pd.normal), normalize(lightPosAndRadius.xyz - pd.pos_w)); - if (diffuseContribution < -0.1f) // (lightPosAndRadius.xyz - pd.pos_w) == direction from light to current pixel + if (diffuseContribution < 0) clip(-1); diffuseContribution = max(diffuseContribution, 0); // to make sure diff --git a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs index f17f34b6..068de40b 100755 --- a/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs +++ b/Source/Plugins/BuilderModes/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Resources; // Build Number // Revision // -[assembly: AssemblyVersion("2.3.0.2851")] +[assembly: AssemblyVersion("2.3.0.2852")] [assembly: NeutralResourcesLanguageAttribute("en")]