From de596ce4856604167dedde6c2289cfc21831b61c Mon Sep 17 00:00:00 2001 From: turanszkij Date: Sun, 22 Dec 2019 00:41:11 +0100 Subject: [PATCH] voxel gi fix --- WickedEngine/objectPS_voxelizer.hlsl | 4 +--- WickedEngine/wiRenderer.cpp | 7 ++++--- WickedEngine/wiVersion.cpp | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/WickedEngine/objectPS_voxelizer.hlsl b/WickedEngine/objectPS_voxelizer.hlsl index 96ad1cdbd..ac38a3942 100644 --- a/WickedEngine/objectPS_voxelizer.hlsl +++ b/WickedEngine/objectPS_voxelizer.hlsl @@ -48,9 +48,7 @@ void main(PSInput input) emissiveColor *= emissiveMap; } - // fake normals are good enough because it's only coarse diffuse light, no need to normalize: - // (just uncomment if there are any noticable artifacts) - //N = normalize(N); + N = normalize(N); Lighting lighting = CreateLighting(0, 0, 0, 0); diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp index c09ab3a57..399b79f80 100644 --- a/WickedEngine/wiRenderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -136,9 +136,9 @@ struct VoxelizedSceneData float voxelsize = 1; XMFLOAT3 center = XMFLOAT3(0, 0, 0); XMFLOAT3 extents = XMFLOAT3(0, 0, 0); - uint32_t numCones = 8; - float rayStepSize = 0.5f; - bool secondaryBounceEnabled = true; + uint32_t numCones = 4; + float rayStepSize = 0.75f; + bool secondaryBounceEnabled = false; bool reflectionsEnabled = true; bool centerChangedThisFrame = true; uint32_t mips = 7; @@ -6685,6 +6685,7 @@ void VoxelRadiance(CommandList cmd) GPUResource* UAVs[] = { &resourceBuffers[RBTYPE_VOXELSCENE] }; device->BindUAVs(PS, UAVs, 0, 1, cmd); + BindCommonResources(cmd); BindShadowmaps(PS, cmd); BindConstantBuffers(VS, cmd); BindConstantBuffers(PS, cmd); diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index dc0c5e09c..f8ff1d6e8 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 36; // minor bug fixes, alterations, refactors, updates - const int revision = 15; + const int revision = 16; long GetVersion()