[Bf-extensions-cvs] [47bef1a8] master: glTF importer: enhancement of buffer/glb management
Julien Duroure
noreply at git.blender.org
Thu Oct 31 20:59:33 CET 2019
Commit: 47bef1a8a535e26a7bc5afdbbfc555d92199fbda
Author: Julien Duroure
Date: Thu Oct 31 20:58:49 2019 +0100
Branches: master
https://developer.blender.org/rBA47bef1a8a535e26a7bc5afdbbfc555d92199fbda
glTF importer: enhancement of buffer/glb management
===================================================================
M io_scene_gltf2/__init__.py
M io_scene_gltf2/io/imp/gltf2_io_binary.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 7b2b102f..8b7439e0 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": (1, 0, 13),
+ "version": (1, 1, 0),
'blender': (2, 81, 6),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',
diff --git a/io_scene_gltf2/io/imp/gltf2_io_binary.py b/io_scene_gltf2/io/imp/gltf2_io_binary.py
index 4c5ea8f1..c72a893a 100755
--- a/io_scene_gltf2/io/imp/gltf2_io_binary.py
+++ b/io_scene_gltf2/io/imp/gltf2_io_binary.py
@@ -14,8 +14,6 @@
import struct
import base64
-from os.path import dirname, join, isfile, basename
-from urllib.parse import unquote
class BinaryData():
@@ -27,23 +25,31 @@ class BinaryData():
def get_binary_from_accessor(gltf, accessor_idx):
"""Get binary from accessor."""
accessor = gltf.data.accessors[accessor_idx]
- bufferView = gltf.data.buffer_views[accessor.buffer_view] # TODO initialize with 0 when not present!
- if bufferView.buffer in gltf.buffers.keys():
- buffer = gltf.buffers[bufferView.buffer]
- else:
- # load buffer
- gltf.load_buffer(bufferView.buffer)
- buffer = gltf.buffers[bufferView.buffer]
+ data = BinaryData.get_buffer_view(gltf, accessor.buffer_view) # TODO initialize with 0 when not present!
accessor_offset = accessor.byte_offset
- bufferview_offset = bufferView.byte_offset
-
if accessor_offset is None:
accessor_offset = 0
- if bufferview_offset is None:
- bufferview_offset = 0
- return buffer[accessor_offset + bufferview_offset:accessor_offset + bufferview_offset + bufferView.byte_length]
+ return data[accessor_offset:]
+
+ @staticmethod
+ def get_buffer_view(gltf, buffer_view_idx):
+ """Get binary data for buffer view."""
+ buffer_view = gltf.data.buffer_views[buffer_view_idx]
+
+ if buffer_view.buffer in gltf.buffers.keys():
+ buffer = gltf.buffers[buffer_view.buffer]
+ else:
+ # load buffer
+ gltf.load_buffer(buffer_view.buffer)
+ buffer = gltf.buffers[buffer_view.buffer]
+
+ byte_offset = buffer_view.byte_offset
+ if byte_offset is None:
+ byte_offset = 0
+
+ return buffer[byte_offset:byte_offset + buffer_view.byte_length]
@staticmethod
def get_data_from_accessor(gltf, accessor_idx, cache=False):
@@ -153,40 +159,17 @@ class BinaryData():
def get_image_data(gltf, img_idx):
"""Get data from image."""
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:
- data = pyimage.uri[idx + len(sep):]
- return base64.b64decode(data), image_name
-
- if isfile(join(dirname(gltf.filename), unquote(pyimage.uri))):
- with open(join(dirname(gltf.filename), unquote(pyimage.uri)), 'rb') as f_:
- return f_.read(), basename(join(dirname(gltf.filename), unquote(pyimage.uri)))
- else:
- gltf.log.error("Missing file (index " + str(img_idx) + "): " + pyimage.uri)
- return None, None
-
- if pyimage.buffer_view is None:
- return None, None
-
- bufferView = gltf.data.buffer_views[pyimage.buffer_view]
-
- if bufferView.buffer in gltf.buffers.keys():
- buffer = gltf.buffers[bufferView.buffer]
- else:
- # load buffer
- gltf.load_buffer(bufferView.buffer)
- buffer = gltf.buffers[bufferView.buffer]
+ assert(not (pyimage.uri is not None and pyimage.buffer_view is not None))
- bufferview_offset = bufferView.byte_offset
+ if pyimage.uri is not None:
+ data, file_name = gltf.load_uri(pyimage.uri)
+ return data, file_name or image_name
- if bufferview_offset is None:
- bufferview_offset = 0
+ elif pyimage.buffer_view is not None:
+ data = BinaryData.get_buffer_view(gltf, pyimage.buffer_view)
+ return data, image_name
- return buffer[bufferview_offset:bufferview_offset + bufferView.byte_length], image_name
+ return None, None
diff --git a/io_scene_gltf2/io/imp/gltf2_io_gltf.py b/io_scene_gltf2/io/imp/gltf2_io_gltf.py
index 34f205f9..1a30f258 100755
--- a/io_scene_gltf2/io/imp/gltf2_io_gltf.py
+++ b/io_scene_gltf2/io/imp/gltf2_io_gltf.py
@@ -18,7 +18,8 @@ import logging
import json
import struct
import base64
-from os.path import dirname, join, getsize, isfile
+from os.path import dirname, join, isfile, basename
+from urllib.parse import unquote
class glTFImporter():
@@ -28,6 +29,7 @@ class glTFImporter():
"""initialization."""
self.filename = filename
self.import_settings = import_settings
+ self.glb_buffer = None
self.buffers = {}
self.accessor_cache = {}
@@ -104,36 +106,34 @@ class glTFImporter():
return False, "This file is not a glTF/glb file"
if self.version != 2:
- return False, "glTF version doesn't match to 2"
+ return False, "GLB version %d unsupported" % self.version
- if self.file_size != getsize(self.filename):
- return False, "File size doesn't match"
+ if self.file_size != len(self.content):
+ return False, "Bad GLB: file size doesn't match"
offset = 12 # header size = 12
- # TODO check json type for chunk 0, and BIN type for next ones
-
- # json
- type, len_, str_json, offset = self.load_chunk(offset)
- if len_ != len(str_json):
- return False, "Length of json part doesn't match"
+ # JSON chunk is first
+ type_, len_, json_bytes, offset = self.load_chunk(offset)
+ if type_ != b"JSON":
+ return False, "Bad GLB: first chunk not JSON"
+ if len_ != len(json_bytes):
+ return False, "Bad GLB: length of json chunk doesn't match"
try:
- json_ = json.loads(str_json.decode('utf-8'), parse_constant=glTFImporter.bad_json_value)
+ json_str = str(json_bytes, encoding='utf-8')
+ json_ = json.loads(json_str, parse_constant=glTFImporter.bad_json_value)
self.data = gltf_from_dict(json_)
except ValueError as e:
return False, e.args[0]
- # binary data
- chunk_cpt = 0
- while offset < len(self.content):
- type, len_, data, offset = self.load_chunk(offset)
- if len_ != len(data):
- return False, "Length of bin buffer " + str(chunk_cpt) + " doesn't match"
-
- self.buffers[chunk_cpt] = data
- chunk_cpt += 1
+ # BIN chunk is second (if it exists)
+ if offset < len(self.content):
+ type_, len_, data, offset = self.load_chunk(offset)
+ if type_ == b"BIN\0":
+ if len_ != len(data):
+ return False, "Bad GLB: length of BIN chunk doesn't match"
+ self.glb_buffer = data
- self.content = None
return True, None
def load_chunk(self, offset):
@@ -153,25 +153,25 @@ class glTFImporter():
# Check if file is gltf or glb
with open(self.filename, 'rb') as f:
- self.content = f.read()
+ self.content = memoryview(f.read())
self.is_glb_format = self.content[:4] == b'glTF'
# glTF file
if not self.is_glb_format:
+ content = str(self.content, encoding='utf-8')
self.content = None
- with open(self.filename, 'r') as f:
- content = f.read()
- try:
- self.data = gltf_from_dict(json.loads(content, parse_constant=glTFImporter.bad_json_value))
- return True, None
- except ValueError as e:
- return False, e.args[0]
+ try:
+ self.data = gltf_from_dict(json.loads(content, parse_constant=glTFImporter.bad_json_value))
+ return True, None
+ except ValueError as e:
+ return False, e.args[0]
# glb file
else:
# Parsing glb file
success, txt = self.load_glb()
+ self.content = None
return success, txt
def is_node_joint(self, node_idx):
@@ -190,14 +190,31 @@ class glTFImporter():
buffer = self.data.buffers[buffer_idx]
if buffer.uri:
- sep = ';base64,'
- if buffer.uri[:5] == 'data:':
- idx = buffer.uri.find(sep)
- if idx != -1:
- data = buffer.uri[idx + len(sep):]
- self.buffers[buffer_idx] = base64.b64decode(data)
- return
-
- with open(join(dirname(self.filename), buffer.uri), 'rb') as f_:
- self.buffers[buffer_idx] = f_.read()
+ data, _file_name = self.load_uri(buffer.uri)
+ if data is not None:
+ self.buffers[buffer_idx] = data
+
+ else:
+ # GLB-stored buffer
+ if buffer_idx == 0 and self.glb_buffer is not None:
+ self.buffers[buffer_idx] = self.glb_buffer
+
+ def load_uri(self, uri):
+ """Loads a URI.
+ Returns the data and the filename of the resource, if there is one.
+ """
+ sep = ';base64,'
+ if uri.startswith('data:'):
+ idx = uri.find(sep)
+ if idx != -1:
+ data = uri[idx + len(sep):]
+ return memoryview(base64.b64decode(data)), None
+
+ path = join(dirname(self.filename), unquote(uri))
+ try:
+ with ope
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list