From d26b642b8d83bb5dafce5a5186c0134e03d94ad9 Mon Sep 17 00:00:00 2001 From: Turanszki Janos Date: Thu, 29 Aug 2019 20:20:25 +0100 Subject: [PATCH] lightmap fix --- WickedEngine/renderlightmapPS.hlsl | 3 ++- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WickedEngine/renderlightmapPS.hlsl b/WickedEngine/renderlightmapPS.hlsl index 11311f1ff..fb593f031 100644 --- a/WickedEngine/renderlightmapPS.hlsl +++ b/WickedEngine/renderlightmapPS.hlsl @@ -22,6 +22,7 @@ float4 main(Input input) : SV_TARGET const uint bounces = xTraceUserData.x; for (uint i = 0; (i < bounces) && any(ray.energy); ++i) { + P = ray.origin; float3 bounceResult = 0; [loop] @@ -175,7 +176,7 @@ float4 main(Input input) : SV_TARGET float v = ray.bary.y; float w = 1 - u - v; - float3 N = normalize(tri.n0 * w + tri.n1 * u + tri.n2 * v); + N = normalize(tri.n0 * w + tri.n1 * u + tri.n2 * v); float4 uvsets = tri.u0 * w + tri.u1 * u + tri.u2 * v; float4 color = tri.c0 * w + tri.c1 * u + tri.c2 * v; uint materialIndex = tri.materialIndex; diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 4300fab1b..cbec9e44c 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 28; // minor bug fixes, alterations, refactors, updates - const int revision = 15; + const int revision = 16; long GetVersion()