From 63fb40936f5494e5ac747058ef99995bfd09209e Mon Sep 17 00:00:00 2001 From: Lubos Lenco Date: Sat, 5 Aug 2017 11:55:51 +0200 Subject: [PATCH] Minor voxel fix --- Assets/brdf.png | Bin 4680 -> 14705 bytes Assets/brdf_orig.png | Bin 0 -> 4680 bytes .../deferred_indirect.frag.glsl | 1 + blender/arm/material/make_voxel.py | 1 + 4 files changed, 2 insertions(+) create mode 100644 Assets/brdf_orig.png diff --git a/Assets/brdf.png b/Assets/brdf.png index cb7625494d208ff331984dbfc60ee7ed38cd2080..0c418b6d60bf9a4b95b186a7e2a73ea3803f5d4c 100755 GIT binary patch literal 14705 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 KMNUMnLSTY?b>t-g diff --git a/Assets/brdf_orig.png b/Assets/brdf_orig.png new file mode 100644 index 0000000000000000000000000000000000000000..cb7625494d208ff331984dbfc60ee7ed38cd2080 GIT binary patch literal 4680 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 KMNUMnLSTY?b>t-g literal 0 HcmV?d00001 diff --git a/Shaders/deferred_indirect/deferred_indirect.frag.glsl b/Shaders/deferred_indirect/deferred_indirect.frag.glsl index df566067..ea548461 100644 --- a/Shaders/deferred_indirect/deferred_indirect.frag.glsl +++ b/Shaders/deferred_indirect/deferred_indirect.frag.glsl @@ -80,6 +80,7 @@ void main() { float dotNV = max(dot(n, v), 0.0); vec3 f0 = surfaceF0(g1.rgb, metrough.x); vec2 envBRDF = texture(senvmapBrdf, vec2(metrough.y, 1.0 - dotNV)).xy; + // vec2 envBRDF = texture(senvmapBrdf, vec2(dotNV, metrough.y)).xy; #endif #ifdef _VoxelGI diff --git a/blender/arm/material/make_voxel.py b/blender/arm/material/make_voxel.py index 810fba0e..6b4ea5c8 100644 --- a/blender/arm/material/make_voxel.py +++ b/blender/arm/material/make_voxel.py @@ -63,6 +63,7 @@ def make(context_id): # frag.write('float opacity;') # frag.write_pre = True frag.write('mat3 TBN;') # TODO: discard, parse basecolor only + frag.write('vec3 n;') frag.write_pre = False frag.write('float dotNV = 0.0;') frag.write('float dotNL = max(dot(wnormal, l), 0.0);')