diff --git a/WickedEngine/shaders/oceanSurfacePS.hlsl b/WickedEngine/shaders/oceanSurfacePS.hlsl index 4d1f029b5..23631c75d 100644 --- a/WickedEngine/shaders/oceanSurfacePS.hlsl +++ b/WickedEngine/shaders/oceanSurfacePS.hlsl @@ -35,18 +35,15 @@ float4 main(PSIn input) : SV_TARGET surface.pixel = input.pos.xy; float depth = input.pos.z; + TiledLighting(surface, lighting); + float2 refUV = float2(1, -1)*input.ReflectionMapSamplingPos.xy / input.ReflectionMapSamplingPos.w * 0.5f + 0.5f; float2 ScreenCoord = surface.pixel * g_xFrame_InternalResolution_rcp; //REFLECTION float2 RefTex = float2(1, -1)*input.ReflectionMapSamplingPos.xy / input.ReflectionMapSamplingPos.w / 2.0f + 0.5f; float4 reflectiveColor = texture_reflection.SampleLevel(sampler_linear_mirror, RefTex + surface.N.xz * 0.04f, 0); - float NdotV = abs(dot(surface.N, surface.V)); - float ramp = pow(abs(1.0f / (1.0f + NdotV)), 16); - reflectiveColor.rgb = lerp(float3(0.38f, 0.45f, 0.56f), reflectiveColor.rgb, ramp); // skycolor hack - lighting.indirect.specular += reflectiveColor.rgb * surface.F; - - TiledLighting(surface, lighting); + lighting.indirect.specular = reflectiveColor.rgb * surface.F; // WATER REFRACTION float lineardepth = input.pos.w; diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 58faf1faf..b8ba3728a 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 = 50; + const int revision = 51; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);