From 425a3f6a705beab849cab36d2ca2ae43726d700f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 Jan 2021 12:33:47 +1100 Subject: Cleanup: strip trailing space --- io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py | 4 ++-- .../blender/imp/gltf2_io_draco_compression_extension.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'io_scene_gltf2/blender') diff --git a/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py b/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py index d2a2cf3a..bd4f6a96 100755 --- a/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py +++ b/io_scene_gltf2/blender/exp/gltf2_blender_gltf2_exporter.py @@ -45,7 +45,7 @@ class GlTF2Exporter: generator='Khronos glTF Blender I/O v' + get_version_string(), min_version=None, version='2.0') - + export_user_extensions('gather_asset_hook', export_settings, asset) self.__gltf = gltf2_io.Gltf( @@ -106,7 +106,7 @@ class GlTF2Exporter: gltf2_io.MaterialNormalTextureInfoClass, gltf2_io.MaterialOcclusionTextureInfoClass ] - + self.__traverse(asset) @property diff --git a/io_scene_gltf2/blender/imp/gltf2_io_draco_compression_extension.py b/io_scene_gltf2/blender/imp/gltf2_io_draco_compression_extension.py index 5a93673f..42c1af6b 100644 --- a/io_scene_gltf2/blender/imp/gltf2_io_draco_compression_extension.py +++ b/io_scene_gltf2/blender/imp/gltf2_io_draco_compression_extension.py @@ -64,7 +64,7 @@ def decode_primitive(gltf, prim): dll.decoderCopyIndices.restype = None dll.decoderCopyIndices.argtypes = [c_void_p, c_void_p] - + decoder = dll.decoderCreate() extension = prim.extensions['KHR_draco_mesh_compression'] @@ -82,7 +82,7 @@ def decode_primitive(gltf, prim): for existing_buffer_idx in gltf.buffers: if base_buffer_idx <= existing_buffer_idx: base_buffer_idx = existing_buffer_idx + 1 - + # Read indices. index_accessor = gltf.data.accessors[prim.indices] if dll.decoderGetIndexCount(decoder) != index_accessor.count: @@ -91,7 +91,7 @@ def decode_primitive(gltf, prim): if not dll.decoderReadIndices(decoder, index_accessor.component_type): print_console('ERROR', 'Draco Decoder: Unable to decode indices. Skipping primitive {}.'.format(name)) return - + indices_byte_length = dll.decoderGetIndicesByteLength(decoder) decoded_data = bytes(indices_byte_length) dll.decoderCopyIndices(decoder, decoded_data) @@ -107,14 +107,14 @@ def decode_primitive(gltf, prim): # Update accessor to point to the new buffer view. index_accessor.buffer_view = len(gltf.data.buffer_views) - 1 - + # Read each attribute. for attr_idx, attr in enumerate(extension['attributes']): dracoId = extension['attributes'][attr] if attr not in prim.attributes: print_console('ERROR', 'Draco Decoder: Draco attribute {} not in primitive attributes. Skipping primitive {}.'.format(attr, name)) return - + accessor = gltf.data.accessors[prim.attributes[attr]] if dll.decoderGetVertexCount(decoder) != accessor.count: print_console('WARNING', 'Draco Decoder: Vertex count of accessor and decoded vertex count does not match for attribute {}. Updating accessor.'.format(attr, name)) @@ -122,7 +122,7 @@ def decode_primitive(gltf, prim): if not dll.decoderReadAttribute(decoder, dracoId, accessor.component_type, accessor.type.encode()): print_console('ERROR', 'Draco Decoder: Could not decode attribute {}. Skipping primitive {}.'.format(attr, name)) return - + byte_length = dll.decoderGetAttributeByteLength(decoder, dracoId) decoded_data = bytes(byte_length) dll.decoderCopyAttribute(decoder, dracoId, decoded_data) @@ -130,7 +130,7 @@ def decode_primitive(gltf, prim): # Generate a new buffer holding the decoded vertex data. buffer_idx = base_buffer_idx + 1 + attr_idx gltf.buffers[buffer_idx] = decoded_data - + # Create a buffer view referencing the new buffer. gltf.data.buffer_views.append(BufferView.from_dict({ 'buffer': buffer_idx, -- cgit v1.2.3