This commit is contained in:
2025-09-20 12:42:42 +02:00
parent 7d4cd26c31
commit 209780cd54
3 changed files with 6 additions and 6 deletions
+5 -5
View File
@@ -51,9 +51,9 @@ float4 fragmentMain(in FragmentParameter params) : SV_Target
} }
} }
float4 lightSpacePos = mul(pShadowMapping.lightSpaceMatrices[cascadeIndex][i], float4(params.position_WS, 1)); float4 lightSpacePos = mul(pShadowMapping.lightSpaceMatrices[cascadeIndex][i], float4(params.position_WS, 1));
//lightSpacePos = mul(biasMat, lightSpacePos); lightSpacePos = mul(biasMat, lightSpacePos);
float4 shadowCoord = clipToScreen(lightSpacePos); float4 shadowCoord = clipToScreen(lightSpacePos);
int3 texDim; /*int3 texDim;
pShadowMapping.shadowMaps[cascadeIndex].GetDimensions(texDim.x, texDim.y, texDim.z); pShadowMapping.shadowMaps[cascadeIndex].GetDimensions(texDim.x, texDim.y, texDim.z);
float scale = 1.5f; float scale = 1.5f;
float dx = scale * 1.0 / float(texDim.x); float dx = scale * 1.0 / float(texDim.x);
@@ -68,7 +68,7 @@ float4 fragmentMain(in FragmentParameter params) : SV_Target
if (shadowCoord.z > 0.0 && shadowCoord.z < 1.0) if (shadowCoord.z > 0.0 && shadowCoord.z < 1.0)
{ {
float dist = pShadowMapping.shadowMaps[cascadeIndex].Sample(pShadowMapping.shadowSampler, float3(shadowCoord.xy + float2(dx * x, dy * y), i)).r; float dist = pShadowMapping.shadowMaps[cascadeIndex].Sample(pShadowMapping.shadowSampler, float3(shadowCoord.xy + float2(dx * x, dy * y), i)).r;
if (shadowCoord.w > 0 && dist > shadowCoord.z + 0.005f) if (shadowCoord.w > 0 && dist < shadowCoord.z - 0.005f)
{ {
shadow = 0; shadow = 0;
} }
@@ -76,9 +76,9 @@ float4 fragmentMain(in FragmentParameter params) : SV_Target
shadowFactor += shadow; shadowFactor += shadow;
count++; count++;
} }
} }*/
result = float3(pShadowMapping.shadowMaps[cascadeIndex].Sample(pShadowMapping.shadowSampler, float3(shadowCoord.xy, i)).r, 0, 0);//(shadowFactor / count) * pLightEnv.directionalLights[i].illuminate(lightingParams, brdf); result = 1 - float3(pShadowMapping.shadowMaps[cascadeIndex].Sample(pShadowMapping.shadowSampler, float3(shadowCoord.xy, i)).r, 0, 0);//(shadowFactor / count) * pLightEnv.directionalLights[i].illuminate(lightingParams, brdf);
} }
for (uint i = 0; i < pLightEnv.numPointLights; ++i) for (uint i = 0; i < pLightEnv.numPointLights; ++i)
{ {
@@ -125,6 +125,7 @@ void ShadowPass::beginFrame(const Component::Camera& camera, const Component::Tr
viewParams.screenDimensions = Vector2(maxExtents.x - minExtents.x, maxExtents.y - minExtents.y); viewParams.screenDimensions = Vector2(maxExtents.x - minExtents.x, maxExtents.y - minExtents.y);
viewParams.invScreenDimensions = 1.0f / viewParams.screenDimensions; viewParams.invScreenDimensions = 1.0f / viewParams.screenDimensions;
cascades[i].viewParams.add(createViewParamsSet()); cascades[i].viewParams.add(createViewParamsSet());
cascades[i].lightSpaceBuffer->updateContents(0, sizeof(Matrix4), &viewProjectionMatrix);
lastSplitDist = cascadeSplits[i]; lastSplitDist = cascadeSplits[i];
} }
-1
View File
@@ -1,5 +1,4 @@
#pragma once #pragma once
#include <glm/mat2x2.hpp> #include <glm/mat2x2.hpp>
#include <glm/mat3x3.hpp> #include <glm/mat3x3.hpp>
#include <glm/mat4x4.hpp> #include <glm/mat4x4.hpp>