From fa5eedcd6b7f577db97ac9d60762843636d70e10 Mon Sep 17 00:00:00 2001 From: Brady Johnston Date: Mon, 20 Nov 2023 14:25:03 +0800 Subject: [PATCH 1/4] fix msgpack import --- molecularnodes/bcif.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/molecularnodes/bcif.py b/molecularnodes/bcif.py index 7e056900..21326872 100644 --- a/molecularnodes/bcif.py +++ b/molecularnodes/bcif.py @@ -1,5 +1,6 @@ import numpy as np import warnings +from typing import Any, Dict, List, Optional, TypedDict, Union def rotation_from_matrix(matrix): @@ -149,10 +150,7 @@ def atom_array_from_bcif(open_bcif): # - https://github.com/molstar/molstar/blob/master/src/mol-io/common/binary-cif/decoder.ts # - https://github.com/molstar/molstar/blob/master/src/mol-io/reader/cif/binary/parser.ts -from typing import Any, Dict, List, Optional, TypedDict, Union -import msgpack -import numpy as np class EncodingBase(TypedDict): @@ -513,6 +511,7 @@ def loads(data: Union[bytes, EncodedFile], lazy=True) -> CifFile: - True: individual columns are decoded only when accessed - False: decode all columns immediately """ + import msgpack file: EncodedFile = data if isinstance(data, dict) and "dataBlocks" in data else msgpack.loads(data) # type: ignore From 27d7069135e6457a1040ed5a38e3ab0212636ca8 Mon Sep 17 00:00:00 2001 From: Brady Johnston Date: Mon, 20 Nov 2023 16:39:26 +0800 Subject: [PATCH 2/4] add biotite dependency for CellPack --- molecularnodes/ui.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/molecularnodes/ui.py b/molecularnodes/ui.py index 60f51660..5ee4fffd 100644 --- a/molecularnodes/ui.py +++ b/molecularnodes/ui.py @@ -153,6 +153,10 @@ def MN_PT_panel_ui(layout_function, scene): box.label(text = f"Please install '{name}' in the addon preferences.") star.panel(box, scene) elif panel_selection == 6: + if not pkg.is_current('biotite'): + box.enabled = False + box.alert = True + box.label(text = "Please install biotite in the addon preferences.") pack.panel(box, scene) class MN_PT_panel(bpy.types.Panel): From a9a0622fd0cb447987409e660ff91a5a06b1a182 Mon Sep 17 00:00:00 2001 From: Brady Johnston Date: Mon, 20 Nov 2023 16:39:31 +0800 Subject: [PATCH 3/4] bump version --- molecularnodes/__init__.py | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/molecularnodes/__init__.py b/molecularnodes/__init__.py index 6b209445..72492c1d 100644 --- a/molecularnodes/__init__.py +++ b/molecularnodes/__init__.py @@ -16,7 +16,7 @@ "author" : "Brady Johnston", "description" : "Toolbox for molecular animations in Blender & Geometry Nodes.", "blender" : (3, 5, 0), - "version" : (2, 11, 0), + "version" : (2, 11, 2), "location" : "Scene Properties -> Molecular Nodes", "warning" : "", "doc_url" : "https://bradyajohnston.github.io/MolecularNodes/", diff --git a/pyproject.toml b/pyproject.toml index d1462db2..da819c7c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "molecularnodes" -version = "2.11.1" +version = "2.11.2" description = "Toolbox for molecular animations with Blender and Geometry Nodes." authors = ["Brady Johnston "] include = [ From 3b65f530afd118c1b8df21cfb9282dc674398c4d Mon Sep 17 00:00:00 2001 From: Brady Johnston Date: Mon, 20 Nov 2023 16:52:50 +0800 Subject: [PATCH 4/4] update tests --- .../8U8W/att_bond_type_values.txt | 6 +- .../False-8U8W-ball_and_stick/verts.txt | 732 +++++++++--------- .../False-8U8W-preset_1/verts.txt | 126 +-- 3 files changed, 432 insertions(+), 432 deletions(-) diff --git a/tests/snapshots/test_attributes/test_attribute/8U8W/att_bond_type_values.txt b/tests/snapshots/test_attributes/test_attribute/8U8W/att_bond_type_values.txt index af27f832..058b9f2a 100644 --- a/tests/snapshots/test_attributes/test_attribute/8U8W/att_bond_type_values.txt +++ b/tests/snapshots/test_attributes/test_attribute/8U8W/att_bond_type_values.txt @@ -1,3 +1,3 @@ -[1 1 1 1 1 1 2 1 1 1 2 1 1 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 1 1 - 1 2 1 1 2 1 1 2 1 1 1 2 1 1 1 1 1 1 1 2 1 1 2 2 1 2 1 1 1 1 1 1 1 2 1 1 1 - 2 1 2 1 1 1 1 1 1 1 2 1 1 1 1 1 2 1 1 1 1 1 1 1 1 2] \ No newline at end of file +[1 1 1 1 1 2 1 1 1 2 1 1 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 2 1 1 1 + 2 1 1 2 1 1 2 1 1 1 2 1 1 1 1 1 1 1 2 1 1 2 2 1 2 1 1 1 1 1 1 1 2 1 1 1 2 + 1 2 1 1 1 1 1 1 1 2 1 1 1 1 1 2 1 1 1 1 1 1 1 1 2 1] \ No newline at end of file diff --git a/tests/snapshots/test_load/test_style_1/False-8U8W-ball_and_stick/verts.txt b/tests/snapshots/test_load/test_style_1/False-8U8W-ball_and_stick/verts.txt index 28c14a55..edb643e4 100644 --- a/tests/snapshots/test_load/test_style_1/False-8U8W-ball_and_stick/verts.txt +++ b/tests/snapshots/test_load/test_style_1/False-8U8W-ball_and_stick/verts.txt @@ -1,500 +1,500 @@ -0.2,-0.158,0.063 -0.438,-0.044,0.291 --0.368,0.07,0.347 --0.271,-0.002,0.36 --0.383,-0.108,0.233 +-0.332,0.076,0.318 +-0.245,-0.018,0.363 +-0.402,-0.031,0.248 -0.172,-0.125,0.221 -0.152,-0.06,0.113 -0.253,0.09,0.126 --0.233,-0.121,0.144 +-0.253,-0.119,0.119 -0.278,-0.007,0.389 -0.32,0.006,0.361 -0.196,0.032,0.003 --0.353,-0.012,0.236 --0.433,-0.064,0.326 --0.36,-0.286,0.163 +-0.374,-0.015,0.213 +-0.437,-0.072,0.332 +-0.391,-0.294,0.194 -0.412,-0.025,0.338 --0.265,-0.1,0.288 --0.279,-0.085,0.227 --0.355,-0.063,0.213 --0.199,-0.103,0.068 --0.344,0.105,0.38 +-0.252,-0.089,0.288 +-0.253,-0.115,0.186 +-0.359,-0.068,0.218 +-0.176,-0.095,0.073 +-0.361,0.087,0.393 -0.349,-0.118,0.296 --0.361,-0.179,0.251 --0.208,-0.08,0.175 --0.443,0.1,0.058 --0.302,0.087,0.377 --0.299,-0.05,0.164 --0.305,-0.017,0.233 --0.409,-0.034,0.135 +-0.473,-0.128,0.237 +-0.19,-0.07,0.157 +-0.45,0.058,0.058 +-0.344,0.105,0.385 +-0.256,-0.11,0.196 +-0.297,0.011,0.217 +-0.42,-0.035,0.119 -0.167,-0.039,0.147 -0.244,0.023,0.052 --0.234,0.118,0.045 +-0.233,0.108,0.075 -0.278,-0.094,0.149 --0.322,0.164,0.179 --0.37,0.151,0.05 --0.456,0.11,0.272 +-0.343,0.157,0.18 +-0.362,0.137,0.026 +-0.442,0.116,0.276 -0.29,0.154,0.332 --0.291,-0.143,0.093 +-0.307,-0.14,0.083 -0.309,-0.192,0.326 --0.297,0.115,0.064 +-0.3,0.123,0.073 -0.309,0.041,0.011 --0.45,0.024,0.186 --0.323,0.092,0.114 --0.294,-0.126,0.359 +-0.456,0.019,0.196 +-0.322,0.1,0.098 +-0.276,-0.125,0.344 -0.357,0.14,0.027 -0.306,0.032,0.311 --0.414,-0.061,0.289 --0.404,0.039,0.165 +-0.394,-0.05,0.293 +-0.426,0.08,0.16 -0.328,0.09,-0.039 --0.437,-0.054,0.317 +-0.441,-0.072,0.339 -0.206,-0.149,0.114 --0.233,0.122,0.063 --0.327,0.094,0.376 --0.231,-0.133,0.073 --0.331,0.068,0.066 --0.203,0.173,0.203 --0.296,0.024,0.031 --0.341,0.193,0.157 --0.199,-0.099,0.223 --0.478,0.065,0.291 +-0.234,0.112,0.082 +-0.342,0.106,0.385 +-0.24,-0.145,0.083 +-0.341,0.033,0.11 +-0.211,0.158,0.22 +-0.307,0.068,-0.016 +-0.338,0.201,0.176 +-0.206,-0.097,0.196 +-0.479,0.047,0.28 -0.346,0.176,0.084 --0.218,-0.009,0.188 --0.264,0.002,0.358 --0.222,0.143,0.2 --0.327,-0.18,0.103 --0.251,0.142,0.044 --0.416,0.097,0.312 --0.373,-0.038,0.203 --0.283,0.126,0.3 +-0.215,-0.024,0.158 +-0.26,-0.001,0.374 +-0.213,0.136,0.198 +-0.309,-0.194,0.099 +-0.247,0.117,0.052 +-0.416,0.098,0.326 +-0.382,-0.031,0.181 +-0.302,0.113,0.296 -0.436,0.182,0.194 --0.429,-0.009,0.314 +-0.448,-0.027,0.332 -0.236,-0.026,0.343 --0.404,0.159,0.271 --0.25,-0.026,0.068 --0.419,0.086,0.275 +-0.427,0.165,0.258 +-0.236,-0.017,0.064 +-0.417,0.097,0.286 -0.419,-0.007,0.085 --0.192,-0.024,0.218 --0.427,0.219,0.182 --0.179,0.017,0.196 --0.433,-0.136,0.204 --0.295,-0.03,0.079 --0.268,-0.151,0.107 --0.333,-0.113,0.357 --0.462,0.131,0.246 --0.342,-0.023,0.182 --0.23,-0.019,0.336 --0.488,0.05,0.215 --0.242,-0.061,0.112 --0.316,-0.067,0.08 --0.317,0.102,0.103 --0.378,-0.03,0.194 +-0.189,-0.009,0.23 +-0.404,0.227,0.173 +-0.174,0.019,0.202 +-0.433,-0.127,0.202 +-0.339,-0.023,0.081 +-0.272,-0.154,0.125 +-0.283,-0.094,0.334 +-0.454,0.143,0.251 +-0.353,0.058,-0.052 +-0.247,-0.044,0.344 +-0.493,0.06,0.212 +-0.243,-0.081,0.134 +-0.332,-0.061,0.073 +-0.316,0.059,0.147 +-0.377,-0.036,0.2 -0.154,-0.217,0.173 --0.326,-0.262,0.172 --0.405,-0.144,0.239 +-0.311,-0.259,0.172 +-0.419,-0.156,0.254 -0.265,-0.032,0.056 -0.338,0.077,0.234 -0.161,-0.08,0.084 --0.345,0.007,0.048 --0.479,-0.125,0.225 --0.253,-0.121,0.121 +-0.32,0.079,0.007 +-0.397,-0.21,0.201 +-0.209,-0.094,0.175 -0.346,0.101,0.168 --0.304,0.187,0.087 --0.249,0.159,0.001 --0.354,-0.183,0.14 --0.349,-0.03,0.182 --0.179,-0.006,0.324 +-0.234,0.17,0.073 +-0.251,0.163,-0.012 +-0.387,-0.154,0.145 +-0.333,-0.015,0.168 +-0.188,-0.021,0.344 -0.339,-0.066,0.398 -0.308,-0.187,0.103 --0.456,0.064,0.288 --0.438,0.096,0.054 +-0.476,0.05,0.291 +-0.457,0.056,0.055 -0.235,-0.123,0.084 --0.493,0.035,0.155 --0.087,-0.009,0.108 --0.343,-0.151,0.11 --0.206,-0.148,0.071 +-0.511,0.038,0.158 +-0.128,-0.027,0.061 +-0.367,-0.144,0.148 +-0.192,-0.154,0.067 -0.205,0.035,0.171 --0.486,0.084,0.248 --0.44,-0.183,0.202 --0.345,-0.102,0.288 --0.361,-0.26,0.147 +-0.471,0.089,0.255 +-0.421,-0.181,0.205 +-0.341,-0.118,0.293 +-0.334,-0.253,0.152 -0.107,-0.047,0.033 --0.541,0.075,0.138 --0.357,-0.26,0.144 --0.265,-0.107,0.286 --0.342,0.008,0.046 --0.297,0.076,0.043 --0.149,-0.165,0.172 --0.334,0.039,-0.041 +-0.501,0.118,0.143 +-0.342,-0.257,0.15 +-0.244,-0.087,0.272 +-0.321,0.077,0.005 +-0.282,0.091,0.042 +-0.209,0.175,0.169 +-0.481,0.12,0.092 -0.218,0.158,0.204 --0.301,0.124,0.283 --0.314,-0.147,0.264 +-0.31,0.11,0.291 +-0.301,-0.175,0.302 -0.178,0.016,0.198 -0.255,-0.124,0.067 --0.326,0.037,0.151 --0.436,0.167,0.161 --0.312,0.012,0.333 +-0.328,0.012,0.155 +-0.428,0.18,0.185 +-0.345,0.022,0.305 -0.401,0.177,0.222 --0.322,0.01,0.372 +-0.327,0.018,0.401 -0.358,0.064,0.003 -0.226,0.145,0.127 --0.232,-0.217,0.278 +-0.224,-0.228,0.288 -0.409,0.151,0.046 --0.195,0.064,0.059 +-0.182,0.056,0.067 -0.348,-0.204,0.257 -0.444,-0.144,0.203 --0.301,-0.126,0.171 --0.184,0.126,0.184 --0.466,0.133,0.234 --0.175,-0.128,0.221 --0.19,-0.089,0.168 --0.2,-0.003,0.21 --0.234,-0.079,0.303 --0.393,0.165,0.218 --0.302,-0.074,0.057 --0.358,0.086,0.051 --0.093,0.047,0.108 --0.243,-0.193,0.133 --0.221,-0.105,0.037 +-0.321,-0.159,0.222 +-0.193,0.117,0.205 +-0.466,0.119,0.28 +-0.163,-0.12,0.224 +-0.172,-0.087,0.164 +-0.195,0.007,0.219 +-0.209,-0.091,0.289 +-0.396,0.147,0.193 +-0.326,-0.069,0.076 +-0.302,0.079,0.03 +-0.104,0.008,0.067 +-0.245,-0.214,0.168 +-0.228,-0.122,0.036 -0.282,-0.152,0.239 --0.231,-0.008,0.32 --0.46,-0.043,0.24 +-0.214,0.01,0.317 +-0.434,-0.014,0.214 -0.376,0.063,0.147 --0.463,0.029,0.094 +-0.468,0.049,0.087 -0.317,0.001,0.254 --0.445,0.025,0.322 --0.368,-0.044,0.198 +-0.452,0.048,0.319 +-0.357,-0.064,0.212 -0.39,-0.121,0.289 -0.356,0.154,0.094 -0.399,0.145,0.254 --0.433,-0.013,0.312 +-0.459,-0.029,0.33 -0.47,0.048,0.094 -0.277,0.018,0.339 --0.367,0.036,0.174 +-0.368,0.022,0.177 -0.444,0.157,0.075 --0.309,-0.201,0.159 --0.348,-0.033,0.329 --0.357,0.085,0.395 --0.241,-0.196,0.282 --0.273,0.012,0.243 +-0.285,-0.241,0.179 +-0.319,-0.02,0.325 +-0.368,0.086,0.388 +-0.241,-0.185,0.295 +-0.262,-0.008,0.263 -0.377,-0.232,0.135 --0.394,-0.178,0.179 --0.299,-0.022,0.339 --0.411,-0.169,0.168 --0.219,0.055,0.018 --0.336,-0.117,0.357 +-0.409,-0.176,0.163 +-0.27,-0.011,0.33 +-0.424,-0.171,0.178 +-0.198,0.026,0.001 +-0.313,-0.109,0.355 -0.246,0.06,0.082 -0.259,-0.078,0.171 --0.163,-0.048,0.097 --0.327,0.202,0.137 --0.171,-0.084,0.149 --0.212,0.093,0.121 --0.371,-0.186,0.115 +-0.168,-0.027,0.091 +-0.332,0.219,0.158 +-0.169,-0.098,0.164 +-0.225,0.048,0.119 +-0.373,-0.195,0.132 -0.454,0.22,0.151 -0.248,-0.125,0.191 -0.403,0.153,0.304 --0.221,-0.009,0.11 --0.442,0.072,0.117 +-0.236,-0.029,0.059 +-0.46,0.068,0.124 -0.182,-0.099,0.058 --0.222,0.034,0.33 --0.339,-0.075,0.399 --0.329,-0.16,0.329 --0.168,-0.148,0.054 --0.336,0.036,-0.032 --0.231,-0.117,0.139 --0.394,-0.207,0.325 --0.36,0.089,0.391 --0.31,-0.193,0.101 --0.238,0.08,0.364 +-0.212,0.037,0.337 +-0.351,-0.053,0.395 +-0.328,-0.106,0.358 +-0.178,-0.105,0.055 +-0.469,0.128,0.081 +-0.248,-0.119,0.121 +-0.432,-0.172,0.332 +-0.372,0.096,0.374 +-0.315,-0.211,0.106 +-0.187,0.042,0.324 -0.276,0.134,0.178 --0.142,-0.074,0.0 +-0.154,-0.086,0.012 -0.248,-0.109,0.214 -0.565,0.001,0.164 -0.227,-0.061,0.287 -0.215,0.009,0.082 --0.372,-0.005,0.35 --0.217,0.102,0.244 --0.219,0.018,0.093 --0.241,-0.181,0.3 --0.3,-0.213,0.276 --0.243,0.003,0.245 --0.256,-0.034,0.067 +-0.352,-0.018,0.353 +-0.208,0.123,0.24 +-0.21,0.037,0.022 +-0.231,-0.202,0.289 +-0.306,-0.227,0.284 +-0.261,-0.004,0.247 +-0.253,-0.025,0.077 -0.413,0.173,0.256 --0.193,0.129,0.185 --0.32,0.108,0.062 +-0.195,0.099,0.186 +-0.255,0.13,0.056 -0.228,0.074,0.189 --0.266,0.07,0.124 --0.455,0.139,0.249 --0.268,-0.126,0.085 --0.299,0.076,0.264 --0.207,-0.075,0.182 --0.259,-0.16,0.281 --0.24,0.021,0.052 --0.331,-0.145,0.333 --0.563,0.051,0.185 --0.319,-0.012,0.287 +-0.266,0.093,0.105 +-0.461,0.117,0.29 +-0.241,-0.107,0.089 +-0.309,0.095,0.255 +-0.174,-0.089,0.158 +-0.271,-0.154,0.295 +-0.241,0.069,0.063 +-0.331,-0.153,0.329 +-0.54,0.056,0.206 +-0.347,-0.013,0.258 -0.424,0.218,0.177 -0.329,0.172,0.311 --0.399,0.185,0.236 +-0.403,0.201,0.222 -0.401,0.156,0.213 -0.526,0.019,0.174 --0.319,-0.18,0.214 --0.402,-0.238,0.193 --0.462,0.108,0.085 --0.205,-0.094,0.053 +-0.319,-0.186,0.216 +-0.371,-0.224,0.172 +-0.462,0.131,0.084 +-0.254,-0.124,0.066 -0.45,0.11,0.222 --0.346,-0.256,0.145 +-0.331,-0.245,0.148 -0.322,0.09,0.017 --0.44,-0.142,0.309 +-0.453,-0.144,0.282 -0.408,0.114,0.059 -0.432,0.091,0.061 --0.371,0.0,0.351 --0.239,-0.009,0.018 +-0.355,0.004,0.355 +-0.241,0.014,0.021 -0.368,-0.12,0.255 --0.292,-0.01,0.41 +-0.235,-0.034,0.35 -0.479,0.05,0.286 -0.313,0.124,-0.005 --0.275,-0.091,0.209 --0.192,-0.188,0.183 --0.371,0.142,0.274 --0.403,0.063,0.234 --0.222,-0.126,0.23 --0.404,0.218,0.201 --0.338,-0.035,0.309 --0.464,0.117,0.297 --0.324,-0.03,0.075 +-0.279,-0.078,0.223 +-0.185,-0.192,0.198 +-0.411,0.125,0.245 +-0.42,0.035,0.236 +-0.216,-0.128,0.232 +-0.405,0.225,0.193 +-0.344,-0.007,0.325 +-0.453,0.104,0.305 +-0.341,-0.039,0.089 -0.384,-0.282,0.177 --0.499,0.087,0.179 --0.27,-0.163,0.079 --0.376,0.149,0.262 +-0.502,0.141,0.129 +-0.258,-0.171,0.061 +-0.394,0.129,0.255 -0.349,0.169,0.145 -0.445,-0.148,0.289 --0.263,-0.158,0.085 +-0.283,-0.151,0.101 -0.18,-0.116,0.167 -0.318,0.165,0.114 --0.211,0.01,0.227 --0.396,-0.283,0.203 --0.451,0.141,0.249 +-0.237,0.001,0.24 +-0.378,-0.285,0.151 +-0.466,0.119,0.29 -0.37,-0.237,0.107 --0.356,0.165,0.08 +-0.352,0.185,0.098 -0.4,0.112,0.105 --0.272,0.017,0.342 --0.284,0.063,0.002 --0.288,0.093,0.261 --0.27,-0.145,0.06 --0.1,0.048,0.121 --0.414,0.158,0.108 --0.339,-0.018,0.181 +-0.246,0.013,0.352 +-0.291,0.02,0.022 +-0.3,0.074,0.264 +-0.321,-0.171,0.081 +-0.105,0.004,0.065 +-0.406,0.169,0.11 +-0.347,-0.008,0.19 -0.397,-0.17,0.314 --0.497,0.116,0.166 +-0.498,0.097,0.166 -0.135,-0.014,0.104 -0.316,-0.215,0.158 --0.465,0.115,0.257 +-0.441,0.113,0.273 -0.357,-0.146,0.099 -0.153,-0.037,-0.023 --0.282,-0.024,0.162 --0.406,0.04,0.284 --0.278,0.079,0.321 --0.167,-0.031,0.212 --0.383,0.135,0.06 --0.224,-0.116,0.273 --0.488,0.074,0.266 --0.364,-0.288,0.167 --0.31,-0.145,0.257 --0.172,0.019,0.281 +-0.26,-0.089,0.191 +-0.399,0.045,0.313 +-0.276,0.082,0.297 +-0.192,-0.023,0.211 +-0.413,0.143,0.039 +-0.209,-0.135,0.256 +-0.47,0.11,0.249 +-0.39,-0.291,0.193 +-0.299,-0.181,0.303 +-0.179,0.002,0.329 -0.51,0.079,0.148 -0.239,-0.018,0.032 --0.173,-0.087,0.149 --0.32,0.127,0.338 +-0.161,-0.101,0.164 +-0.302,0.133,0.336 -0.37,0.085,0.381 -0.223,-0.006,0.189 --0.379,-0.011,0.13 +-0.402,0.035,0.096 -0.391,-0.267,0.174 --0.436,0.041,0.268 --0.33,0.003,0.17 --0.124,-0.033,0.008 --0.183,-0.035,0.118 +-0.461,0.056,0.229 +-0.201,0.178,0.164 +-0.145,-0.057,0.001 +-0.226,-0.06,0.131 -0.389,-0.128,0.329 -0.257,-0.12,0.069 -0.34,0.158,0.181 --0.5,0.144,0.131 +-0.461,0.152,0.16 -0.325,0.047,0.267 --0.298,0.039,0.009 --0.28,0.077,0.319 --0.168,-0.039,0.154 +-0.286,0.06,-0.002 +-0.34,0.081,0.232 +-0.168,-0.045,0.173 -0.471,-0.124,0.235 -0.382,0.091,0.301 --0.414,0.18,0.145 --0.335,0.075,0.084 +-0.434,0.183,0.189 +-0.336,0.072,0.067 -0.436,0.081,0.278 --0.319,0.186,0.216 --0.166,-0.062,0.226 --0.239,0.055,0.355 +-0.309,0.165,0.217 +-0.172,-0.04,0.215 +-0.24,0.079,0.364 -0.166,-0.029,0.086 --0.324,0.152,0.125 --0.213,0.023,0.09 --0.258,-0.032,0.065 --0.353,-0.018,0.351 --0.205,0.182,0.187 --0.322,-0.093,0.224 --0.264,0.009,0.147 +-0.316,0.158,0.11 +-0.212,0.033,0.03 +-0.233,0.022,0.057 +-0.374,-0.028,0.359 +-0.212,0.169,0.208 +-0.315,-0.109,0.224 +-0.277,0.007,0.153 -0.436,-0.08,0.251 --0.336,-0.124,0.296 --0.392,0.071,0.099 --0.235,0.029,0.13 --0.22,0.014,0.313 --0.463,0.066,0.284 --0.252,-0.208,0.235 +-0.328,-0.103,0.288 +-0.389,0.042,0.121 +-0.243,0.014,0.138 +-0.237,-0.012,0.312 +-0.477,0.052,0.286 +-0.302,-0.18,0.297 -0.168,-0.059,0.044 --0.283,0.137,-0.022 +-0.274,0.18,0.042 -0.46,0.114,0.257 --0.372,-0.112,0.198 --0.414,-0.052,0.248 --0.274,-0.099,0.269 --0.31,-0.109,0.083 --0.337,0.181,0.072 --0.488,0.161,0.172 --0.451,-0.02,0.287 --0.391,-0.103,0.236 +-0.366,-0.09,0.18 +-0.4,-0.09,0.233 +-0.296,-0.094,0.259 +-0.288,-0.092,0.095 +-0.322,0.167,0.065 +-0.52,0.161,0.166 +-0.412,-0.054,0.284 +-0.38,-0.106,0.239 -0.434,-0.028,0.24 --0.291,-0.131,0.326 --0.292,-0.073,0.069 --0.336,0.106,0.179 --0.37,0.08,0.381 +-0.286,-0.117,0.315 +-0.282,-0.064,0.059 +-0.352,0.088,0.162 +-0.371,0.092,0.38 -0.367,0.15,0.046 --0.31,0.072,0.358 --0.387,0.206,0.096 --0.337,-0.266,0.163 --0.334,-0.061,0.073 --0.365,0.061,0.131 +-0.287,0.066,0.35 +-0.398,0.204,0.08 +-0.314,-0.267,0.166 +-0.277,-0.036,0.043 +-0.37,0.064,0.123 -0.407,0.018,0.265 -0.367,-0.159,0.095 --0.429,0.06,0.236 --0.368,-0.073,0.292 --0.466,0.11,0.29 +-0.45,0.063,0.231 +-0.342,-0.117,0.285 +-0.454,0.099,0.3 -0.486,0.056,0.215 -0.187,-0.08,-0.0 --0.108,-0.003,0.115 --0.388,0.204,0.046 --0.403,0.182,0.243 --0.156,0.004,0.056 --0.307,-0.291,0.151 +-0.134,-0.024,0.082 +-0.365,0.205,0.039 +-0.408,0.201,0.219 +-0.188,-0.002,0.048 +-0.298,-0.263,0.145 -0.36,-0.171,0.094 --0.222,0.157,0.074 --0.322,-0.144,0.348 --0.258,0.041,0.278 +-0.211,0.144,0.089 +-0.332,-0.112,0.359 +-0.274,0.061,0.27 -0.304,0.059,0.356 --0.136,0.008,0.056 +-0.158,0.009,0.049 -0.209,0.111,0.241 --0.22,-0.254,0.216 --0.262,-0.108,0.332 --0.319,0.056,0.092 --0.17,-0.023,0.084 +-0.209,-0.226,0.164 +-0.253,-0.114,0.305 +-0.33,0.062,0.079 +-0.167,-0.022,0.079 -0.375,0.176,0.045 --0.363,0.034,0.153 --0.405,0.199,0.215 +-0.369,0.028,0.179 +-0.411,0.213,0.206 -0.308,-0.19,0.313 --0.499,0.14,0.133 --0.392,-0.275,0.111 --0.45,0.207,0.197 --0.254,0.051,0.016 --0.312,0.126,0.193 --0.23,-0.007,0.112 --0.533,0.069,0.155 +-0.478,0.153,0.122 +-0.42,-0.265,0.099 +-0.466,0.209,0.198 +-0.238,0.069,0.043 +-0.333,0.138,0.217 +-0.223,-0.016,0.109 +-0.513,0.08,0.153 -0.427,-0.096,0.318 --0.347,-0.053,0.392 --0.252,-0.136,0.181 --0.271,0.118,0.052 --0.242,-0.037,0.207 --0.497,0.165,0.125 --0.217,0.016,0.08 +-0.308,-0.115,0.366 +-0.273,-0.138,0.19 +-0.253,0.135,0.043 +-0.304,-0.037,0.203 +-0.469,0.16,0.119 +-0.215,0.023,0.086 -0.209,0.164,0.213 --0.459,0.213,0.141 --0.341,0.077,0.225 --0.161,-0.046,0.219 --0.175,-0.041,0.161 --0.329,0.18,0.334 --0.377,-0.158,0.098 --0.123,-0.034,0.005 --0.144,-0.055,0.005 --0.237,-0.007,0.232 --0.297,-0.274,0.15 --0.418,-0.171,0.174 --0.212,0.118,0.142 +-0.458,0.222,0.159 +-0.368,0.067,0.231 +-0.168,-0.032,0.217 +-0.173,-0.024,0.162 +-0.329,0.171,0.352 +-0.377,-0.137,0.076 +-0.145,-0.052,0.006 +-0.138,-0.038,-0.015 +-0.262,-0.001,0.243 +-0.299,-0.294,0.146 +-0.345,-0.164,0.182 +-0.198,0.137,0.151 -0.296,0.161,0.083 --0.266,0.099,0.266 --0.257,-0.287,0.214 --0.428,-0.006,0.096 +-0.249,0.089,0.271 +-0.261,-0.257,0.161 +-0.441,-0.019,0.096 -0.209,0.035,0.025 --0.39,0.006,0.33 --0.448,0.135,0.205 --0.458,-0.04,0.242 --0.248,-0.087,0.27 --0.42,0.106,0.289 +-0.378,0.008,0.344 +-0.448,0.114,0.218 +-0.447,-0.023,0.226 +-0.273,-0.098,0.281 +-0.37,0.108,0.323 -0.454,-0.058,0.256 -0.249,0.082,0.274 --0.266,-0.004,0.358 --0.313,-0.105,0.175 +-0.248,-0.018,0.364 +-0.326,-0.152,0.208 -0.386,0.15,0.14 --0.232,-0.099,0.098 --0.284,-0.053,0.179 --0.277,-0.081,0.312 --0.247,0.155,0.087 --0.424,-0.13,0.253 --0.334,-0.07,0.073 --0.298,-0.028,0.313 --0.366,0.103,0.311 +-0.268,-0.128,0.058 +-0.303,-0.072,0.171 +-0.314,-0.074,0.317 +-0.286,0.17,0.082 +-0.44,-0.133,0.246 +-0.277,-0.042,0.043 +-0.276,0.014,0.34 +-0.314,0.101,0.346 -0.33,-0.08,0.239 -0.103,-0.059,0.03 --0.197,-0.124,0.188 --0.367,-0.02,0.214 --0.299,-0.056,0.267 --0.246,-0.21,0.176 --0.351,-0.151,0.104 +-0.186,-0.09,0.135 +-0.375,-0.021,0.224 +-0.298,-0.049,0.276 +-0.231,-0.213,0.185 +-0.367,-0.162,0.095 -0.533,0.026,0.172 --0.232,0.042,0.341 +-0.237,0.065,0.357 -0.274,-0.212,0.255 --0.268,-0.1,0.061 +-0.27,-0.092,0.04 -0.283,-0.266,0.156 --0.358,-0.142,0.101 --0.457,0.114,0.085 --0.358,0.163,0.254 --0.137,-0.018,-0.02 --0.421,-0.227,0.128 --0.21,-0.151,0.112 --0.174,-0.072,0.018 --0.273,-0.211,0.24 --0.302,-0.15,0.21 --0.205,-0.091,0.059 --0.389,0.026,0.226 --0.244,-0.062,0.355 --0.287,0.156,0.338 --0.222,-0.205,0.115 --0.232,-0.185,0.238 --0.319,0.008,0.331 --0.347,0.071,0.34 --0.1,-0.0,0.035 +-0.371,-0.16,0.102 +-0.465,0.132,0.084 +-0.353,0.17,0.279 +-0.14,-0.064,-0.001 +-0.386,-0.282,0.175 +-0.198,-0.16,0.109 +-0.183,-0.095,0.018 +-0.279,-0.167,0.284 +-0.306,-0.122,0.175 +-0.218,-0.087,0.058 +-0.367,0.049,0.253 +-0.248,-0.061,0.366 +-0.323,0.097,0.37 +-0.199,-0.195,0.16 +-0.235,-0.164,0.21 +-0.34,0.023,0.319 +-0.332,0.072,0.352 +-0.102,-0.015,0.012 -0.357,0.02,0.087 --0.324,0.092,0.249 --0.407,0.021,0.264 --0.38,0.073,0.306 --0.432,-0.015,0.116 --0.377,0.161,0.295 +-0.322,0.098,0.231 +-0.399,0.026,0.253 +-0.365,0.071,0.315 +-0.454,-0.007,0.127 +-0.364,0.147,0.303 -0.361,0.092,0.035 -0.158,-0.189,0.16 --0.4,0.03,0.103 --0.397,-0.011,0.356 --0.266,0.181,0.062 --0.345,0.015,0.051 --0.254,-0.007,0.243 +-0.456,0.024,0.115 +-0.44,-0.017,0.369 +-0.291,0.169,0.046 +-0.317,0.084,0.001 +-0.268,0.014,0.249 -0.363,0.038,0.16 --0.291,-0.077,0.17 --0.207,0.015,-0.008 --0.364,0.008,0.16 --0.374,-0.182,0.109 --0.271,-0.087,0.164 +-0.32,-0.073,0.173 +-0.233,0.041,0.027 +-0.366,0.057,0.133 +-0.389,-0.192,0.112 +-0.257,-0.099,0.167 -0.304,0.119,0.238 --0.182,-0.038,0.284 --0.237,-0.123,0.178 --0.251,0.105,0.156 +-0.211,-0.036,0.305 +-0.26,-0.134,0.186 +-0.248,0.086,0.164 -0.182,0.016,0.187 diff --git a/tests/snapshots/test_load/test_style_1/False-8U8W-preset_1/verts.txt b/tests/snapshots/test_load/test_style_1/False-8U8W-preset_1/verts.txt index 924e96ab..d927115a 100644 --- a/tests/snapshots/test_load/test_style_1/False-8U8W-preset_1/verts.txt +++ b/tests/snapshots/test_load/test_style_1/False-8U8W-preset_1/verts.txt @@ -10,7 +10,7 @@ -0.348,0.084,0.358 -0.214,0.063,0.108 -0.314,-0.195,0.312 --0.472,0.147,0.077 +-0.345,-0.026,0.392 -0.306,0.137,0.227 -0.231,-0.019,0.364 -0.341,0.2,0.158 @@ -34,11 +34,11 @@ -0.443,0.052,0.24 -0.335,0.204,0.149 -0.225,0.079,0.182 --0.352,0.049,-0.054 --0.353,0.037,-0.04 +-0.478,0.122,0.093 +-0.335,0.042,-0.035 -0.265,0.013,0.246 -0.411,-0.132,0.245 --0.333,-0.013,0.171 +-0.363,0.032,-0.041 -0.27,-0.025,0.038 -0.094,0.004,0.03 -0.188,0.045,0.323 @@ -53,26 +53,25 @@ -0.375,-0.014,0.207 -0.4,0.093,0.331 -0.188,-0.03,0.216 --0.357,-0.016,0.183 +-0.332,-0.029,0.174 -0.337,-0.113,0.351 -0.314,0.174,0.21 -0.202,0.184,0.188 --0.328,-0.015,0.169 +-0.346,0.043,-0.037 -0.27,-0.022,0.168 -0.248,-0.173,0.283 -0.474,0.095,0.251 -0.292,0.157,0.284 -0.386,0.183,0.27 --0.159,0.038,0.061 -0.366,-0.007,0.215 -0.316,0.0,0.32 -0.391,0.023,0.114 -0.302,-0.049,0.237 --0.318,-0.029,0.402 +-0.166,0.049,0.064 -0.277,0.178,0.053 -0.337,0.005,0.036 --0.468,0.118,0.086 --0.331,-0.022,0.163 +-0.477,0.141,0.082 +-0.345,0.062,-0.047 -0.193,-0.01,0.211 -0.409,0.126,0.049 -0.123,0.015,0.082 @@ -84,15 +83,15 @@ -0.46,-0.137,0.203 -0.303,-0.035,0.206 -0.307,0.015,0.341 --0.347,-0.006,0.186 +-0.335,-0.02,0.149 -0.315,-0.191,0.194 --0.35,0.065,-0.054 +-0.358,0.029,-0.039 -0.384,0.117,0.32 -0.375,-0.015,0.202 -0.222,0.08,0.184 -0.475,0.061,0.218 -0.229,0.164,0.075 --0.182,0.048,0.067 +-0.44,-0.013,0.279 -0.197,0.016,0.219 -0.219,-0.005,0.04 -0.335,-0.008,0.266 @@ -120,30 +119,30 @@ -0.335,-0.138,0.103 -0.303,-0.057,0.169 -0.432,-0.178,0.335 --0.482,-0.001,0.242 +-0.339,-0.012,0.187 -0.478,-0.135,0.23 -0.442,-0.155,0.199 -0.245,-0.104,0.287 -0.303,-0.156,0.199 --0.468,0.139,0.082 +-0.33,-0.021,0.416 -0.294,0.088,0.146 --0.346,-0.016,0.18 +-0.352,0.041,-0.042 -0.376,-0.165,0.326 -0.448,-0.063,0.265 -0.211,0.168,0.213 -0.439,-0.025,0.249 -0.281,-0.161,0.064 --0.201,0.07,0.061 +-0.189,0.051,0.083 -0.443,0.072,0.083 --0.337,0.028,-0.028 +-0.475,0.128,0.103 -0.269,-0.218,0.239 -0.377,-0.159,0.324 -0.284,-0.169,0.099 -0.317,-0.006,0.111 -0.484,0.042,0.158 -0.401,-0.06,0.235 --0.469,0.115,0.082 --0.18,0.055,0.069 +-0.46,0.136,0.082 +-0.165,0.053,0.064 -0.23,0.151,0.123 -0.478,0.093,0.251 -0.328,0.172,0.148 @@ -157,7 +156,7 @@ -0.342,-0.183,0.267 -0.317,0.172,0.135 -0.185,0.013,0.292 --0.348,-0.021,0.39 +-0.339,-0.007,0.426 -0.326,0.163,0.137 -0.406,-0.03,0.25 -0.191,-0.007,0.212 @@ -168,7 +167,7 @@ -0.479,0.115,0.282 -0.395,-0.151,0.246 -0.212,0.075,0.218 --0.324,-0.019,0.159 +-0.35,0.066,-0.051 -0.464,0.176,0.175 -0.262,0.139,0.061 -0.3,0.045,0.006 @@ -185,13 +184,13 @@ -0.33,0.17,0.312 -0.232,-0.208,0.149 -0.399,0.03,0.105 --0.326,-0.02,0.168 +-0.343,0.064,-0.051 -0.275,0.028,0.259 -0.223,0.048,0.118 -0.244,-0.206,0.231 -0.43,0.182,0.214 -0.289,-0.033,0.157 --0.474,0.119,0.082 +-0.46,0.134,0.084 -0.292,0.151,0.282 -0.365,-0.179,0.253 -0.206,0.174,0.206 @@ -205,19 +204,19 @@ -0.476,0.065,0.219 -0.266,-0.014,0.215 -0.235,-0.197,0.241 --0.335,0.034,-0.028 +-0.473,0.129,0.099 -0.249,-0.216,0.231 -0.203,0.182,0.177 -0.496,0.036,0.159 -0.434,-0.13,0.257 -0.173,-0.084,0.117 -0.53,0.07,0.153 --0.202,0.069,0.058 +-0.184,0.047,0.082 -0.3,0.105,0.357 --0.363,0.027,-0.043 +-0.337,0.028,-0.028 -0.319,0.037,0.011 -0.334,-0.082,0.245 --0.45,-0.012,0.28 +-0.357,-0.016,0.183 -0.213,0.163,0.098 -0.34,0.023,0.103 -0.17,-0.052,0.021 @@ -226,9 +225,7 @@ -0.24,-0.04,0.078 -0.292,0.139,0.265 -0.446,-0.177,0.202 --0.161,0.036,0.055 -0.323,0.178,0.31 --0.184,0.047,0.082 -0.224,0.009,0.192 -0.32,0.201,0.215 -0.429,-0.176,0.334 @@ -236,20 +233,20 @@ -0.358,0.073,0.2 -0.431,0.149,0.178 -0.189,0.003,0.214 --0.472,0.12,0.097 --0.186,0.057,0.064 --0.332,-0.017,0.167 +-0.464,0.119,0.082 +-0.208,0.058,0.241 +-0.347,0.038,-0.039 -0.35,-0.124,0.295 -0.361,-0.293,0.139 -0.261,-0.072,0.305 -0.371,-0.26,0.141 --0.338,0.034,-0.022 +-0.469,0.12,0.087 -0.447,0.072,0.082 -0.35,0.002,0.315 -0.249,0.013,0.362 -0.261,-0.159,0.283 -0.404,0.058,0.171 --0.473,0.123,0.1 +-0.467,0.14,0.081 -0.45,0.011,0.335 -0.423,-0.128,0.255 -0.306,0.181,0.3 @@ -262,7 +259,7 @@ -0.258,-0.005,0.045 -0.201,0.18,0.195 -0.333,0.16,0.309 --0.362,0.027,-0.039 +-0.481,0.12,0.092 -0.33,0.044,0.1 -0.185,0.042,0.325 -0.25,-0.163,0.069 @@ -277,7 +274,7 @@ -0.246,0.064,0.077 -0.359,-0.008,0.256 -0.368,0.045,0.251 --0.337,-0.016,0.407 +-0.329,-0.025,0.415 -0.501,0.136,0.135 -0.461,0.054,0.223 -0.425,0.159,0.248 @@ -298,9 +295,9 @@ -0.215,-0.07,0.292 -0.325,-0.139,0.172 -0.464,-0.034,0.245 --0.327,-0.022,0.415 +-0.187,0.066,0.065 -0.291,0.102,0.15 --0.339,-0.01,0.174 +-0.349,0.066,-0.053 -0.419,-0.134,0.321 -0.399,-0.019,0.351 -0.509,0.109,0.14 @@ -312,14 +309,14 @@ -0.289,0.141,0.268 -0.458,0.013,0.134 -0.236,-0.195,0.251 --0.474,0.133,0.103 +-0.461,0.112,0.086 -0.431,0.089,0.063 -0.413,0.122,0.057 -0.273,0.077,0.332 -0.334,-0.278,0.17 -0.41,-0.209,0.211 -0.271,0.078,0.331 --0.324,-0.019,0.163 +-0.338,0.042,-0.038 -0.448,-0.033,0.304 -0.136,0.002,0.038 -0.433,0.099,0.27 @@ -330,7 +327,7 @@ -0.184,0.038,0.324 -0.449,0.001,0.315 -0.3,0.064,0.363 --0.355,0.053,-0.058 +-0.353,0.048,-0.04 -0.245,-0.176,0.282 -0.245,-0.088,0.328 -0.236,0.06,0.089 @@ -342,7 +339,7 @@ -0.247,-0.187,0.286 -0.364,-0.112,0.336 -0.142,-0.16,0.171 --0.323,-0.024,0.163 +-0.347,0.06,-0.047 -0.479,0.192,0.142 -0.282,-0.257,0.177 -0.125,0.032,0.054 @@ -354,32 +351,31 @@ -0.222,0.079,0.18 -0.318,0.099,0.367 -0.234,-0.244,0.158 --0.336,0.035,-0.038 --0.167,0.036,0.059 +-0.476,0.118,0.099 -0.355,0.002,0.36 -0.396,0.059,0.242 --0.356,0.051,-0.053 --0.33,-0.018,0.16 --0.349,-0.007,0.184 +-0.336,0.039,-0.038 +-0.344,0.06,-0.049 +-0.336,-0.007,0.163 -0.384,0.034,0.116 -0.381,0.072,0.321 -0.283,-0.124,0.318 -0.297,0.011,0.106 -0.293,0.142,0.256 --0.168,0.048,0.068 +-0.442,-0.007,0.286 -0.336,0.05,0.24 -0.419,0.078,0.287 -0.389,-0.167,0.256 --0.339,-0.012,0.187 +-0.349,-0.017,0.19 -0.274,-0.203,0.261 -0.233,0.04,0.055 -0.447,-0.036,0.303 -0.401,0.057,0.175 -0.261,0.094,0.273 -0.275,-0.13,0.099 --0.351,0.048,-0.051 +-0.363,0.027,-0.043 -0.448,-0.066,0.265 --0.339,-0.006,0.42 +-0.318,-0.033,0.406 -0.219,-0.067,0.29 -0.255,-0.011,0.035 -0.368,-0.01,0.208 @@ -414,24 +410,23 @@ -0.318,0.17,0.135 -0.276,0.076,0.297 -0.514,0.036,0.157 --0.163,0.052,0.064 --0.346,-0.025,0.18 +-0.327,-0.005,0.156 -0.318,0.18,0.307 -0.275,-0.071,0.075 -0.25,-0.092,0.271 -0.53,0.075,0.153 -0.304,0.008,0.354 --0.344,-0.022,0.181 +-0.34,-0.001,0.196 -0.159,-0.006,0.086 -0.438,-0.07,0.254 -0.335,0.217,0.191 -0.433,-0.058,0.246 -0.221,0.064,0.096 --0.329,-0.016,0.163 +-0.349,0.064,-0.047 -0.289,-0.165,0.229 -0.44,-0.05,0.283 -0.402,0.179,0.259 --0.46,0.131,0.082 +-0.345,-0.026,0.388 -0.438,0.079,0.067 -0.311,-0.244,0.142 -0.397,0.13,0.039 @@ -471,15 +466,15 @@ -0.529,0.056,0.16 -0.429,0.03,0.132 -0.17,-0.087,0.241 --0.472,0.133,0.101 +-0.457,0.112,0.079 -0.418,0.013,0.322 --0.478,0.123,0.09 +-0.469,0.125,0.082 -0.311,-0.29,0.149 -0.327,-0.008,0.263 -0.207,0.031,0.17 -0.277,-0.074,0.061 -0.366,0.046,0.252 --0.19,0.049,0.079 +-0.445,0.002,0.253 -0.296,0.141,0.233 -0.109,-0.033,0.021 -0.351,-0.086,0.276 @@ -488,13 +483,18 @@ -0.335,0.17,0.314 -0.298,-0.022,0.241 -0.233,0.076,0.049 --0.474,0.118,0.087 +-0.346,-0.025,0.397 -0.407,0.033,0.098 -0.336,-0.083,0.252 -0.282,-0.056,0.098 -0.358,0.071,0.324 --0.473,0.117,0.092 +-0.467,0.119,0.077 -0.375,0.181,0.069 -0.438,0.169,0.226 --0.458,0.136,0.079 +-0.347,-0.019,0.407 -0.336,0.097,0.369 +-0.328,-0.195,0.303 +-0.269,0.151,0.02 +-0.213,0.136,0.194 +-0.208,0.058,0.167 +-0.307,0.166,0.201