diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 17:35:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-27 17:35:42 +0300 |
| commit | 7197a830b1c55d7685c5bc08d770ef6f818f2f42 (patch) | |
| tree | 9794b9d03c086febdab2c663c7bbcffd440cd73e /archimesh | |
| parent | eb49cc0d7bed76e0f300fca19bf195d3efb2547b (diff) | |
| parent | f975292b1ec103826fe244dfdb851fed0428b624 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'archimesh')
| -rw-r--r-- | archimesh/achm_window_maker.py | 54 |
1 files changed, 23 insertions, 31 deletions
diff --git a/archimesh/achm_window_maker.py b/archimesh/achm_window_maker.py index dd12b4b4..1e43c792 100644 --- a/archimesh/achm_window_maker.py +++ b/archimesh/achm_window_maker.py @@ -1123,29 +1123,29 @@ def create_rail_window_leaf(objname, hand, sx, sy, sz, f, px, py, pz, mat, matda (0, -p - rail, z), (x, -p - rail, z)]) side *= -1 # reverse - # Faces - myfaces.extend([(v + 10, v + 6, v + 7, v + 11), (v + 9, v + 8, v + 4, v + 5), - (v + 13, v + 12, v + 8, v + 9), (v + 14, v + 10, v + 11, v + 15), - (v + 6, v + 10, v + 9, v + 5), - (v + 9, v + 10, v + 14, v + 13), (v + 11, v + 7, v + 4, v + 8), (v + 12, v + 15, v + 11, v + 8), - (v + 3, v + 7, v + 6, v + 2), - (v + 5, v + 4, v + 0, v + 1), - (v + 4, v + 7, v + 3, v + 0), (v + 5, v + 1, v + 2, v + 6), (v + 17, v + 16, v + 12, v + 13), - (v + 15, v + 19, v + 18, v + 14), - (v + 15, v + 12, v + 16, v + 19), - (v + 14, v + 18, v + 17, v + 13), (v + 29, v + 2, v + 1, v + 28), - (v + 35, v + 34, v + 17, v + 18), (v + 35, v + 33, v + 32, v + 34), - (v + 31, v + 29, v + 28, v + 30), - (v + 33, v + 31, v + 30, v + 32), (v + 25, v + 24, v + 22, v + 23), - (v + 19, v + 16, v + 26, v + 27), - (v + 3, v + 21, v + 20, v + 0), (v + 25, v + 27, v + 26, v + 24), - (v + 23, v + 22, v + 20, v + 21), (v + 3, v + 2, v + 29, v + 21), - (v + 19, v + 27, v + 35, v + 18), - (v + 31, v + 33, v + 25, v + 23), (v + 32, v + 30, v + 22, v + 24), - (v + 16, v + 17, v + 34, v + 26), (v + 0, v + 20, v + 28, v + 1)]) - # Glass - if z == 0: - myfaces.extend([(v + 10, v + 9, v + 8, v + 11)]) + + # Faces + myfaces.extend([(v + 10, v + 6, v + 7, v + 11), (v + 9, v + 8, v + 4, v + 5), + (v + 13, v + 12, v + 8, v + 9), (v + 14, v + 10, v + 11, v + 15), + (v + 6, v + 10, v + 9, v + 5), + (v + 9, v + 10, v + 14, v + 13), (v + 11, v + 7, v + 4, v + 8), (v + 12, v + 15, v + 11, v + 8), + (v + 3, v + 7, v + 6, v + 2), + (v + 5, v + 4, v + 0, v + 1), + (v + 4, v + 7, v + 3, v + 0), (v + 5, v + 1, v + 2, v + 6), (v + 17, v + 16, v + 12, v + 13), + (v + 15, v + 19, v + 18, v + 14), + (v + 15, v + 12, v + 16, v + 19), + (v + 14, v + 18, v + 17, v + 13), (v + 29, v + 2, v + 1, v + 28), + (v + 35, v + 34, v + 17, v + 18), (v + 35, v + 33, v + 32, v + 34), + (v + 31, v + 29, v + 28, v + 30), + (v + 33, v + 31, v + 30, v + 32), (v + 25, v + 24, v + 22, v + 23), + (v + 19, v + 16, v + 26, v + 27), + (v + 3, v + 21, v + 20, v + 0), (v + 25, v + 27, v + 26, v + 24), + (v + 23, v + 22, v + 20, v + 21), (v + 3, v + 2, v + 29, v + 21), + (v + 19, v + 27, v + 35, v + 18), + (v + 31, v + 33, v + 25, v + 23), (v + 32, v + 30, v + 22, v + 24), + (v + 16, v + 17, v + 34, v + 26), (v + 0, v + 20, v + 28, v + 1)]) + # Glass + myfaces.extend([(v + 10, v + 9, v + 8, v + 11)]) v = len(myvertex) @@ -1233,14 +1233,6 @@ def create_rail_window_leaf(objname, hand, sx, sy, sz, f, px, py, pz, mat, matda mywindow.data.materials.append(glass) select_faces(mywindow, 32, True) set_material_faces(mywindow, 1) - # Plastic - plastic = create_diffuse_material("Plastic_material", False, 0.01, 0.01, 0.01, 0.1, 0.1, 0.1, 0.01) - mywindow.data.materials.append(plastic) - select_faces(mywindow, 65, True) - for fa in range(66, 104): - select_faces(mywindow, fa, False) - - set_material_faces(mywindow, 2) return mywindow |