From 1634967bf6aba60caa8b2e8824a5b309a4d32422 Mon Sep 17 00:00:00 2001 From: turanszkij Date: Sat, 3 Mar 2018 17:35:25 +0000 Subject: [PATCH] removed constant ambient factor from voxel GI --- WickedEngine/objectPS_voxelizer.hlsl | 4 ++-- WickedEngine/wiVersion.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WickedEngine/objectPS_voxelizer.hlsl b/WickedEngine/objectPS_voxelizer.hlsl index 6ce399672..7fb4e0594 100644 --- a/WickedEngine/objectPS_voxelizer.hlsl +++ b/WickedEngine/objectPS_voxelizer.hlsl @@ -123,9 +123,9 @@ void main(float4 pos : SV_POSITION, float3 N : NORMAL, float2 tex : TEXCOORD, fl diffuse += result.diffuse; } - color.rgb *= diffuse + GetAmbientColor(); // should ambient light bounce? + color.rgb *= diffuse; - color.rgb += color.rgb * GetEmissive(emissive); + color.rgb += baseColor.rgb * GetEmissive(emissive); uint color_encoded = EncodeColor(color); uint normal_encoded = EncodeNormal(N); diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index 0b3a1d969..3ce67ebe8 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 16; // minor bug fixes, alterations, refactors, updates - const int revision = 12; + const int revision = 13; long GetVersion()