From b86334282e609448845a734516b56c1dd142a9c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D0=BB=D0=B0=20=D0=A9=D0=B5=D0=BB?= =?UTF-8?q?=D0=BA=D0=BE=D0=B2=20=28Danila=20Schelkov=29?= <54549682+Vorono4ka@users.noreply.github.com> Date: Sun, 29 Nov 2020 00:56:23 +0400 Subject: [PATCH] 0.7.8 --- README.md | 2 +- models_converter/formats/dae.py | 17 +++++++---------- models_converter/formats/scw/chunks/geom.py | 2 +- setup.py | 2 +- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index bb673ff..e845f93 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## `Python 3D Models Converter` -**Version**: 0.7.7 +**Version**: 0.7.8 ### Thanks a lot for motivating [AMIRMISTIK]! diff --git a/models_converter/formats/dae.py b/models_converter/formats/dae.py index 2cafad9..3167c23 100644 --- a/models_converter/formats/dae.py +++ b/models_converter/formats/dae.py @@ -766,7 +766,7 @@ def parse_geometry(self, geometry): vertex.append(vertex_temp[x: x + len(accessor)]) self.geometry_info['vertices'].append({'type': semantic, - 'index': 0, + 'index': len(self.geometry_info['vertices']), 'scale': scale, 'vertex': vertex}) for triangle in triangles: @@ -775,15 +775,12 @@ def parse_geometry(self, geometry): p = triangle.find('collada:p', self.namespaces) polygons_temp = [int(integer) for integer in p.text.split()] - polygons = [] - for x in range(0, len(polygons_temp), len(inputs) * 3): - temp_list = [] - for x1 in range(len(inputs)): - second_temp_list = [] - for x2 in range(3): - second_temp_list.append(polygons_temp[x + x1 + x2]) - temp_list.append(second_temp_list) - polygons.append(temp_list) + polygons = [ + [ + polygons_temp[polygon_index + point_index:polygon_index + point_index + 3] + for point_index in range(0, len(inputs) * 3, 3) + ] for polygon_index in range(0, len(polygons_temp), len(inputs) * 3) + ] self.geometry_info['materials'].append({'name': triangles_material, 'polygons': polygons}) self.parsed['geometries'].append(self.geometry_info) diff --git a/models_converter/formats/scw/chunks/geom.py b/models_converter/formats/scw/chunks/geom.py index d04b133..ffa2c5d 100644 --- a/models_converter/formats/scw/chunks/geom.py +++ b/models_converter/formats/scw/chunks/geom.py @@ -51,7 +51,7 @@ def parse_vertices(self): inputs.append({ 'type': vertex_type, - 'offset': x, + 'offset': vertex_index, 'name': f'{vertex_type.lower()}_0' }) diff --git a/setup.py b/setup.py index f7712b5..a59e158 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setuptools.setup( name='3d-converter', - version='0.7.7', + version='0.7.8', author='Vorono4ka', author_email='crowo4ka@gmail.com', description='Python 3D Models Converter',