0.7.5

Weights Writing fix
danila-schelkov · Oct 21, 2020 · f7664e8 · f7664e8
1 parent f477269
commit f7664e8
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,12 +1,9 @@
-
+/3d_converter.egg-info/
+/.idea/
 /build/
 /dist/
 /test_upload.bat
 /upload.bat
-build.bat
-/dist/
-/build/
-/3d_converter.egg-info/
-/.idea/
-upload.bat
-test_upload.bat
+/build.bat
+*.pyc
+*.pyc
diff --git a/3d_converter.egg-info/PKG-INFO b/3d_converter.egg-info/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: 3d-converter
-Version: 0.7.3
+Version: 0.7.5
 Summary: Python 3D Models Converter
 Home-page: https://github.com/vorono4ka/3d-converter
 Author: Vorono4ka
 Author-email: [email protected]
 License: GPLv3
 Description: ## `Python 3D Models Converter`
 
-        **Version**: 0.7.3
+        **Version**: 0.7.4
 
         ### Thanks a lot for motivating [AMIRMISTIK]!
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ## `Python 3D Models Converter`
 
-**Version**: 0.7.3
+**Version**: 0.7.5
 
 ### Thanks a lot for motivating [AMIRMISTIK]!
 

diff --git a/models_converter/chunks/__init__.py b/models_converter/chunks/__init__.py
@@ -162,7 +162,8 @@ def parse_vertices(self):
             vertex = []
             vertex_type = self.readString()
             vertex_index = self.readUByte()
-            vertex_shorts = self.readUShort()
+            self.readUByte()  # sub_index
+            vertex_stride = self.readUByte()
             vertex_scale = self.readFloat()
             vertex_count = self.readUInt32()
 
@@ -171,7 +172,7 @@ def parse_vertices(self):
 
             for x1 in range(vertex_count):
                 coordinates_massive = []
-                for x2 in range(vertex_shorts):
+                for x2 in range(vertex_stride):
                     coordinate = self.readShort()
                     coordinates_massive.append(coordinate / 32512)
                 if vertex_type == 'TEXCOORD':
@@ -303,7 +304,8 @@ def encode_vertices(self, vertices: dict):
         for vertex in vertices:
             self.writeString(vertex['type'])
             self.writeUByte(vertex['index'])
-            self.writeUShort(len(vertex['vertex'][0]))
+            self.writeUByte(0)  # sub_index
+            self.writeUByte(len(vertex['vertex'][0]))
             self.writeFloat(vertex['scale'])
             self.writeUInt32(len(vertex['vertex']))
             for coordinates_massive in vertex['vertex']:
@@ -350,10 +352,11 @@ def encode_weight(self):
 
                     if weight > 1:
                         weight = 1
-                    elif weight < 1:
+                    elif weight < 0:
                         weight = 0
-
+                        
                     weight = int(weight * 65535)
+
                     temp_list.append([joint_id, weight])
                 past_index += vcount
                 while len(temp_list) < 4:
@@ -434,10 +437,10 @@ def parse(self, buffer: bytes):
 
         nodes_count = self.readUShort()
         for node in range(nodes_count):
-            node_data = {}
-
-            node_data['name'] = self.readString()
-            node_data['parent'] = self.readString()
+            node_data = {
+                'name': self.readString(),
+                'parent': self.readString()
+            }
 
             instances_count = self.readUShort()
             node_data['instances'] = [{}] * instances_count
@@ -465,13 +468,18 @@ def parse(self, buffer: bytes):
             frames_count = self.readUShort()
             node_data['frames'] = []
             if frames_count > 0:
+                rotation = {'x': 0, 'y': 0, 'z': 0, 'w': 0}
+                scale_x, scale_y, scale_z = 0, 0, 0
+                pos_x, pos_y, pos_z = 0, 0, 0
+
                 settings = list(bin(self.readUByte())[2:].zfill(8))
                 settings = [bool(int(value)) for value in settings]
                 node_data['frames_settings'] = settings
                 for frame in range(frames_count):
-                    frame_data = {}
+                    frame_data = {
+                        'frame_id': self.readUShort()
+                    }
 
-                    frame_data['frame_id'] = self.readUShort()
                     if settings[7] or frame == 0:  # Rotation
                         rotation = {
                             'x': self.readNShort(),

diff --git a/models_converter/chunks/__pycache__/__init__.cpython-39.pyc b/models_converter/chunks/__pycache__/__init__.cpython-39.pyc
diff --git a/models_converter/formats/__pycache__/__init__.cpython-39.pyc b/models_converter/formats/__pycache__/__init__.cpython-39.pyc
diff --git a/models_converter/formats/__pycache__/scw.cpython-39.pyc b/models_converter/formats/__pycache__/scw.cpython-39.pyc
diff --git a/models_converter/utils/__pycache__/reader.cpython-39.pyc b/models_converter/utils/__pycache__/reader.cpython-39.pyc
diff --git a/models_converter/utils/__pycache__/writer.cpython-39.pyc b/models_converter/utils/__pycache__/writer.cpython-39.pyc
diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setuptools.setup(
     name='3d-converter',
-    version='0.7.3',
+    version='0.7.5',
     author='Vorono4ka',
     author_email='[email protected]',
     description='Python 3D Models Converter',