nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

shadows maps are now using reversed z-buffer too

Browse Source
This commit is contained in:
turanszkij
2017-10-19 15:04:15 +01:00
parent ee9d880598
commit d6b0ca69e5
8 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/information_sheet.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 281 KiB

After

Width:  |  Height:  |  Size: 280 KiB

WickedEngine/cubeShadowPS.hlsl
+2 -2
View File
@@ -7,7 +7,7 @@ struct VertextoPixel
uint RTIndex : SV_RenderTargetArrayIndex;
};
float main(VertextoPixel PSIn) : SV_DEPTHLESSEQUAL
float main(VertextoPixel PSIn) : SV_DEPTHGREATEREQUAL
{
return distance(PSIn.pos3D.xyz, g_xColor.xyz) * g_xColor.w; // g_xColor.w = 1.0 / range
return 1.0f - distance(PSIn.pos3D.xyz, g_xColor.xyz) * g_xColor.w; // g_xColor.w = 1.0 / range
}
WickedEngine/cubeShadowPS_alphatest.hlsl
+2 -2
View File
@@ -8,8 +8,8 @@ struct VertextoPixel
uint RTIndex : SV_RenderTargetArrayIndex;
};
float main(VertextoPixel PSIn) : SV_DEPTHLESSEQUAL
float main(VertextoPixel PSIn) : SV_DEPTHGREATEREQUAL
{
ALPHATEST(xBaseColorMap.Sample(sampler_linear_wrap,PSIn.tex).a);
return distance(PSIn.pos3D.xyz, g_xColor.xyz) * g_xColor.w; // g_xColor.w = 1.0 / range
return 1.0f - distance(PSIn.pos3D.xyz, g_xColor.xyz) * g_xColor.w; // g_xColor.w = 1.0 / range
}
WickedEngine/lightingHF.hlsli
+2 -2
View File
@@ -21,7 +21,7 @@ struct LightingResult
inline float shadowCascade(float4 shadowPos, float2 ShTex, float shadowKernel, float bias, float slice)
{
float realDistance = shadowPos.z - bias;
float realDistance = shadowPos.z + bias;
float sum = 0;
float retVal = 1;
#ifdef DIRECTIONALLIGHT_SOFT
@@ -136,7 +136,7 @@ inline LightingResult PointLight(in ShaderEntityType light, in float3 N, in floa
float sh = max(NdotL, 0);
[branch]
if (light.shadowMap_index >= 0) {
sh *= texture_shadowarray_cube.SampleCmpLevelZero(sampler_cmp_depth, float4(-L, light.shadowMap_index), dist / light.range * (1 - light.shadowBias)).r;
sh *= texture_shadowarray_cube.SampleCmpLevelZero(sampler_cmp_depth, float4(-L, light.shadowMap_index), 1 - dist / light.range * (1 - light.shadowBias)).r;
}
result.diffuse *= sh;
result.specular *= sh;
WickedEngine/wiDepthTarget.cpp
+1 -2
View File
@@ -79,8 +79,7 @@ void wiDepthTarget::InitializeCube(int size, bool independentFaces)
void wiDepthTarget::Clear(GRAPHICSTHREAD threadID)
{
float depthClear = GetDesc().MiscFlags & RESOURCE_MISC_TEXTURECUBE ? 1.0f : 0.0f;
wiRenderer::GetDevice()->ClearDepthStencil(GetTexture(), CLEAR_DEPTH | CLEAR_STENCIL, depthClear, 0, threadID);
wiRenderer::GetDevice()->ClearDepthStencil(GetTexture(), CLEAR_DEPTH | CLEAR_STENCIL, 0.0f, 0, threadID);
resolvedMSAAUptodate = false;
}
void wiDepthTarget::CopyFrom(const wiDepthTarget& from, GRAPHICSTHREAD threadID)
WickedEngine/wiLoader.h
+8 -3
View File
@@ -782,6 +782,7 @@ private:
};
struct SHCAM{
XMFLOAT4X4 View,Projection;
XMFLOAT4X4 realProjection; // because reverse zbuffering projection complicates things...
XMFLOAT3 Eye,At,Up;
float nearplane,farplane,size;
@@ -818,13 +819,17 @@ struct SHCAM{
XMStoreFloat4x4( &View, rView);
}
void Create_Ortho(float size){
XMMATRIX rProjection = XMMatrixOrthographicOffCenterLH(-size*0.5f,size*0.5f,-size*0.5f,size*0.5f,nearplane,farplane);
XMMATRIX rProjection = XMMatrixOrthographicOffCenterLH(-size*0.5f,size*0.5f,-size*0.5f,size*0.5f,farplane,nearplane);
XMStoreFloat4x4( &Projection, rProjection);
rProjection = XMMatrixOrthographicOffCenterLH(-size*0.5f, size*0.5f, -size*0.5f, size*0.5f, nearplane, farplane);
XMStoreFloat4x4(&realProjection, rProjection);
this->size=size;
}
void Create_Perspective(float fov){
XMMATRIX rProjection = XMMatrixPerspectiveFovLH(fov,1,nearplane,farplane);
XMStoreFloat4x4( &Projection, rProjection);
XMMATRIX rProjection = XMMatrixPerspectiveFovLH(fov,1,farplane,nearplane);
XMStoreFloat4x4( &Projection, rProjection);
rProjection = XMMatrixPerspectiveFovLH(fov, 1, nearplane, farplane);
XMStoreFloat4x4(&realProjection, rProjection);
}
void Update(const XMVECTOR& pos){
XMStoreFloat4x4( &View , XMMatrixTranslationFromVector(-pos)
WickedEngine/wiRenderer.cpp
+17 -14
View File
@@ -979,18 +979,21 @@ void wiRenderer::SetUpStates()
samplerDesc.AddressU = TEXTURE_ADDRESS_WRAP;
samplerDesc.AddressV = TEXTURE_ADDRESS_WRAP;
samplerDesc.AddressW = TEXTURE_ADDRESS_WRAP;
samplerDesc.MaxAnisotropy = 16;
GetDevice()->CreateSamplerState(&samplerDesc, samplers[SSLOT_ANISO_WRAP]);
samplerDesc.Filter = FILTER_ANISOTROPIC;
samplerDesc.AddressU = TEXTURE_ADDRESS_MIRROR;
samplerDesc.AddressV = TEXTURE_ADDRESS_MIRROR;
samplerDesc.AddressW = TEXTURE_ADDRESS_MIRROR;
samplerDesc.MaxAnisotropy = 16;
GetDevice()->CreateSamplerState(&samplerDesc, samplers[SSLOT_ANISO_MIRROR]);
samplerDesc.Filter = FILTER_ANISOTROPIC;
samplerDesc.AddressU = TEXTURE_ADDRESS_WRAP;
samplerDesc.AddressV = TEXTURE_ADDRESS_WRAP;
samplerDesc.AddressW = TEXTURE_ADDRESS_WRAP;
samplerDesc.MaxAnisotropy = 16;
GetDevice()->CreateSamplerState(&samplerDesc, samplers[SSLOT_OBJECTSHADER]);
ZeroMemory( &samplerDesc, sizeof(SamplerDesc) );
@@ -999,8 +1002,8 @@ void wiRenderer::SetUpStates()
samplerDesc.AddressV = TEXTURE_ADDRESS_CLAMP;
samplerDesc.AddressW = TEXTURE_ADDRESS_CLAMP;
samplerDesc.MipLODBias = 0.0f;
samplerDesc.MaxAnisotropy = 16;
samplerDesc.ComparisonFunc = COMPARISON_LESS_EQUAL;
samplerDesc.MaxAnisotropy = 0;
samplerDesc.ComparisonFunc = COMPARISON_GREATER_EQUAL;
GetDevice()->CreateSamplerState(&samplerDesc, samplers[SSLOT_CMP_DEPTH]);
for (int i = 0; i < SSTYPE_LAST; ++i)
@@ -1049,7 +1052,7 @@ void wiRenderer::SetUpStates()
rs.FrontCounterClockwise=true;
rs.DepthBias=0;
rs.DepthBiasClamp=0;
rs.SlopeScaledDepthBias = 4.0f;
rs.SlopeScaledDepthBias = -2.0f;
rs.DepthClipEnable=true;
rs.ScissorEnable=false;
rs.MultisampleEnable=false;
@@ -1062,7 +1065,7 @@ void wiRenderer::SetUpStates()
rs.FrontCounterClockwise=true;
rs.DepthBias=0;
rs.DepthBiasClamp=0;
rs.SlopeScaledDepthBias = 5.0f;
rs.SlopeScaledDepthBias = -2.0f;
rs.DepthClipEnable=true;
rs.ScissorEnable=false;
rs.MultisampleEnable=false;
@@ -1173,7 +1176,7 @@ void wiRenderer::SetUpStates()
DepthStencilStateDesc dsd;
dsd.DepthEnable = true;
dsd.DepthWriteMask = DEPTH_WRITE_MASK_ALL;
dsd.DepthFunc = COMPARISON_GREATER_EQUAL;
dsd.DepthFunc = COMPARISON_GREATER;
dsd.StencilEnable = true;
dsd.StencilReadMask = 0xFF;
@@ -1190,7 +1193,7 @@ void wiRenderer::SetUpStates()
dsd.DepthEnable = true;
dsd.DepthWriteMask = DEPTH_WRITE_MASK_ALL;
dsd.DepthFunc = COMPARISON_LESS_EQUAL;
dsd.DepthFunc = COMPARISON_GREATER;
dsd.StencilEnable = false;
GetDevice()->CreateDepthStencilState(&dsd, depthStencils[DSSTYPE_SHADOW]);
@@ -1201,7 +1204,7 @@ void wiRenderer::SetUpStates()
dsd.StencilEnable = false;
dsd.StencilReadMask = 0xFF;
dsd.StencilWriteMask = 0xFF;
dsd.FrontFace.StencilFunc = COMPARISON_LESS_EQUAL;
dsd.FrontFace.StencilFunc = COMPARISON_LESS;
dsd.FrontFace.StencilPassOp = STENCIL_OP_KEEP;
dsd.FrontFace.StencilFailOp = STENCIL_OP_KEEP;
dsd.FrontFace.StencilDepthFailOp = STENCIL_OP_KEEP;
@@ -1249,7 +1252,7 @@ void wiRenderer::SetUpStates()
dsd.DepthWriteMask = DEPTH_WRITE_MASK_ALL;
dsd.DepthEnable = false;
dsd.StencilEnable = true;
dsd.DepthFunc = COMPARISON_GREATER_EQUAL;
dsd.DepthFunc = COMPARISON_GREATER;
dsd.StencilReadMask = 0xFF;
dsd.StencilWriteMask = 0x00;
dsd.FrontFace.StencilFunc = COMPARISON_EQUAL;
@@ -1266,7 +1269,7 @@ void wiRenderer::SetUpStates()
dsd.DepthEnable = true;
dsd.StencilEnable = false;
dsd.DepthWriteMask = DEPTH_WRITE_MASK_ZERO;
dsd.DepthFunc = COMPARISON_GREATER_EQUAL;
dsd.DepthFunc = COMPARISON_GREATER;
GetDevice()->CreateDepthStencilState(&dsd, depthStencils[DSSTYPE_DEPTHREAD]);
dsd.DepthEnable = false;
@@ -1288,7 +1291,7 @@ void wiRenderer::SetUpStates()
dsd.DepthEnable = true;
dsd.DepthWriteMask = DEPTH_WRITE_MASK_ALL;
dsd.DepthFunc = COMPARISON_LESS_EQUAL;
dsd.DepthFunc = COMPARISON_GREATER;
GetDevice()->CreateDepthStencilState(&dsd, depthStencils[DSSTYPE_ENVMAP]);
@@ -3340,7 +3343,7 @@ void wiRenderer::DrawForShadowMap(GRAPHICSTHREAD threadID)
if (!culledRenderer.empty())
{
GetDevice()->BindRenderTargets(0, nullptr, Light::shadowMapArray_2D, threadID, l->shadowMap_index + index);
GetDevice()->ClearDepthStencil(Light::shadowMapArray_2D, CLEAR_DEPTH, 1.0f, 0, threadID, l->shadowMap_index + index);
GetDevice()->ClearDepthStencil(Light::shadowMapArray_2D, CLEAR_DEPTH, 0.0f, 0, threadID, l->shadowMap_index + index);
CameraCB cb;
cb.mVP = l->shadowCam_dirLight[index].getVP();
@@ -3359,7 +3362,7 @@ void wiRenderer::DrawForShadowMap(GRAPHICSTHREAD threadID)
shadowCounter_2D++; // shadow indices are already complete so a shadow slot is consumed here even if no rendering actually happens!
Frustum frustum;
frustum.ConstructFrustum(l->shadowCam_spotLight[0].farplane, l->shadowCam_spotLight[0].Projection, l->shadowCam_spotLight[0].View);
frustum.ConstructFrustum(l->shadowCam_spotLight[0].farplane, l->shadowCam_spotLight[0].realProjection, l->shadowCam_spotLight[0].View);
if (spTree != nullptr)
{
CulledList culledObjects;
@@ -3376,7 +3379,7 @@ void wiRenderer::DrawForShadowMap(GRAPHICSTHREAD threadID)
if (!culledRenderer.empty())
{
GetDevice()->BindRenderTargets(0, nullptr, Light::shadowMapArray_2D, threadID, l->shadowMap_index);
GetDevice()->ClearDepthStencil(Light::shadowMapArray_2D, CLEAR_DEPTH, 1.0f, 0, threadID, l->shadowMap_index);
GetDevice()->ClearDepthStencil(Light::shadowMapArray_2D, CLEAR_DEPTH, 0.0f, 0, threadID, l->shadowMap_index);
CameraCB cb;
cb.mVP = l->shadowCam_spotLight[0].getVP();
@@ -3413,7 +3416,7 @@ void wiRenderer::DrawForShadowMap(GRAPHICSTHREAD threadID)
if (!culledRenderer.empty())
{
GetDevice()->BindRenderTargets(0, nullptr, Light::shadowMapArray_Cube, threadID, l->shadowMap_index);
GetDevice()->ClearDepthStencil(Light::shadowMapArray_Cube, CLEAR_DEPTH, 1.0f, 0, threadID, l->shadowMap_index);
GetDevice()->ClearDepthStencil(Light::shadowMapArray_Cube, CLEAR_DEPTH, 0.0f, 0, threadID, l->shadowMap_index);
MiscCB miscCb;
miscCb.mColor = XMFLOAT4(l->translation.x, l->translation.y, l->translation.z, 1.0f / l->GetRange()); // reciprocal range, to avoid division in shader
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wiVersion
// minor features, major updates
const int minor = 13;
// minor bug fixes, alterations, refactors, updates
const int revision = 38;
const int revision = 39;
long GetVersion()