[Bf-extensions-cvs] [d37be8f8] master: glTF exporter: refactor: unify texture info functions
Julien Duroure
noreply at git.blender.org
Sat Sep 5 16:09:19 CEST 2020
Commit: d37be8f892308aeaf96380b6d798e62cc7607792
Author: Julien Duroure
Date: Sat Sep 5 16:09:07 2020 +0200
Branches: master
https://developer.blender.org/rBAd37be8f892308aeaf96380b6d798e62cc7607792
glTF exporter: refactor: unify texture info functions
===================================================================
M io_scene_gltf2/__init__.py
D io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py
D io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_materials.py
M io_scene_gltf2/blender/exp/gltf2_blender_gather_texture_info.py
===================================================================
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index 94648876..d9173ea9 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, 21),
+ "version": (1, 4, 22),
'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_material_normal_texture_info_class.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py
deleted file mode 100755
index a36d923f..00000000
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_normal_texture_info_class.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2018-2019 The glTF-Blender-IO authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import bpy
-import typing
-from io_scene_gltf2.blender.exp.gltf2_blender_gather_cache import cached
-from io_scene_gltf2.io.com import gltf2_io
-from io_scene_gltf2.blender.exp import gltf2_blender_gather_texture
-from io_scene_gltf2.blender.exp import gltf2_blender_search_node_tree
-from io_scene_gltf2.blender.exp import gltf2_blender_get
-from io_scene_gltf2.io.com.gltf2_io_extensions import Extension
-from io_scene_gltf2.io.exp.gltf2_io_user_extensions import export_user_extensions
-
-
- at cached
-def gather_material_normal_texture_info_class(
- blender_shader_sockets: typing.Tuple[bpy.types.NodeSocket],
- export_settings):
- if not __filter_texture_info(blender_shader_sockets, export_settings):
- return None
-
- texture_info = gltf2_io.MaterialNormalTextureInfoClass(
- extensions=__gather_extensions(blender_shader_sockets, export_settings),
- extras=__gather_extras(blender_shader_sockets, export_settings),
- scale=__gather_scale(blender_shader_sockets, export_settings),
- index=__gather_index(blender_shader_sockets, export_settings),
- tex_coord=__gather_tex_coord(blender_shader_sockets, export_settings)
- )
-
- if texture_info.index is None:
- return None
-
- export_user_extensions('gather_material_normal_texture_info_class_hook',
- export_settings,
- texture_info,
- blender_shader_sockets)
-
- return texture_info
-
-
-def __filter_texture_info(blender_shader_sockets, export_settings):
- if not blender_shader_sockets:
- return False
- if not all([elem is not None for elem in blender_shader_sockets]):
- return False
- if any([__get_tex_from_socket(socket) is None for socket in blender_shader_sockets]):
- # sockets do not lead to a texture --> discard
- return False
- return True
-
-
-def __gather_extensions(blender_shader_sockets, export_settings):
- if not hasattr(blender_shader_sockets[0], 'links'):
- return None
-
- tex_nodes = [__get_tex_from_socket(socket).shader_node for socket in blender_shader_sockets]
- texture_node = tex_nodes[0] if (tex_nodes is not None and len(tex_nodes) > 0) else None
- if texture_node is None:
- return None
- texture_transform = gltf2_blender_get.get_texture_transform_from_texture_node(texture_node)
- if texture_transform is None:
- return None
-
- extension = Extension("KHR_texture_transform", texture_transform)
- return {"KHR_texture_transform": extension}
-
-
-def __gather_extras(blender_shader_sockets, export_settings):
- return None
-
-
-def __gather_scale(blender_shader_sockets, export_settings):
- result = gltf2_blender_search_node_tree.from_socket(
- blender_shader_sockets[0],
- gltf2_blender_search_node_tree.FilterByType(bpy.types.ShaderNodeNormalMap))
- if not result:
- return None
- strengthInput = result[0].shader_node.inputs['Strength']
- if not strengthInput.is_linked and strengthInput.default_value != 1:
- return strengthInput.default_value
- return None
-
-
-def __gather_index(blender_shader_sockets, export_settings):
- # We just put the actual shader into the 'index' member
- return gltf2_blender_gather_texture.gather_texture(blender_shader_sockets, export_settings)
-
-
-def __gather_tex_coord(blender_shader_sockets, export_settings):
- blender_shader_node = __get_tex_from_socket(blender_shader_sockets[0]).shader_node
- if len(blender_shader_node.inputs['Vector'].links) == 0:
- return 0
-
- input_node = blender_shader_node.inputs['Vector'].links[0].from_node
-
- if isinstance(input_node, bpy.types.ShaderNodeMapping):
-
- if len(input_node.inputs['Vector'].links) == 0:
- return 0
-
- input_node = input_node.inputs['Vector'].links[0].from_node
-
- if not isinstance(input_node, bpy.types.ShaderNodeUVMap):
- return 0
-
- if input_node.uv_map == '':
- return 0
-
- # Try to gather map index.
- for blender_mesh in bpy.data.meshes:
- texCoordIndex = blender_mesh.uv_layers.find(input_node.uv_map)
- if texCoordIndex >= 0:
- return texCoordIndex
-
- return 0
-
-
-def __get_tex_from_socket(socket):
- result = gltf2_blender_search_node_tree.from_socket(
- socket,
- gltf2_blender_search_node_tree.FilterByType(bpy.types.ShaderNodeTexImage))
- if not result:
- return None
- if result[0].shader_node.image is None:
- return None
- return result[0]
diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py b/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py
deleted file mode 100755
index cdbce3dd..00000000
--- a/io_scene_gltf2/blender/exp/gltf2_blender_gather_material_occlusion_texture_info_class.py
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 2018 The glTF-Blender-IO authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-import bpy
-import typing
-from io_scene_gltf2.blender.exp.gltf2_blender_gather_cache import cached
-from io_scene_gltf2.io.com import gltf2_io
-from io_scene_gltf2.blender.exp import gltf2_blender_gather_texture
-from io_scene_gltf2.blender.exp import gltf2_blender_search_node_tree
-from io_scene_gltf2.blender.exp import gltf2_blender_get
-from io_scene_gltf2.io.com.gltf2_io_extensions import Extension
-from io_scene_gltf2.io.exp.gltf2_io_user_extensions import export_user_extensions
-
-
- at cached
-def gather_material_occlusion_texture_info_class(
- blender_shader_sockets: typing.Tuple[bpy.types.NodeSocket],
- export_settings):
- if not __filter_texture_info(blender_shader_sockets, export_settings):
- return None
-
- texture_info = gltf2_io.MaterialOcclusionTextureInfoClass(
- extensions=__gather_extensions(blender_shader_sockets, export_settings),
- extras=__gather_extras(blender_shader_sockets, export_settings),
- strength=__gather_scale(blender_shader_sockets, export_settings),
- index=__gather_index(blender_shader_sockets, export_settings),
- tex_coord=__gather_tex_coord(blender_shader_sockets, export_settings)
- )
-
- if texture_info.index is None:
- return None
-
- export_user_extensions('gather_material_occlusion_texture_info_class_hook',
- export_settings,
- texture_info,
- blender_shader_sockets)
-
- return texture_info
-
-
-def __filter_texture_info(blender_shader_sockets, export_settings):
- if not blender_shader_sockets:
- return False
- if not all([elem is not None for elem in blender_shader_sockets]):
- return False
- if any([__get_tex_from_socket(socket) is None for socket in blender_shader_sockets]):
- # sockets do not lead to a texture --> discard
- return False
- return True
-
-
-def __gather_extensions(blender_shader_sockets, export_settings):
- if not hasattr(blender_shader_sockets[0], 'links'):
- return None
-
- tex_nodes = [__get_tex_from_socket(socket).shader_node for socket in blender_shader_sockets]
- texture_node = tex_nodes[0] if (tex_nodes is not None and len(tex_nodes) > 0) else None
- if texture_node is None:
- return None
- texture_transform = gltf2_blender_get.get_texture_transform_from_texture_node(texture_node)
- if texture_transform is None:
- return None
-
- extension = Extension("KHR_texture_transform", texture_transform)
- return {"KHR_texture_transform": extension}
-
-
-def __gather_extras(blender_shader_sockets, export_settings):
- return None
-
-
-def __gather_scale(blender_shader_sockets, export_settings):
- return None
-
-
-def __gather_index(blender_shader_sockets, export_settings):
- # We just put the actual shader into the 'index' member
- return gltf2_blender_gather_texture.gather_texture(blender_shader_sockets, export_settings)
-
-
-def __gather_tex_coord(blender_shader_sockets, export_settings):
- blender_shader_node = __get_tex_from_socket(blender_shader_sockets[0]).shader_node
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list