From 53865dd388521bfb34f65fed62a1f26d2af3fccd Mon Sep 17 00:00:00 2001 From: turanszkij Date: Fri, 10 Mar 2017 22:24:09 +0100 Subject: [PATCH] Implemented feature: secondary light bounce for voxel radiance --- WickedEngine/voxelRadianceSecondaryBounceCS.hlsl | 3 ++- WickedEngine/wiGraphicsDevice_DX11.cpp | 2 +- WickedEngine/wiVersion.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/WickedEngine/voxelRadianceSecondaryBounceCS.hlsl b/WickedEngine/voxelRadianceSecondaryBounceCS.hlsl index f773eca9b..cd708c048 100644 --- a/WickedEngine/voxelRadianceSecondaryBounceCS.hlsl +++ b/WickedEngine/voxelRadianceSecondaryBounceCS.hlsl @@ -19,11 +19,12 @@ void main( uint3 DTid : SV_DispatchThreadID ) { float3 N = DecodeNormal(input_voxelscene[DTid.x].normalMask); - float3 uvw = writecoord / g_xWorld_VoxelRadianceDataRes; + float3 uvw = (float3)writecoord / (float3)g_xWorld_VoxelRadianceDataRes; float4 radiance = ConeTraceRadiance(input_emission, uvw, N); output[writecoord] = emission + float4(radiance.rgb, 0); + //output[writecoord] = float4(radiance.rgb, 1); //output[writecoord] = float4(N, 1); } else diff --git a/WickedEngine/wiGraphicsDevice_DX11.cpp b/WickedEngine/wiGraphicsDevice_DX11.cpp index 65341602c..073113522 100644 --- a/WickedEngine/wiGraphicsDevice_DX11.cpp +++ b/WickedEngine/wiGraphicsDevice_DX11.cpp @@ -1394,7 +1394,7 @@ GraphicsDevice_DX11::GraphicsDevice_DX11(wiWindowRegistration::window_type windo } UINT createDeviceFlags = 0; - createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG; + //createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG; D3D_DRIVER_TYPE driverTypes[] = { diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index d81410e46..70d51a8ef 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -7,7 +7,7 @@ namespace wiVersion // minor features, major updates const int minor = 11; // minor bug fixes, alterations, refactors, updates - const int revision = 6; + const int revision = 7; long GetVersion()