[Bf-extensions-cvs] [e4165cee] master: glTF importer: Manage KHR_texture_transform extension
Julien Duroure
noreply at git.blender.org
Fri Apr 19 18:07:13 CEST 2019
Commit: e4165cee8b34b216db5ff41b20b9a05991a4b4b7
Author: Julien Duroure
Date: Fri Apr 19 18:06:25 2019 +0200
Branches: master
https://developer.blender.org/rBAe4165cee8b34b216db5ff41b20b9a05991a4b4b7
glTF importer: Manage KHR_texture_transform extension
===================================================================
M io_scene_gltf2/__init__.py
M io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_pbrSpecularGlossiness.py
M io_scene_gltf2/blender/imp/gltf2_blender_image.py
M io_scene_gltf2/blender/imp/gltf2_blender_map_emissive.py
M io_scene_gltf2/blender/imp/gltf2_blender_map_normal.py
M io_scene_gltf2/blender/imp/gltf2_blender_map_occlusion.py
M io_scene_gltf2/blender/imp/gltf2_blender_pbrMetallicRoughness.py
M io_scene_gltf2/blender/imp/gltf2_blender_texture.py
M io_scene_gltf2/io/imp/gltf2_io_gltf.py
===================================================================
diff --git a/io_scene_gltf2/__init__.py b/io_scene_gltf2/__init__.py
index ac84ee02..b53db24c 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, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
- "version": (0, 9, 0),
+ "version": (0, 9, 1),
'blender': (2, 80, 0),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_pbrSpecularGlossiness.py b/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_pbrSpecularGlossiness.py
index fec65ee4..0365fa18 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_pbrSpecularGlossiness.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_KHR_materials_pbrSpecularGlossiness.py
@@ -14,6 +14,7 @@
import bpy
from .gltf2_blender_texture import BlenderTextureInfo
+from ..com.gltf2_blender_conversion import texture_transform_gltf_to_blender
class BlenderKHR_materials_pbrSpecularGlossiness():
@@ -86,7 +87,7 @@ class BlenderKHR_materials_pbrSpecularGlossiness():
math_vc_B = node_tree.nodes.new('ShaderNodeMath')
math_vc_B.operation = 'MULTIPLY'
- BlenderTextureInfo.create(gltf, pbrSG['diffuseTexture']['index'])
+ BlenderTextureInfo.create(gltf, pbrSG['diffuseTexture'], dict_=True)
# create UV Map / Mapping / Texture nodes / separate & math and combine
text_node = node_tree.nodes.new('ShaderNodeTexImage')
@@ -122,6 +123,13 @@ class BlenderKHR_materials_pbrSpecularGlossiness():
mapping = node_tree.nodes.new('ShaderNodeMapping')
mapping.location = -1500, 500
+ mapping.vector_type = 'POINT'
+ tex_transform = text_node.image['tex_transform'][str(pbrSG['diffuseTexture']['index'])]
+ mapping.translation[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
+ mapping.translation[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
+ mapping.rotation[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
+ mapping.scale[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
+ mapping.scale[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
uvmap = node_tree.nodes.new('ShaderNodeUVMap')
uvmap.location = -2000, 500
@@ -162,7 +170,7 @@ class BlenderKHR_materials_pbrSpecularGlossiness():
elif pbrSG['diffuse_type'] == gltf.TEXTURE:
- BlenderTextureInfo.create(gltf, pbrSG['diffuseTexture']['index'])
+ BlenderTextureInfo.create(gltf, pbrSG['diffuseTexture'], dict_=True)
# TODO alpha ?
if vertex_color:
@@ -209,6 +217,13 @@ class BlenderKHR_materials_pbrSpecularGlossiness():
mapping.location = -2500, 500
else:
mapping.location = -1500, 500
+ mapping.vector_type = 'POINT'
+ tex_transform = text_node.image['tex_transform'][str(pbrSG['diffuseTexture']['index'])]
+ mapping.translation[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
+ mapping.translation[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
+ mapping.rotation[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
+ mapping.scale[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
+ mapping.scale[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
uvmap = node_tree.nodes.new('ShaderNodeUVMap')
if vertex_color:
@@ -260,7 +275,7 @@ class BlenderKHR_materials_pbrSpecularGlossiness():
node_tree.links.new(glossy.inputs[0], combine.outputs[0])
elif pbrSG['specgloss_type'] == gltf.TEXTURE:
- BlenderTextureInfo.create(gltf, pbrSG['specularGlossinessTexture']['index'])
+ BlenderTextureInfo.create(gltf, pbrSG['specularGlossinessTexture'], dict_=True)
spec_text = node_tree.nodes.new('ShaderNodeTexImage')
if gltf.data.images[
gltf.data.textures[pbrSG['specularGlossinessTexture']['index']].source
@@ -275,6 +290,13 @@ class BlenderKHR_materials_pbrSpecularGlossiness():
spec_mapping = node_tree.nodes.new('ShaderNodeMapping')
spec_mapping.location = -1000, 0
+ spec_mapping.vector_type = 'POINT'
+ tex_transform = spec_text.image['tex_transform'][str(pbrSG['specularGlossinessTexture']['index'])]
+ spec_mapping.translation[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
+ spec_mapping.translation[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
+ spec_mapping.rotation[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
+ spec_mapping.scale[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
+ spec_mapping.scale[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
spec_uvmap = node_tree.nodes.new('ShaderNodeUVMap')
spec_uvmap.location = -1500, 0
@@ -292,8 +314,7 @@ class BlenderKHR_materials_pbrSpecularGlossiness():
node_tree.links.new(spec_text.inputs[0], spec_mapping.outputs[0])
elif pbrSG['specgloss_type'] == gltf.TEXTURE_FACTOR:
-
- BlenderTextureInfo.create(gltf, pbrSG['specularGlossinessTexture']['index'])
+ BlenderTextureInfo.create(gltf, pbrSG['specularGlossinessTexture'], dict_=True)
spec_text = node_tree.nodes.new('ShaderNodeTexImage')
if gltf.data.images[
@@ -312,6 +333,14 @@ class BlenderKHR_materials_pbrSpecularGlossiness():
spec_mapping = node_tree.nodes.new('ShaderNodeMapping')
spec_mapping.location = -1000, 0
+ spec_mapping.vector_type = 'POINT'
+ tex_transform = spec_text.image['tex_transform'][str(pbrSG['specularGlossinessTexture']['index'])]
+ spec_mapping.translation[0] = texture_transform_gltf_to_blender(tex_transform)['offset'][0]
+ spec_mapping.translation[1] = texture_transform_gltf_to_blender(tex_transform)['offset'][1]
+ spec_mapping.rotation[2] = texture_transform_gltf_to_blender(tex_transform)['rotation']
+ spec_mapping.scale[0] = texture_transform_gltf_to_blender(tex_transform)['scale'][0]
+ spec_mapping.scale[1] = texture_transform_gltf_to_blender(tex_transform)['scale'][1]
+
spec_uvmap = node_tree.nodes.new('ShaderNodeUVMap')
spec_uvmap.location = -1500, 0
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_image.py b/io_scene_gltf2/blender/imp/gltf2_blender_image.py
index d51c463e..ed34123e 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_image.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_image.py
@@ -52,7 +52,7 @@ class BlenderImage():
return False, None, None
@staticmethod
- def create(gltf, img_idx):
+ def create(gltf, img_idx, tex_index, tex_transform):
"""Image creation."""
img = gltf.data.images[img_idx]
@@ -70,10 +70,13 @@ class BlenderImage():
if img_.filepath == path:
# Already loaded, not needed to reload it
img.blender_image_name = img_.name
+ img_['tex_transform'][str(tex_index)] = tex_transform
return
blender_image = bpy.data.images.load(path)
blender_image.name = img_name
+ blender_image['tex_transform'] = {}
+ blender_image['tex_transform'][str(tex_index)] = tex_transform
img.blender_image_name = blender_image.name
return
@@ -83,6 +86,7 @@ class BlenderImage():
if hasattr(img_, "gltf_index") and img_['gltf_index'] == img_idx:
file_creation_needed = False
img.blender_image_name = img_.name
+ img_['tex_transform'][tex_index] = tex_transform
break
if file_creation_needed is True:
@@ -96,6 +100,8 @@ class BlenderImage():
blender_image = bpy.data.images.load(tmp_image.name)
blender_image.pack()
blender_image.name = img_name
+ blender_image['tex_transform'] = {}
+ blender_image['tex_transform'][str(tex_index)] = tex_transform
img.blender_image_name = blender_image.name
blender_image['gltf_index'] = img_idx
os.remove(tmp_image.name)
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_map_emissive.py b/io_scene_gltf2/blender/imp/gltf2_blender_map_emissive.py
index 34238f08..6b7f362f 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_map_emissive.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_map_emissive.py
@@ -37,7 +37,7 @@ class BlenderEmissiveMap():
node_tree = material.node_tree
if factor_only is False:
- BlenderTextureInfo.create(gltf, pymaterial.emissive_texture.index)
+ BlenderTextureInfo.create(gltf, pymaterial.emissive_texture)
# check if there is some emissive_factor on material
if pymaterial.emissive_factor is None:
diff --git a/io_scene_gltf2/blender/imp/gltf2_blender_map_normal.py b/io_scene_gltf2/blender/imp/gltf2_blender_map_normal.py
index f28b6fc4..9cc23db8 100755
--- a/io_scene_gltf2/blender/imp/gltf2_blender_map_normal.py
+++ b/io_scene_gltf2/blender/imp/gltf2_blender_map_normal.py
@@ -35,7 +35,7 @@ class BlenderNormalMap():
material = bpy.data.materials[pymaterial.blender_material[vertex_color]]
node_tree = material.node_tree
- BlenderTextureInfo.create(gltf, pymaterial.normal_texture.index)
+ BlenderTextureInfo.create(gltf, pymaterial.normal_texture)
# retrieve principled node and output node
principled = None
diff --git a/io_scene_gltf2/blender/imp/gltf2_bl
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list