From ba1f8d94aee9fcf1f3cb9ccfe5b26ff4eeb99530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Sat, 20 Jan 2024 19:34:22 +0100 Subject: [PATCH] fix missing lightmap in raytraced reflection --- WickedEngine/shaders/rtreflectionCS.hlsl | 8 +++++++- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/WickedEngine/shaders/rtreflectionCS.hlsl b/WickedEngine/shaders/rtreflectionCS.hlsl index 18d975d6de..dbb3719fd6 100644 --- a/WickedEngine/shaders/rtreflectionCS.hlsl +++ b/WickedEngine/shaders/rtreflectionCS.hlsl @@ -159,8 +159,14 @@ void main(uint2 DTid : SV_DispatchThreadID) surface.V = -q.WorldRayDirection(); surface.update(); + if ((surface.flags & SURFACE_FLAG_GI_APPLIED) == 0) + { + float3 ambient = GetAmbient(surface.N); + surface.gi = lerp(ambient, ambient * surface.sss.rgb, saturate(surface.sss.a)); + } + Lighting lighting; - lighting.create(0, 0, GetAmbient(surface.N), 0); + lighting.create(0, 0, surface.gi, 0); [loop] for (uint iterator = 0; iterator < GetFrame().lightarray_count; iterator++) diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index d3268669e9..513a1fa1d8 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wi::version // minor features, major updates, breaking compatibility changes const int minor = 71; // minor bug fixes, alterations, refactors, updates - const int revision = 361; + const int revision = 362; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);