blender
/
blender-addons
17
34
Fork 93
Code Issues 527 Pull Requests 32 Projects 1 Releases Wiki Activity

glTF exporter: fix division by zero in some specular approximation

This commit is contained in:
Julien Duroure 2022-07-09 10:03:39 +02:00
parent 1cc09e24c5
commit c43a6d4f82
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_scene_gltf2/__init__.py
View File

@ -4,7 +4,7 @@
bl_info = {
'name': 'glTF 2.0 format',
'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
"version": (3, 3, 14),
"version": (3, 3, 15),
'blender': (3, 3, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',

22
io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_specular.py
View File

@ -114,10 +114,13 @@ def specular(mh, location_specular,
f0_from_ior = ((ior - 1)/(ior + 1))**2
lum_specular_color = luminance(specular_color_factor)
blender_specular = ((lum_specular_color - transmission_factor) / (1 - transmission_factor)) * (1 / 0.08) * f0_from_ior
blender_specular_tint = luminance((normalize(specular_color_factor) - 1) / (normalize(base_color) - 1))
if blender_specular_tint < 0 or blender_specular_tint > 1:
# TODOExt Warning clamping
blender_specular_tint = np.maximum(np.minimum(blender_specular_tint, 1), 0)
if not all([i == 0 for i in normalize(base_color) - 1]):
blender_specular_tint = luminance((normalize(specular_color_factor) - 1) / (normalize(base_color) - 1))
if blender_specular_tint < 0 or blender_specular_tint > 1:
# TODOExt Warning clamping
blender_specular_tint = np.maximum(np.minimum(blender_specular_tint, 1), 0)
else:
blender_specular_tint = 1.0
specular_socket.default_value = blender_specular
specular_tint_socket.default_value = blender_specular_tint
@ -211,10 +214,13 @@ def specular(mh, location_specular,
f0_from_ior = ((ior - 1)/(ior + 1))**2
lum_specular_color = stack3(luminance(buffers['speccolor']))
blender_specular = ((lum_specular_color - buffers['transmission']) / (1 - buffers['transmission'])) * (1 / 0.08) * f0_from_ior
blender_specular_tint = luminance((normalize(buffers['speccolor']) - 1) / (normalize(buffers['basecolor']) - 1))
np.nan_to_num(blender_specular_tint, copy=False)
blender_specular_tint = np.clip(blender_specular_tint, 0.0, 1.0)
blender_specular_tint = stack3(blender_specular_tint)
if not np.all(normalize(buffers['basecolor']) - 1 == 0.0):
blender_specular_tint = luminance((normalize(buffers['speccolor']) - 1) / (normalize(buffers['basecolor']) - 1))
np.nan_to_num(blender_specular_tint, copy=False)
blender_specular_tint = np.clip(blender_specular_tint, 0.0, 1.0)
blender_specular_tint = stack3(blender_specular_tint)
else:
blender_specular_tint = stack3(np.ones((width, height)))
blender_specular = np.dstack((blender_specular, np.ones((width, height)))) # Set alpha to 1
blender_specular_tint = np.dstack((blender_specular_tint, np.ones((width, height)))) # Set alpha to 1