blender
/
blender-addons
17
33
Fork 92
Code Issues 526 Pull Requests 32 Projects 1 Releases Wiki Activity

glTF exporter: allow draco compression when exporting without normals

This commit is contained in:
Julien Duroure 2019-11-09 10:48:44 +01:00
parent d6fb9fd957
commit 5367ebad48
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_scene_gltf2/__init__.py
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, 1, 0),
"version": (1, 1, 1),
'blender': (2, 81, 6),
'location': 'File > Import-Export',
'description': 'Import-Export as glTF 2.0',

42
io_scene_gltf2/io/exp/gltf2_io_draco_compression_extension.py
View File

@ -143,15 +143,15 @@ def __dispose_memory(node):
# Drop attributes.
attributes = primitive.attributes
attributes['POSITION'].buffer_view = None
attributes['NORMAL'].buffer_view = None
if 'NORMAL' in attributes:
attributes['NORMAL'].buffer_view = None
for attribute in [attributes[attr] for attr in attributes if attr.startswith('TEXCOORD_')]:
attribute.buffer_view = None
def __compress_node(node, dll, export_settings):
"""Compress a single node."""
if not (node.mesh is None):
print_console("INFO", "Compressing mesh " + node.name)
print_console('INFO', 'Draco exporter: Compressing mesh "%s".' % node.name)
for primitive in node.mesh.primitives:
__compress_primitive(primitive, dll, export_settings)
@ -166,6 +166,19 @@ def __traverse_node(node, f):
def __compress_primitive(primitive, dll, export_settings):
attributes = primitive.attributes
# Positions are the only attribute type required to be present.
if 'POSITION' not in attributes:
print_console('WARNING', 'Draco exporter: Primitive without positions encountered. Skipping.')
pass
# Both, normals and texture coordinates are optional attribute types.
enable_normals = 'NORMAL' in attributes
tex_coord_attrs = [attributes[attr] for attr in attributes if attr.startswith('TEXCOORD_')]
print_console('INFO', ('Draco exporter: Compressing primitive %s normal attribute and with %d ' +
'texture coordinate attributes, along with positions.') %
('with' if enable_normals else 'without', len(tex_coord_attrs)))
# Begin mesh.
compressor = dll.createCompressor()
@ -173,10 +186,11 @@ def __compress_primitive(primitive, dll, export_settings):
dll.addPositionAttribute(compressor, attributes['POSITION'].count, attributes['POSITION'].buffer_view.data)
# Process normal attributes.
dll.addNormalAttribute(compressor, attributes['NORMAL'].count, attributes['NORMAL'].buffer_view.data)
if enable_normals:
dll.addNormalAttribute(compressor, attributes['NORMAL'].count, attributes['NORMAL'].buffer_view.data)
# Process texture coordinate attributes.
for attribute in [attributes[attr] for attr in attributes if attr.startswith('TEXCOORD_')]:
for attribute in tex_coord_attrs:
dll.addTexCoordAttribute(compressor, attribute.count, attribute.buffer_view.data)
# Process faces.
@ -219,20 +233,22 @@ def __compress_primitive(primitive, dll, export_settings):
if primitive.extensions is None:
primitive.extensions = {}
tex_coord_ids = {}
for id in range(0, dll.getTexCoordAttributeIdCount(compressor)):
tex_coord_ids["TEXCOORD_" + str(id)] = dll.getTexCoordAttributeId(compressor, id)
# Register draco compression extension into primitive.
primitive.extensions["KHR_draco_mesh_compression"] = {
extension = {
'bufferView': BinaryData(compressed_data),
'attributes': {
'POSITION': dll.getPositionAttributeId(compressor),
'NORMAL': dll.getNormalAttributeId(compressor),
**tex_coord_ids,
'POSITION': dll.getPositionAttributeId(compressor)
}
}
if enable_normals:
extension['attributes']['NORMAL'] = dll.getNormalAttributeId(compressor)
for id in range(0, dll.getTexCoordAttributeIdCount(compressor)):
extension['attributes']['TEXCOORD_' + str(id)] = dll.getTexCoordAttributeId(compressor, id)
primitive.extensions['KHR_draco_mesh_compression'] = extension
# Set to triangle list mode.
primitive.mode = 4