[Bf-extensions-cvs] [98672709] master: glTF exporter: always write texture samplers

[Julien Duroure]

Commit: 98672709fc4d73f353f94659f29bedb41cd251a1
Author: Julien Duroure
Date:   Sat Sep 5 15:23:32 2020 +0200
Branches: master
https://developer.blender.org/rBA98672709fc4d73f353f94659f29bedb41cd251a1

glTF exporter: always write texture samplers

===================================================================

M	io_scene_gltf2/__init__.py
M	io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py

===================================================================

diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 60a9a52c..9d4be397 100755
--- a/io_scene_gltf2/__init__.py
+++ b/io_scene_gltf2/__init__.py
@@ -15,7 +15,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": (1, 4, 10),
+    "version": (1, 4, 11),
     'blender': (2, 90, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py
index a7fd2def..ecf3e273 100755
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py
+++ b/io_scene_gltf2/blender/exp/gltf2_blender_gather_sampler.py
@@ -16,13 +16,11 @@ import bpy
 from io_scene_gltf2.io.com import gltf2_io
 from io_scene_gltf2.blender.exp.gltf2_blender_gather_cache import cached
 from io_scene_gltf2.io.exp.gltf2_io_user_extensions import export_user_extensions
+from io_scene_gltf2.io.com.gltf2_io_constants import TextureFilter, TextureWrap
 
 
 @cached
 def gather_sampler(blender_shader_node: bpy.types.Node, export_settings):
-    if not __filter_sampler(blender_shader_node, export_settings):
-        return None
-
     sampler = gltf2_io.Sampler(
         extensions=__gather_extensions(blender_shader_node, export_settings),
         extras=__gather_extras(blender_shader_node, export_settings),
@@ -35,13 +33,30 @@ def gather_sampler(blender_shader_node: bpy.types.Node, export_settings):
 
     export_user_extensions('gather_sampler_hook', export_settings, sampler, blender_shader_node)
 
+    if not sampler.extensions and not sampler.extras and not sampler.name:
+        return __sampler_by_value(
+            sampler.mag_filter,
+            sampler.min_filter,
+            sampler.wrap_s,
+            sampler.wrap_t,
+            export_settings,
+        )
+
     return sampler
 
 
-def __filter_sampler(blender_shader_node, export_settings):
-    if not blender_shader_node.interpolation == 'Closest' and not blender_shader_node.extension == 'EXTEND':
-        return False
-    return True
+ at cached
+def __sampler_by_value(mag_filter, min_filter, wrap_s, wrap_t, export_settings):
+    # @cached function to dedupe samplers with the same settings.
+    return gltf2_io.Sampler(
+        extensions=None,
+        extras=None,
+        mag_filter=mag_filter,
+        min_filter=min_filter,
+        name=None,
+        wrap_s=wrap_s,
+        wrap_t=wrap_t,
+    )
 
 
 def __gather_extensions(blender_shader_node, export_settings):
@@ -54,14 +69,14 @@ def __gather_extras(blender_shader_node, export_settings):
 
 def __gather_mag_filter(blender_shader_node, export_settings):
     if blender_shader_node.interpolation == 'Closest':
-        return 9728  # NEAREST
-    return 9729  # LINEAR
+        return TextureFilter.Nearest
+    return TextureFilter.Linear
 
 
 def __gather_min_filter(blender_shader_node, export_settings):
     if blender_shader_node.interpolation == 'Closest':
-        return 9984  # NEAREST_MIPMAP_NEAREST
-    return 9986  # NEAREST_MIPMAP_LINEAR
+        return TextureFilter.NearestMipmapNearest
+    return TextureFilter.NearestMipmapLinear
 
 
 def __gather_name(blender_shader_node, export_settings):
@@ -70,11 +85,11 @@ def __gather_name(blender_shader_node, export_settings):
 
 def __gather_wrap_s(blender_shader_node, export_settings):
     if blender_shader_node.extension == 'EXTEND':
-        return 33071
+        return TextureWrap.ClampToEdge
     return None
 
 
 def __gather_wrap_t(blender_shader_node, export_settings):
     if blender_shader_node.extension == 'EXTEND':
-        return 33071
+        return TextureWrap.ClampToEdge
     return None