From 94eb96a23539aee5647e84d8e9248a13dce1b6de Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Sat, 10 Feb 2024 00:55:29 +0100 Subject: [PATCH] Fix trace bug for when rayquery is not available --- src/common/rendering/vulkan/vk_levelmesh.cpp | 2 +- wadsrc/static/shaders/lightmap/polyfill_rayquery.glsl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/rendering/vulkan/vk_levelmesh.cpp b/src/common/rendering/vulkan/vk_levelmesh.cpp index 246a1585d..59f81d7f6 100644 --- a/src/common/rendering/vulkan/vk_levelmesh.cpp +++ b/src/common/rendering/vulkan/vk_levelmesh.cpp @@ -522,7 +522,7 @@ void VkLevelMeshUploader::UploadNodes() CollisionNode* nodes = (CollisionNode*)(data + datapos); for (int i = 0, count = range.Size; i < count; i++) { - const auto& node = srcnodes[i]; + const auto& node = srcnodes[range.Offset + i]; CollisionNode info; info.center = SwapYZ(node.aabb.Center); info.extents = SwapYZ(node.aabb.Extents); diff --git a/wadsrc/static/shaders/lightmap/polyfill_rayquery.glsl b/wadsrc/static/shaders/lightmap/polyfill_rayquery.glsl index 97f61434c..83f0f514a 100644 --- a/wadsrc/static/shaders/lightmap/polyfill_rayquery.glsl +++ b/wadsrc/static/shaders/lightmap/polyfill_rayquery.glsl @@ -269,6 +269,7 @@ TraceResult TraceFirstHit(vec3 origin, float tmin, vec3 dir, float tmax) result.primitiveWeights.y = hit.c; result.primitiveWeights.z = 1.0 - hit.b - hit.c; result.primitiveIndex = hit.triangle; + return result; } }