Archimesh: Fix vertex problem for door model 5

There was an extra vertex in one lower corner of the door. Some minor
tweaks in vertices too.

1 files changed, 63 insertions, 68 deletions

diff --git a/archimesh/achm_door_maker.py b/archimesh/achm_door_maker.py
index 64ba7829..6d048bfd 100644
--- a/archimesh/achm_door_maker.py
+++ b/archimesh/achm_door_maker.py
@@ -1196,80 +1196,75 @@ def door_model_04(frame_size, frame_width, frame_height, frame_thick, openside):
     maxz = hf - sf - gap
 
     # Vertex
-    myvertex = [(minx, -1.57160684466362e-08, minz + 2.384185791015625e-06),
-                (maxx, -1.5599653124809265e-08, minz),
-                (minx, -1.5599653124809265e-08, maxz),
-                (minx, -1.5599653124809265e-08, maxz - 0.12999999523162842),
-                (minx, -1.57160684466362e-08, minz + 0.2500007152557373),
-                (maxx, -1.5599653124809265e-08, minz + 0.25000011920928955),
-                (maxx, -1.5599653124809265e-08, maxz),
-                (maxx, -1.5599653124809265e-08, maxz - 0.12999999523162842),
-                (maxx - 0.11968576163053513, -1.5599653124809265e-08, maxz),
-                (maxx - 0.11968576163053513, -1.5599653124809265e-08, minz),
-                (maxx - 0.11968576163053513, -1.5599653124809265e-08, maxz - 0.12999999523162842),
-                (maxx - 0.11968576163053513, -1.5599653124809265e-08, minz + 0.25000011920928955),
-                (minx + 0.12030857801437378, -1.5832483768463135e-08, minz + 0.25000011920928955),
-                (minx + 0.12030857801437378, -1.5599653124809265e-08, maxz - 0.12999999523162842),
-                (minx + 0.12030857801437378, -1.5832483768463135e-08, minz),
-                (minx + 0.12030857801437378, -1.5599653124809265e-08, maxz),
-                (minx + 0.12030857801437378, -0.010000014677643776, maxz - 0.12999999523162842),
-                (minx + 0.12030857801437378, -0.010000014677643776, minz + 0.25000011920928955),
-                (maxx - 0.11968576163053513, -0.010000014677643776, maxz - 0.12999999523162842),
-                (maxx - 0.11968576163053513, -0.010000014677643776, minz + 0.25000011920928955),
-                (maxx - 0.1353275030851364, -0.009388341568410397, minz + 0.26250016689300537),
-                (maxx - 0.1353275030851364, -0.009388341568410397, maxz - 0.14747536182403564),
-                (minx + 0.13506758213043213, -0.009388341568410397, minz + 0.26250016689300537),
-                (maxx - 0.1353275030851364, -0.008776669390499592, minz + 0.26250016689300537),
-                (minx + 0.13506758213043213, -0.009388341568410397, maxz - 0.14747536182403564),
-                (maxx - 0.1353275030851364, -0.0003883419558405876, minz + 0.26250016689300537),
-                (maxx - 0.1353275030851364, -0.0003883419558405876, maxz - 0.14747536182403564),
-                (minx + 0.13506758213043213, -0.0003883419558405876, minz + 0.26250016689300537),
-                (maxx - 0.1353275030851364, miny + 0.010223344899713993, minz + 0.26250016689300537),
-                (minx + 0.13506758213043213, -0.0003883419558405876, maxz - 0.14747536182403564),
-                (minx, maxy - 0.009999999776482582, minz + 2.384185791015625e-06),
-                (maxx, maxy - 0.009999999776482582, minz),
-                (minx, maxy - 0.009999999776482582, maxz),
-                (minx, maxy - 0.009999999776482582, maxz - 0.12999999523162842),
-                (minx, maxy - 0.009999999776482582, minz + 0.2500007152557373),
-                (maxx, maxy - 0.009999999776482582, minz + 0.25000011920928955),
-                (maxx, maxy - 0.009999999776482582, maxz),
-                (maxx, maxy - 0.009999999776482582, maxz - 0.12999999523162842),
-                (maxx - 0.11968576908111572, maxy - 0.009999999776482582, maxz),
-                (maxx - 0.11968576908111572, maxy - 0.009999999776482582, minz),
-                (maxx - 0.11968576908111572, maxy - 0.009999999776482582, maxz - 0.12999999523162842),
-                (maxx - 0.11968576908111572, maxy - 0.009999999776482582, minz + 0.25000011920928955),
-                (minx + 0.12030857801437378, maxy - 0.009999999776482582, minz + 0.25000011920928955),
-                (minx + 0.12030857801437378, maxy - 0.009999999776482582, maxz - 0.12999999523162842),
-                (minx + 0.12030857801437378, maxy - 0.009999999776482582, minz),
-                (minx + 0.12030857801437378, maxy - 0.009999999776482582, maxz),
+    myvertex = [(minx, miny + 0.009999997913837433, minz + 2.384185791015625e-06),
+                (maxx, miny + 0.009999997913837433, minz),
+                (minx, miny + 0.009999997913837433, maxz),
+                (minx, miny + 0.009999997913837433, maxz - 0.12999999523162842),
+                (minx, miny + 0.009999997913837433, minz + 0.25000083446502686),
+                (maxx, miny + 0.009999997913837433, minz + 0.2500002384185791),
+                (maxx, miny + 0.009999997913837433, maxz),
+                (maxx, miny + 0.009999997913837433, maxz - 0.12999999523162842),
+                (maxx - 0.11968576908111572, miny + 0.009999997913837433, maxz),
+                (maxx - 0.11968576908111572, miny + 0.009999997913837433, minz),
+                (maxx - 0.11968576908111572, miny + 0.009999997913837433, maxz - 0.12999999523162842),
+                (maxx - 0.11968576908111572, miny + 0.009999997913837433, minz + 0.2500002384185791),
+                (minx + 0.12030857801437378, miny + 0.009999997913837433, minz + 0.2500002384185791),
+                (minx + 0.12030857801437378, miny + 0.009999997913837433, maxz - 0.12999999523162842),
+                (minx + 0.12030857801437378, miny + 0.009999997913837433, minz),
+                (minx + 0.12030857801437378, miny + 0.009999997913837433, maxz),
+                (minx + 0.12030857801437378, -0.009999997913837433, maxz - 0.12999999523162842),
+                (minx + 0.12030857801437378, -0.009999997913837433, minz + 0.2500002384185791),
+                (maxx - 0.11968576908111572, -0.009999997913837433, maxz - 0.12999999523162842),
+                (maxx - 0.11968576908111572, -0.009999997913837433, minz + 0.2500002384185791),
+                (maxx - 0.13532748818397522, -0.008776653558015823, minz + 0.2625002861022949),
+                (maxx - 0.13532748818397522, -0.009388323873281479, maxz - 0.14747536182403564),
+                (minx + 0.13506758213043213, -0.009388323873281479, minz + 0.2625002861022949),
+                (minx + 0.13506758213043213, -0.009388323873281479, maxz - 0.14747536182403564),
+                (maxx - 0.13532748818397522, -0.0003883242607116699, minz + 0.2625002861022949),
+                (maxx - 0.13532748818397522, -0.0003883242607116699, maxz - 0.14747536182403564),
+                (minx + 0.13506758213043213, -0.0003883242607116699, minz + 0.2625002861022949),
+                (minx + 0.13506758213043213, -0.0003883242607116699, maxz - 0.14747536182403564),
+                (minx, maxy - 0.010000001639127731, minz + 2.384185791015625e-06),
+                (maxx, maxy - 0.010000001639127731, minz),
+                (minx, maxy - 0.010000001639127731, maxz),
+                (minx, maxy - 0.010000001639127731, maxz - 0.12999999523162842),
+                (minx, maxy - 0.010000001639127731, minz + 0.25000083446502686),
+                (maxx, maxy - 0.010000001639127731, minz + 0.2500002384185791),
+                (maxx, maxy - 0.010000001639127731, maxz),
+                (maxx, maxy - 0.010000001639127731, maxz - 0.12999999523162842),
+                (maxx - 0.11968576908111572, maxy - 0.010000001639127731, maxz),
+                (maxx - 0.11968576908111572, maxy - 0.010000001639127731, minz),
+                (maxx - 0.11968576908111572, maxy - 0.010000001639127731, maxz - 0.12999999523162842),
+                (maxx - 0.11968576908111572, maxy - 0.010000001639127731, minz + 0.2500002384185791),
+                (minx + 0.12030857801437378, maxy - 0.010000001639127731, minz + 0.2500002384185791),
+                (minx + 0.12030857801437378, maxy - 0.010000001639127731, maxz - 0.12999999523162842),
+                (minx + 0.12030857801437378, maxy - 0.010000001639127731, minz),
+                (minx + 0.12030857801437378, maxy - 0.010000001639127731, maxz),
                 (minx + 0.12030857801437378, maxy, maxz - 0.12999999523162842),
-                (minx + 0.12030857801437378, maxy, minz + 0.25000011920928955),
+                (minx + 0.12030857801437378, maxy, minz + 0.2500002384185791),
                 (maxx - 0.11968576908111572, maxy, maxz - 0.12999999523162842),
-                (maxx - 0.11968576908111572, maxy, minz + 0.25000011920928955),
-                (maxx - 0.1353275179862976, maxy - 0.0006116721779108047, minz + 0.26250016689300537),
-                (maxx - 0.1353275179862976, maxy - 0.0006116721779108047, maxz - 0.14747536182403564),
-                (minx + 0.13506758213043213, maxy - 0.0006116721779108047, minz + 0.26250016689300537),
-                (maxx - 0.1353275179862976, maxy - 0.0012233462184667587, minz + 0.26250016689300537),
-                (minx + 0.13506758213043213, maxy - 0.0006116721779108047, maxz - 0.14747536182403564),
-                (maxx - 0.1353275179862976, maxy - 0.009611671790480614, minz + 0.26250016689300537),
-                (maxx - 0.1353275179862976, maxy - 0.009611671790480614, maxz - 0.14747536182403564),
-                (minx + 0.13506758213043213, maxy - 0.009611671790480614, minz + 0.26250016689300537),
-                (maxx - 0.1353275179862976, maxy - 0.010223345831036568, minz + 0.26250016689300537),
-                (minx + 0.13506758213043213, maxy - 0.009611671790480614, maxz - 0.14747536182403564)]
+                (maxx - 0.11968576908111572, maxy, minz + 0.2500002384185791),
+                (maxx - 0.1353275179862976, maxy - 0.001223348081111908, minz + 0.2625002861022949),
+                (maxx - 0.1353275179862976, maxy - 0.0006116703152656555, maxz - 0.14747536182403564),
+                (minx + 0.13506758213043213, maxy - 0.0006116703152656555, minz + 0.2625002861022949),
+                (minx + 0.13506758213043213, maxy - 0.0006116703152656555, maxz - 0.14747536182403564),
+                (maxx - 0.1353275179862976, maxy - 0.010223347693681717, minz + 0.2625002861022949),
+                (maxx - 0.1353275179862976, maxy - 0.009611673653125763, maxz - 0.14747536182403564),
+                (minx + 0.13506758213043213, maxy - 0.009611673653125763, minz + 0.2625002861022949),
+                (minx + 0.13506758213043213, maxy - 0.009611673653125763, maxz - 0.14747536182403564)]
 
     # Faces
     myfaces = [(12, 4, 0, 14), (15, 2, 3, 13), (6, 8, 10, 7), (8, 15, 13, 10), (11, 12, 14, 9),
                (5, 11, 9, 1), (10, 13, 16, 18), (12, 11, 19, 17), (3, 4, 12, 13), (5, 7, 10, 11),
-               (23, 19, 17, 22), (18, 19, 20, 21), (17, 16, 24, 22), (17, 16, 13, 12), (11, 10, 18, 19),
-               (21, 18, 16, 24), (22, 24, 29, 27), (21, 24, 29, 26), (21, 20, 25, 26), (23, 22, 27, 28),
-               (25, 28, 27, 29, 26), (42, 34, 30, 44), (45, 32, 33, 43), (36, 38, 40, 37), (38, 45, 43, 40),
-               (41, 42, 44, 39), (35, 41, 39, 31), (40, 43, 46, 48), (42, 41, 49, 47), (33, 34, 42, 43),
-               (35, 37, 40, 41), (53, 49, 47, 52), (48, 49, 50, 51), (47, 46, 54, 52), (47, 46, 43, 42),
-               (41, 40, 48, 49), (51, 48, 46, 54), (52, 54, 59, 57), (51, 54, 59, 56), (51, 50, 55, 56),
-               (53, 52, 57, 58), (55, 58, 57, 59, 56), (36, 6, 8, 38), (38, 8, 15, 45), (2, 32, 45, 15),
-               (6, 36, 37, 7), (7, 37, 35, 5), (31, 1, 5, 35), (1, 31, 39, 9), (9, 39, 44, 14),
-               (30, 0, 14, 44), (34, 4, 3, 33), (32, 2, 3, 33), (34, 4, 0, 30)]
-
+               (20, 22, 17, 19), (18, 21, 20, 19), (17, 22, 23, 16), (17, 16, 13, 12), (11, 10, 18, 19),
+               (21, 18, 16, 23), (22, 26, 27, 23), (21, 23, 27, 25), (21, 25, 24, 20), (20, 24, 26, 22),
+               (24, 25, 27, 26), (40, 42, 28, 32), (43, 41, 31, 30), (34, 35, 38, 36), (36, 38, 41, 43),
+               (39, 37, 42, 40), (33, 29, 37, 39), (38, 46, 44, 41), (40, 45, 47, 39), (31, 41, 40, 32),
+               (33, 39, 38, 35), (48, 47, 45, 50), (46, 47, 48, 49), (45, 44, 51, 50), (45, 40, 41, 44),
+               (39, 47, 46, 38), (49, 51, 44, 46), (50, 51, 55, 54), (49, 53, 55, 51), (49, 48, 52, 53),
+               (48, 50, 54, 52), (52, 54, 55, 53), (34, 36, 8, 6), (36, 43, 15, 8), (2, 15, 43, 30),
+               (6, 7, 35, 34), (7, 5, 33, 35), (29, 33, 5, 1), (1, 9, 37, 29), (9, 14, 42, 37),
+               (28, 42, 14, 0), (32, 4, 3, 31), (30, 31, 3, 2), (32, 28, 0, 4)]
     return myvertex, myfaces, wf, deep, side