diff --git a/WickedEngine/RenderPath3D.h b/WickedEngine/RenderPath3D.h index f19aa7ff6..2d5902fc7 100644 --- a/WickedEngine/RenderPath3D.h +++ b/WickedEngine/RenderPath3D.h @@ -31,7 +31,7 @@ private: XMFLOAT4 outlineColor = XMFLOAT4(0, 0, 0, 1); float aoRange = 1.0f; uint32_t aoSampleCount = 16; - float aoPower = 2.0f; + float aoPower = 1.0f; float chromaticAberrationAmount = 2.0f; uint32_t screenSpaceShadowSampleCount = 16; float screenSpaceShadowRange = 1; diff --git a/WickedEngine/shaders/lightingHF.hlsli b/WickedEngine/shaders/lightingHF.hlsli index bcb021293..ca9d08e65 100644 --- a/WickedEngine/shaders/lightingHF.hlsli +++ b/WickedEngine/shaders/lightingHF.hlsli @@ -135,10 +135,10 @@ inline void DirectionalLight(in ShaderEntity light, in Surface surface, inout Li [branch] if (light.IsCastingShadow() && surface.IsReceiveShadow()) { -#ifndef RTAPI +#ifdef SHADOW_MASK_ENABLED [branch] if ((g_xFrame_Options & OPTION_BIT_RAYTRACED_SHADOWS) == 0) -#endif // RTAPI +#endif // SHADOW_MASK_ENABLED { // Loop through cascades from closest (smallest) to furthest (largest) [loop] @@ -221,10 +221,10 @@ inline void PointLight(in ShaderEntity light, in Surface surface, inout Lighting [branch] if (light.IsCastingShadow() && surface.IsReceiveShadow()) { -#ifndef RTAPI +#ifdef SHADOW_MASK_ENABLED [branch] if ((g_xFrame_Options & OPTION_BIT_RAYTRACED_SHADOWS) == 0) -#endif // RTAPI +#endif // SHADOW_MASK_ENABLED { shadow *= shadowCube(light, L, Lunnormalized); } @@ -277,10 +277,10 @@ inline void SpotLight(in ShaderEntity light, in Surface surface, inout Lighting [branch] if (light.IsCastingShadow() && surface.IsReceiveShadow()) { -#ifndef RTAPI +#ifdef SHADOW_MASK_ENABLED [branch] if ((g_xFrame_Options & OPTION_BIT_RAYTRACED_SHADOWS) == 0) -#endif // RTAPI +#endif // SHADOW_MASK_ENABLED { float4 ShPos = mul(MatrixArray[light.GetMatrixIndex() + 0], float4(surface.P, 1)); ShPos.xyz /= ShPos.w; diff --git a/WickedEngine/wiRenderer.h b/WickedEngine/wiRenderer.h index f8f6d6409..99ac15a6f 100644 --- a/WickedEngine/wiRenderer.h +++ b/WickedEngine/wiRenderer.h @@ -334,7 +334,7 @@ namespace wiRenderer wiGraphics::CommandList cmd, float range = 1.0f, uint32_t samplecount = 16, - float power = 2.0f + float power = 1.0f ); void Postprocess_HBAO( const SSAOResources& res, @@ -342,7 +342,7 @@ namespace wiRenderer const wiGraphics::Texture& lineardepth, const wiGraphics::Texture& output, wiGraphics::CommandList cmd, - float power = 2.0f + float power = 1.0f ); struct MSAOResources { @@ -373,7 +373,7 @@ namespace wiRenderer const wiGraphics::Texture& lineardepth, const wiGraphics::Texture& output, wiGraphics::CommandList cmd, - float power = 2.0f + float power = 1.0f ); struct RTAOResources { @@ -396,7 +396,7 @@ namespace wiRenderer const wiGraphics::Texture& output, wiGraphics::CommandList cmd, float range = 1.0f, - float power = 2.0f + float power = 1.0f ); struct RTReflectionResources { diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index e49cb285f..3e1f002e3 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates, breaking compatibility changes const int minor = 56; // minor bug fixes, alterations, refactors, updates - const int revision = 82; + const int revision = 83; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);