From 9f6a32b8a0ca0528495b900e95e8098c46575634 Mon Sep 17 00:00:00 2001 From: cosmonaut Date: Fri, 28 Aug 2020 01:12:17 -0700 Subject: [PATCH] experimenting with storing shadows in cube map --- Effects/DeferredPBREffect.cs | 2 +- Effects/DirectionalLightCollection.cs | 8 ++++---- Effects/FXB/DeferredPBREffect.fxb | Bin 52720 -> 57216 bytes Effects/HLSL/DeferredPBREffect.fx | 14 ++++++++------ Lights/DirectionalLight.cs | 8 ++++---- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Effects/DeferredPBREffect.cs b/Effects/DeferredPBREffect.cs index 9569420..83da9f7 100644 --- a/Effects/DeferredPBREffect.cs +++ b/Effects/DeferredPBREffect.cs @@ -32,7 +32,7 @@ namespace Kav private set { pointLightCollection = value; } } - public int MaxDirectionalLights { get; } = 4; + public int MaxDirectionalLights { get; } = 6; public DirectionalLightCollection DirectionalLights { diff --git a/Effects/DirectionalLightCollection.cs b/Effects/DirectionalLightCollection.cs index 93ab4a4..75047c3 100644 --- a/Effects/DirectionalLightCollection.cs +++ b/Effects/DirectionalLightCollection.cs @@ -5,10 +5,10 @@ namespace Kav { public class DirectionalLightCollection { - private readonly Vector3[] directions = new Vector3[4]; - private readonly Vector3[] colors = new Vector3[4]; - private readonly float[] intensities = new float[4]; - private readonly Matrix[] lightSpaceMatrices = new Matrix[4]; + private readonly Vector3[] directions = new Vector3[6]; + private readonly Vector3[] colors = new Vector3[6]; + private readonly float[] intensities = new float[6]; + private readonly Matrix[] lightSpaceMatrices = new Matrix[6]; readonly EffectParameter lightDirectionsParam; readonly EffectParameter lightColorsParam; diff --git a/Effects/FXB/DeferredPBREffect.fxb b/Effects/FXB/DeferredPBREffect.fxb index b3e238363f8a7ac9e12e625a5a73ef6986fdde1a..669ec7c7663e48a50aa84cb64b44d511029d8757 100644 GIT binary patch literal 57216 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 MO;5~B)b^qNZ`_74v;Y7A literal 52720 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 diff --git a/Effects/HLSL/DeferredPBREffect.fx b/Effects/HLSL/DeferredPBREffect.fx index 5795238..f685ffa 100644 --- a/Effects/HLSL/DeferredPBREffect.fx +++ b/Effects/HLSL/DeferredPBREffect.fx @@ -2,7 +2,7 @@ static const float PI = 3.141592653589793; static const int MAX_POINT_LIGHTS = 64; -static const int MAX_DIRECTIONAL_LIGHTS = 4; +static const int MAX_DIRECTIONAL_LIGHTS = 6; DECLARE_TEXTURE(gPosition, 0); DECLARE_TEXTURE(gAlbedo, 1); @@ -18,11 +18,11 @@ BEGIN_CONSTANTS float3 PointLightColors[MAX_POINT_LIGHTS] _ps(c65) _cb(c65); float3 DirectionalLightDirections[MAX_DIRECTIONAL_LIGHTS] _ps(c129) _cb(c129); - float3 DirectionalLightColors[MAX_DIRECTIONAL_LIGHTS] _ps(c133) _cb(c133); + float3 DirectionalLightColors[MAX_DIRECTIONAL_LIGHTS] _ps(c135) _cb(c135); MATRIX_CONSTANTS - float4x4 DirectionalLightMatrices[MAX_DIRECTIONAL_LIGHTS] _ps(c137) _cb(c137); + float4x4 DirectionalLightMatrices[MAX_DIRECTIONAL_LIGHTS] _ps(c141) _cb(c141); END_CONSTANTS @@ -96,8 +96,8 @@ float ComputeShadow(float4 positionLightSpace, int directionalLightIndex) // maps to [-1, 1] float3 projectionCoords = positionLightSpace.xyz / positionLightSpace.w; + // map our UV sample coordinates to a cube map sample vector float3 cubeMapSampleVector; - if (directionalLightIndex == 0) { cubeMapSampleVector = float3(1.0f, projectionCoords.y, -projectionCoords.x); @@ -126,7 +126,9 @@ float ComputeShadow(float4 positionLightSpace, int directionalLightIndex) float closestDepth = SAMPLE_CUBEMAP(shadowMap, cubeMapSampleVector).r; float currentDepth = projectionCoords.z; - float shadow = currentDepth - bias > closestDepth ? 1.0 : 0.0; + if (projectionCoords.z > 1.0) { return 0.0; } + + float shadow = currentDepth > closestDepth ? 1.0 : 0.0; return shadow; } @@ -189,7 +191,7 @@ float4 ComputeColor( } // directional light - for (int i = 0; i < 1; i++) + for (int i = 0; i < MAX_DIRECTIONAL_LIGHTS; i++) { float4 positionLightSpace = mul(float4(worldPosition, 1.0), DirectionalLightMatrices[i]); float shadow = ComputeShadow(positionLightSpace, i); diff --git a/Lights/DirectionalLight.cs b/Lights/DirectionalLight.cs index 9780535..835587e 100644 --- a/Lights/DirectionalLight.cs +++ b/Lights/DirectionalLight.cs @@ -4,15 +4,15 @@ namespace Kav { public struct DirectionalLight { - public Vector3 Direction { get; set; } - public Color Color { get; set; } - public float Intensity { get; set; } + public Vector3 Direction { get; } + public Color Color { get; } + public float Intensity { get; } public Matrix View { get { - return Matrix.CreateLookAt(Direction * 4.5f, Vector3.Zero, Vector3.Up); + return Matrix.CreateLookAt((Direction * 5f), Vector3.Zero, Vector3.Up); } }