diff --git a/CAD/png/888_1003.png b/CAD/png/888_1003.png index 77ece260..ae1791a2 100644 Binary files a/CAD/png/888_1003.png and b/CAD/png/888_1003.png differ diff --git a/CAD/png/888_1007.png b/CAD/png/888_1007.png index fdeb44c9..6cf84caf 100644 Binary files a/CAD/png/888_1007.png and b/CAD/png/888_1007.png differ diff --git a/CAD/png/888_1009.png b/CAD/png/888_1009.png index c02152ab..ee6dba84 100644 Binary files a/CAD/png/888_1009.png and b/CAD/png/888_1009.png differ diff --git a/CAD/png/position_888_1003.png b/CAD/png/position_888_1003.png index 6e275500..e5ffce7d 100644 Binary files a/CAD/png/position_888_1003.png and b/CAD/png/position_888_1003.png differ diff --git a/CAD/png/position_888_1009.png b/CAD/png/position_888_1009.png index 79d9c7fd..f23585cb 100644 Binary files a/CAD/png/position_888_1009.png and b/CAD/png/position_888_1009.png differ diff --git a/CAD/stl/888_1010.stl b/CAD/stl/888_1010.stl index 16846c36..88a6eb4a 100644 --- a/CAD/stl/888_1010.stl +++ b/CAD/stl/888_1010.stl @@ -20933,6 +20933,13 @@ solid model outer loop vertex 0.104523 0.994507 2.50434 vertex 0.104523 0.994507 3.32534 + vertex 0.104523 0.994507 3.66619 + endloop + endfacet + facet normal 0 0 0 + outer loop + vertex 0.104523 0.994507 2.50434 + vertex 0.104523 0.994507 3.66619 vertex 0.104523 0.994507 3.82533 endloop endfacet @@ -20957,13 +20964,6 @@ solid model vertex 0.309006 0.95105 2.50384 endloop endfacet - facet normal 0 0 0 - outer loop - vertex 0.104523 0.994507 3.32534 - vertex 0.104523 0.994507 3.66619 - vertex 0.104523 0.994507 3.82533 - endloop - endfacet facet normal 0 -1 0 outer loop vertex 0.104523 0.994507 3.32534 diff --git a/CAD/stl/888_1018.stl b/CAD/stl/888_1018.stl index cc19ca61..6383fb55 100644 --- a/CAD/stl/888_1018.stl +++ b/CAD/stl/888_1018.stl @@ -3975,13 +3975,6 @@ solid model vertex 15 -25.1901 -40.1 endloop endfacet - facet normal 0 0 0 - outer loop - vertex -25 -25.1901 -40.1 - vertex 82.0882 -25.1901 -40.1 - vertex 55 -25.1901 -40.1 - endloop - endfacet facet normal -1 0 0 outer loop vertex -25 -25.1901 0.7 @@ -7566,6 +7559,13 @@ solid model vertex -55 35 0.75 endloop endfacet + facet normal 0 0 0 + outer loop + vertex -55 25.1901 -40.1 + vertex -15 25.1901 -40.1 + vertex 25 25.1901 -40.1 + endloop + endfacet facet normal 0 0 0 outer loop vertex -55 25.1901 -40.1 @@ -11503,7 +11503,7 @@ solid model facet normal 0 0 0 outer loop vertex -65 -25.1901 -40.1 - vertex 82.0882 -25.1901 -40.1 + vertex 55 -25.1901 -40.1 vertex -25 -25.1901 -40.1 endloop endfacet @@ -14716,10 +14716,17 @@ solid model facet normal 0 0 0 outer loop vertex -82.0882 -25.1901 -40.1 - vertex 82.0882 -25.1901 -40.1 + vertex 55 -25.1901 -40.1 vertex -65 -25.1901 -40.1 endloop endfacet + facet normal 0 0 0 + outer loop + vertex -82.0882 -25.1901 -40.1 + vertex 82.0882 -25.1901 -40.1 + vertex 55 -25.1901 -40.1 + endloop + endfacet facet normal 0 0 1 outer loop vertex -82.0882 -25.1901 0.7 @@ -14748,18 +14755,11 @@ solid model vertex -81.7059 -23.3835 0.7 endloop endfacet - facet normal 0 0 0 - outer loop - vertex -82.0882 25.1901 -40.1 - vertex -15 25.1901 -40.1 - vertex 25 25.1901 -40.1 - endloop - endfacet facet normal 0 0 0 outer loop vertex -82.0882 25.1901 -40.1 vertex -55 25.1901 -40.1 - vertex -15 25.1901 -40.1 + vertex 25 25.1901 -40.1 endloop endfacet facet normal 0 0 0 diff --git a/CAD/stl/888_4009_4_blades.stl b/CAD/stl/888_4009_4_blades.stl index 50eb1364..bc520fc3 100644 --- a/CAD/stl/888_4009_4_blades.stl +++ b/CAD/stl/888_4009_4_blades.stl @@ -1371,13 +1371,6 @@ solid model vertex 0.506356 9.70114 -1 endloop endfacet - facet normal 0 0 1 - outer loop - vertex -10.2083 -14.7308 -1 - vertex -8.24931 -14.5409 -1 - vertex -8.9127 -14.6052 -1 - endloop - endfacet facet normal 0.350353 0.468174 0.811213 outer loop vertex -10.2695 -16.2059 9.95039 @@ -1417,6 +1410,13 @@ solid model outer loop vertex -11.2577 -14.8326 -1 vertex -8.24931 -14.5409 -1 + vertex -8.9127 -14.6052 -1 + endloop + endfacet + facet normal 0 0 1 + outer loop + vertex -11.2577 -14.8326 -1 + vertex -8.9127 -14.6052 -1 vertex -10.2083 -14.7308 -1 endloop endfacet @@ -1807,21 +1807,14 @@ solid model endfacet facet normal 0 0 -1 outer loop - vertex -13.7771 16.3333 -0.999999 - vertex -13.7498 16.2304 -0.999999 vertex -13.768 16.2988 -0.999999 - endloop - endfacet - facet normal 0 0 1 - outer loop - vertex -13.7782 16.337 -0.999999 vertex -13.6968 16.031 -0.999999 vertex -13.7218 16.125 -0.999999 endloop endfacet facet normal 0 0 1 outer loop - vertex -13.7782 16.337 -0.999999 + vertex -13.768 16.2988 -0.999999 vertex -13.7218 16.125 -0.999999 vertex -13.7498 16.2304 -0.999999 endloop @@ -1829,7 +1822,7 @@ solid model facet normal 0 0 1 outer loop vertex -13.7782 16.337 -0.999999 - vertex -13.7498 16.2304 -0.999999 + vertex -13.768 16.2988 -0.999999 vertex -13.7771 16.3333 -0.999999 endloop endfacet @@ -3352,10 +3345,17 @@ solid model vertex -13.6968 16.031 -0.999999 endloop endfacet - facet normal 0 0 -1 + facet normal 0 0 1 outer loop vertex -16.2127 25.4908 -0.999999 vertex -13.6968 16.031 -0.999999 + vertex -13.768 16.2988 -0.999999 + endloop + endfacet + facet normal 0 0 -1 + outer loop + vertex -16.2127 25.4908 -0.999999 + vertex -13.768 16.2988 -0.999999 vertex -13.7782 16.337 -0.999999 endloop endfacet @@ -24667,6 +24667,13 @@ solid model vertex 16.2127 -25.4908 -0.999999 endloop endfacet + facet normal 0.000155982 -0.00160793 -0.999999 + outer loop + vertex 10.2083 14.7308 -1 + vertex 11.2577 14.8326 -1 + vertex 25.4908 16.2127 -0.999999 + endloop + endfacet facet normal -3.20385e-08 3.30267e-07 -1 outer loop vertex 10.2083 14.7308 -1 @@ -25700,35 +25707,35 @@ solid model outer loop vertex 13.6968 -16.031 -0.999999 vertex 13.7218 -16.125 -0.999999 - vertex 13.7498 -16.2304 -0.999999 + vertex 13.7771 -16.3333 -0.999999 endloop endfacet - facet normal 0 0 1 + facet normal -0 -0 1 outer loop vertex 13.6968 -16.031 -0.999999 - vertex 13.7498 -16.2304 -0.999999 - vertex 13.768 -16.2988 -0.999999 + vertex 13.7771 -16.3333 -0.999999 + vertex 16.2127 -25.4908 -0.999999 endloop endfacet facet normal 0 0 -1 outer loop vertex 13.6968 -16.031 -0.999999 - vertex 13.768 -16.2988 -0.999999 - vertex 13.7771 -16.3333 -0.999999 + vertex 18.4218 -17.0443 -0.999999 + vertex 13.7218 -16.125 -0.999999 endloop endfacet - facet normal -0 -0 1 + facet normal 0 0 1 outer loop - vertex 13.6968 -16.031 -0.999999 - vertex 13.7771 -16.3333 -0.999999 - vertex 16.2127 -25.4908 -0.999999 + vertex 13.7218 -16.125 -0.999999 + vertex 13.7498 -16.2304 -0.999999 + vertex 13.768 -16.2988 -0.999999 endloop endfacet facet normal 0 0 -1 outer loop - vertex 13.6968 -16.031 -0.999999 - vertex 18.4218 -17.0443 -0.999999 vertex 13.7218 -16.125 -0.999999 + vertex 13.768 -16.2988 -0.999999 + vertex 13.7771 -16.3333 -0.999999 endloop endfacet facet normal 0 0 -1 @@ -43889,17 +43896,10 @@ solid model vertex 8.2845 19.0547 10.1372 endloop endfacet - facet normal 0 0 1 + facet normal 0.000215665 -0.00222478 0.999998 outer loop vertex 8.24931 14.5409 -1 vertex 10.2083 14.7308 -1 - vertex 11.2577 14.8326 -1 - endloop - endfacet - facet normal 0.00347993 -0.0358896 0.99935 - outer loop - vertex 8.24931 14.5409 -1 - vertex 11.2577 14.8326 -1 vertex 25.4908 16.2127 -0.999999 endloop endfacet diff --git a/CAD/stl/position_888_1012.stl b/CAD/stl/position_888_1012.stl index be6750e4..7cfeac2e 100644 --- a/CAD/stl/position_888_1012.stl +++ b/CAD/stl/position_888_1012.stl @@ -9778,7 +9778,7 @@ solid model vertex 177.2 -7.18528 258.65 endloop endfacet - facet normal 0 0 1 + facet normal -0 0 1 outer loop vertex 170.233 -4.30607 261.65 vertex 170.498 -4.12599 261.65 diff --git a/CAD/stl/position_888_1018.stl b/CAD/stl/position_888_1018.stl index 5af963a5..b7f020cb 100644 --- a/CAD/stl/position_888_1018.stl +++ b/CAD/stl/position_888_1018.stl @@ -6754,13 +6754,6 @@ solid model vertex 155 -23.9869 -6.3 endloop endfacet - facet normal 0 0 0 - outer loop - vertex 145 -25.1901 -47.1 - vertex 172.088 -25.1901 -47.1 - vertex 155 -25.1901 -47.1 - endloop - endfacet facet normal -1 0 0 outer loop vertex 145 -25.1901 -6.3 @@ -18290,6 +18283,13 @@ solid model vertex 42.5 23.9869 -17.5 endloop endfacet + facet normal 0 0 0 + outer loop + vertex 25 25.1901 -47.1 + vertex 155 25.1901 -47.1 + vertex 172.088 25.1901 -47.1 + endloop + endfacet facet normal -1 0 0 outer loop vertex 25 25.1901 -47.1 @@ -18360,6 +18360,13 @@ solid model vertex 25 25.2 -47.1 endloop endfacet + facet normal 0 0 0 + outer loop + vertex 25 25.1901 -47.1 + vertex 35 25.1901 -47.1 + vertex 155 25.1901 -47.1 + endloop + endfacet facet normal 0 0 -1 outer loop vertex 25 25.1901 -47.1 @@ -23092,6 +23099,13 @@ solid model vertex 35 25.1901 -6.3 endloop endfacet + facet normal 0 0 0 + outer loop + vertex 35 25.1901 -47.1 + vertex 115 25.1901 -47.1 + vertex 155 25.1901 -47.1 + endloop + endfacet facet normal 0 1 0 outer loop vertex 35 25.1901 -47.1 @@ -23148,6 +23162,13 @@ solid model vertex 75 25.1901 -47.1 endloop endfacet + facet normal 0 0 0 + outer loop + vertex 35 25.1901 -47.1 + vertex 75 25.1901 -47.1 + vertex 115 25.1901 -47.1 + endloop + endfacet facet normal 1 0 0 outer loop vertex 35 25.1901 -6.3 @@ -26564,20 +26585,6 @@ solid model vertex 75 -25.1901 -47.1 endloop endfacet - facet normal 0 0 0 - outer loop - vertex 65 -25.1901 -47.1 - vertex 145 -25.1901 -47.1 - vertex 105 -25.1901 -47.1 - endloop - endfacet - facet normal 0 0 0 - outer loop - vertex 65 -25.1901 -47.1 - vertex 172.088 -25.1901 -47.1 - vertex 145 -25.1901 -47.1 - endloop - endfacet facet normal -1 0 0 outer loop vertex 65 -25.1901 -6.3 @@ -30550,10 +30557,31 @@ solid model facet normal 0 0 0 outer loop vertex 7.91185 -25.1901 -47.1 - vertex 172.088 -25.1901 -47.1 + vertex 105 -25.1901 -47.1 vertex 65 -25.1901 -47.1 endloop endfacet + facet normal 0 0 0 + outer loop + vertex 7.91185 -25.1901 -47.1 + vertex 145 -25.1901 -47.1 + vertex 105 -25.1901 -47.1 + endloop + endfacet + facet normal 0 0 0 + outer loop + vertex 7.91185 -25.1901 -47.1 + vertex 155 -25.1901 -47.1 + vertex 145 -25.1901 -47.1 + endloop + endfacet + facet normal 0 0 0 + outer loop + vertex 7.91185 -25.1901 -47.1 + vertex 172.088 -25.1901 -47.1 + vertex 155 -25.1901 -47.1 + endloop + endfacet facet normal 0 -1 -0 outer loop vertex 7.91185 -25.1901 -47.1 @@ -30610,20 +30638,6 @@ solid model vertex 9.15836 -23.8825 -6.3 endloop endfacet - facet normal 0 0 0 - outer loop - vertex 7.91185 25.1901 -47.1 - vertex 115 25.1901 -47.1 - vertex 155 25.1901 -47.1 - endloop - endfacet - facet normal 0 0 0 - outer loop - vertex 7.91185 25.1901 -47.1 - vertex 155 25.1901 -47.1 - vertex 172.088 25.1901 -47.1 - endloop - endfacet facet normal 0 0.89541 -0.445243 outer loop vertex 7.91185 25.1901 -47.1 @@ -30642,14 +30656,7 @@ solid model outer loop vertex 7.91185 25.1901 -47.1 vertex 25 25.1901 -47.1 - vertex 35 25.1901 -47.1 - endloop - endfacet - facet normal 0 0 0 - outer loop - vertex 7.91185 25.1901 -47.1 - vertex 35 25.1901 -47.1 - vertex 75 25.1901 -47.1 + vertex 172.088 25.1901 -47.1 endloop endfacet facet normal 0 1 0 @@ -30659,13 +30666,6 @@ solid model vertex 25 25.1901 -47.1 endloop endfacet - facet normal 0 0 0 - outer loop - vertex 7.91185 25.1901 -47.1 - vertex 75 25.1901 -47.1 - vertex 115 25.1901 -47.1 - endloop - endfacet facet normal 0 1 -0 outer loop vertex 7.91185 25.1901 -6.3 diff --git a/CAD/stl/position_888_3000.stl b/CAD/stl/position_888_3000.stl index d2d64dc7..ca9fb495 100644 --- a/CAD/stl/position_888_3000.stl +++ b/CAD/stl/position_888_3000.stl @@ -29525,10 +29525,17 @@ solid model vertex 718.124 3.11843 116 endloop endfacet - facet normal -0.967999 0 0.250954 + facet normal -0.014997 0.999799 0.0132782 outer loop vertex 716.398 4.83998 8 vertex 722.62 4.61457 32 + vertex 727.287 4.44552 50 + endloop + endfacet + facet normal -0.0024999 -0.999959 -0.00874339 + outer loop + vertex 716.398 4.83998 8 + vertex 727.287 4.44552 50 vertex 728.842 4.38917 56 endloop endfacet @@ -31492,13 +31499,6 @@ solid model vertex 728.842 -4.38917 56 endloop endfacet - facet normal 4.4407e-13 -0.999956 -0.00939125 - outer loop - vertex 722.62 4.61457 32 - vertex 727.287 4.44552 50 - vertex 728.842 4.38917 56 - endloop - endfacet facet normal 0.884981 -0.00311273 0.465617 outer loop vertex 722.673 8.06773 -24.0903 diff --git a/CAD/stl/position_rotorhead.stl b/CAD/stl/position_rotorhead.stl index 8c28e1c8..0afc5ed2 100644 --- a/CAD/stl/position_rotorhead.stl +++ b/CAD/stl/position_rotorhead.stl @@ -31930,13 +31930,6 @@ solid model outer loop vertex 152.395 -0.994507 226.454 vertex 152.395 -0.994507 227.275 - vertex 152.395 -0.994507 227.616 - endloop - endfacet - facet normal 0 0 0 - outer loop - vertex 152.395 -0.994507 226.454 - vertex 152.395 -0.994507 227.616 vertex 152.395 -0.994507 227.775 endloop endfacet @@ -31961,6 +31954,13 @@ solid model vertex 153.137 -15.5 226.456 endloop endfacet + facet normal 0 0 0 + outer loop + vertex 152.395 -0.994507 227.275 + vertex 152.395 -0.994507 227.616 + vertex 152.395 -0.994507 227.775 + endloop + endfacet facet normal 0 1 0 outer loop vertex 152.395 -0.994507 227.775 diff --git a/json/TF-G2_assembly_assembly_888_test.blend b/json/TF-G2_assembly_assembly_888_test.blend new file mode 100644 index 00000000..c61c8761 Binary files /dev/null and b/json/TF-G2_assembly_assembly_888_test.blend differ diff --git a/png/TF-G2_assembly_assembly_888_test.png b/png/TF-G2_assembly_assembly_888_test.png new file mode 100644 index 00000000..8e9a8448 Binary files /dev/null and b/png/TF-G2_assembly_assembly_888_test.png differ