glTF importer: simplify/cleanup image import

This commit is contained in:
Julien Duroure 2020-01-29 21:52:27 +01:00
parent 39e2149b6c
commit e88c7ee2a7
2 changed files with 36 additions and 64 deletions

View File

@ -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": (1, 2, 15),
"version": (1, 2, 16),
'blender': (2, 81, 6),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',

View File

@ -15,8 +15,8 @@
import bpy
import os
import tempfile
from os.path import dirname, join, isfile, basename
from urllib.parse import unquote
from os.path import dirname, join, isfile, basename, normpath
import urllib.parse
from ...io.imp.gltf2_io_binary import BinaryData
@ -27,31 +27,6 @@ class BlenderImage():
def __new__(cls, *args, **kwargs):
raise RuntimeError("%s should not be instantiated" % cls)
@staticmethod
def get_image_path(gltf, img_idx):
"""Return image path."""
pyimage = gltf.data.images[img_idx]
image_name = "Image_" + str(img_idx)
if pyimage.uri:
sep = ';base64,'
if pyimage.uri[:5] == 'data:':
idx = pyimage.uri.find(sep)
if idx != -1:
return False, None, None
if isfile(join(dirname(gltf.filename), unquote(pyimage.uri))):
return True, join(dirname(gltf.filename), unquote(pyimage.uri)), basename(join(dirname(gltf.filename), unquote(pyimage.uri)))
else:
gltf.log.error("Missing file (index " + str(img_idx) + "): " + pyimage.uri)
return False, None, None
if pyimage.buffer_view is None:
return False, None, None
return False, None, None
@staticmethod
def create(gltf, img_idx):
"""Image creation."""
@ -61,45 +36,42 @@ class BlenderImage():
# Image is already used somewhere
return
if gltf.import_settings['import_pack_images'] is False:
tmp_file = None
try:
if img.uri is not None and not img.uri.startswith('data:'):
# Image stored in a file
img_from_file = True
path = join(dirname(gltf.filename), _uri_to_path(img.uri))
img_name = basename(path)
if not isfile(path):
gltf.log.error("Missing file (index " + str(img_idx) + "): " + img.uri)
return
else:
# Image stored as data => create a tempfile, pack, and delete file
img_from_file = False
img_data, img_name = BinaryData.get_image_data(gltf, img_idx)
if img_data is None:
return
tmp_file = tempfile.NamedTemporaryFile(prefix='gltfimg', delete=False)
tmp_file.write(img_data)
tmp_file.close()
path = tmp_file.name
# Images are not packed (if image is a real file)
real, path, img_name = BlenderImage.get_image_path(gltf, img_idx)
if real is True:
# Check if image is already loaded
for img_ in bpy.data.images:
if img_.filepath == path:
# Already loaded, not needed to reload it
img.blender_image_name = img_.name
return
blender_image = bpy.data.images.load(path)
num_images = len(bpy.data.images)
blender_image = bpy.data.images.load(path, check_existing=img_from_file)
if len(bpy.data.images) != num_images: # If created a new image
blender_image.name = img_name
img.blender_image_name = blender_image.name
return
if gltf.import_settings['import_pack_images'] or not img_from_file:
blender_image.pack()
# Check if the file is already loaded (packed file)
file_creation_needed = True
for img_ in bpy.data.images:
if hasattr(img_, "gltf_index") and img_['gltf_index'] == img_idx:
file_creation_needed = False
img.blender_image_name = img_.name
break
img.blender_image_name = blender_image.name
if file_creation_needed is True:
# Create a temp image, pack, and delete image
tmp_image = tempfile.NamedTemporaryFile(delete=False)
img_data, img_name = BinaryData.get_image_data(gltf, img_idx)
if img_data is not None:
tmp_image.write(img_data)
tmp_image.close()
finally:
if tmp_file is not None:
tmp_file.close()
os.remove(tmp_file.name)
blender_image = bpy.data.images.load(tmp_image.name)
blender_image.pack()
blender_image.name = img_name
img.blender_image_name = blender_image.name
blender_image['gltf_index'] = img_idx
os.remove(tmp_image.name)
def _uri_to_path(uri):
uri = urllib.parse.unquote(uri)
return normpath(uri)