diff --git a/ops/home/plans/bathC-hero.png b/ops/home/plans/bathC-hero.png index edc6abb..f139f9c 100644 Binary files a/ops/home/plans/bathC-hero.png and b/ops/home/plans/bathC-hero.png differ diff --git a/ops/home/plans/house-web-v65.glb b/ops/home/plans/house-web-v65.glb new file mode 100644 index 0000000..ce08876 Binary files /dev/null and b/ops/home/plans/house-web-v65.glb differ diff --git a/ops/home/plans/house.glb b/ops/home/plans/house.glb index b9e344c..ce08876 100644 Binary files a/ops/home/plans/house.glb and b/ops/home/plans/house.glb differ diff --git a/ops/home/plans/house_full.py b/ops/home/plans/house_full.py index 6b767d0..51a7c4d 100644 --- a/ops/home/plans/house_full.py +++ b/ops/home/plans/house_full.py @@ -745,7 +745,7 @@ def main(): _nw = 5.15 # западная граница верхней части _ny = 7.25 # северная граница нижней части - _floor_poly("bath_floor", ROOMS_M["sanuzel"], ZI - 0.015, 0.03, _bd) + _floor_poly("bath_floor", ROOMS_M["sanuzel"], ZI - 0.015, 0.03, mat("B_FloorDark", "23262A", 0.55)) # стены: дерево — C4 (север нижней части) и C5 (запад верхней), остальное тёмное box("bath_c4", _bx0, _nw, _ny - 0.03, _ny, ZI, ZI + WHI, _bw) @@ -771,8 +771,15 @@ def main(): ZI + 0.3, ZI + 0.62, _bd) box("bath_tub_front", _tx0, _tx1, _ty0 - 0.04, _ty0, ZI + 0.02, ZI + 0.6, _bwood) box("bath_glass", _tx1, _tx1 + 0.03, _ty0, _ty1, ZI + 0.6, ZI + 1.9, _chrome) - box("bath_shaft", _tx1 - 0.12, _tx1 - 0.08, _ny - 0.09, _ny - 0.05, ZI + 0.6, ZI + 2.2, _blackm) - box("bath_rain", _tx1 - 0.32, _tx1 - 0.02, _ny - 0.1, _ny - 0.02, ZI + 2.1, ZI + 2.14, _blackm) + + + # ДУШ на C3 (западная стена) + box("bath_shower_tray", _bx0 + 0.05, _bx0 + 0.95, 5.78, 6.35, ZI + 0.01, ZI + 0.09, _white2) + box("bath_shower_glass", _bx0 + 0.95, _bx0 + 0.98, 5.78, 6.35, ZI + 0.09, ZI + 2.0, _chrome) + box("bath_shower_glass2", _bx0 + 0.05, _bx0 + 0.98, 6.32, 6.35, ZI + 0.09, ZI + 2.0, _chrome) + box("bath_shaft", _bx0 + 0.05, _bx0 + 0.09, 5.95, 5.99, ZI + 0.6, ZI + 2.2, _blackm) + box("bath_rain", _bx0 + 0.05, _bx0 + 0.45, 5.95, 6.03, ZI + 2.1, ZI + 2.14, _blackm) + box("bath_shower_mix", _bx0 + 0.05, _bx0 + 0.12, 6.05, 6.2, ZI + 1.0, ZI + 1.1, _blackm) # РАКОВИНА и шкафы на C7 _vx0, _vx1 = _bx1 - 0.55, _bx1 - 0.06 @@ -780,11 +787,12 @@ def main(): box("bath_van", _vx0, _vx1, _vy0, _vy1, ZI + 0.32, ZI + 0.8, _bwood) box("bath_vtop", _vx0 - 0.02, _vx1 + 0.02, _vy0 - 0.02, _vy1 + 0.02, ZI + 0.8, ZI + 0.84, _bstone) box("bath_sink", _vx0 + 0.07, _vx1 - 0.07, _vy0 + 0.16, _vy1 - 0.16, ZI + 0.84, ZI + 0.98, _white2) - box("bath_mirror", _bx1 - 0.07, _bx1 - 0.05, _vy0 + 0.05, _vy1 - 0.05, ZI + 1.15, ZI + 1.95, _chrome) + box("bath_mirror", _bx1 - 0.07, _bx1 - 0.05, _vy0 + 0.18, _vy1 - 0.18, ZI + 1.2, ZI + 1.85, _chrome) box("bath_mirror_led", _bx1 - 0.06, _bx1 - 0.02, _vy0 + 0.02, _vy1 - 0.02, ZI + 1.12, ZI + 1.16, _lamp) # шкафы вдоль C7 выше раковины - box("bath_cab1", _bx1 - 0.42, _bx1 - 0.04, 7.30, 8.35, ZI, ZI + 2.1, _bwood) - box("bath_cab2", _bx1 - 0.42, _bx1 - 0.04, 6.95, 7.28, ZI + 1.2, ZI + 1.9, _bwood) + for _i, _z in enumerate((1.15, 1.55, 1.95)): + box("bath_shelf7_%d" % _i, _bx1 - 0.34, _bx1 - 0.04, 7.45, 8.35, ZI + _z, ZI + _z + 0.04, _bwood) + box("bath_side7", _bx1 - 0.36, _bx1 - 0.32, 7.45, 8.35, ZI + 1.1, ZI + 2.0, _bwood) # УНИТАЗ у окна (на C6) box("bath_wc", 5.55, 6.05, 7.85, 8.4, ZI, ZI + 0.42, _white2) @@ -797,8 +805,8 @@ def main(): box("bath_towel2", 3.68, 4.22, _ny - 0.3, _ny - 0.08, ZI + 1.55, ZI + 1.7, _bd) # робот-пылесос у C3 - box("bath_robot", _bx0 + 0.1, _bx0 + 0.45, 6.5, 6.85, ZI, ZI + 0.32, _white2) - box("bath_robot_d", _bx0 + 0.16, _bx0 + 0.39, 6.56, 6.79, ZI + 0.32, ZI + 0.34, _blackm) + box("bath_robot", _bx0 + 0.15, _bx0 + 0.5, 6.45, 6.8, ZI, ZI + 0.32, _white2) + box("bath_robot_d", _bx0 + 0.21, _bx0 + 0.44, 6.51, 6.74, ZI + 0.32, ZI + 0.34, _blackm) # коврик и свет box("bath_mat", 4.9, 5.8, 5.95, 7.05, ZI + 0.005, ZI + 0.02, _gmat) diff --git a/ops/home/plans/render-front.png b/ops/home/plans/render-front.png index cf5ed6c..4eb6947 100644 Binary files a/ops/home/plans/render-front.png and b/ops/home/plans/render-front.png differ diff --git a/ops/home/plans/render-side.png b/ops/home/plans/render-side.png index f0c308f..bd8ebd2 100644 Binary files a/ops/home/plans/render-side.png and b/ops/home/plans/render-side.png differ diff --git a/ops/home/plans/render-terrace.png b/ops/home/plans/render-terrace.png index 77879f8..d009928 100644 Binary files a/ops/home/plans/render-terrace.png and b/ops/home/plans/render-terrace.png differ diff --git a/ops/home/plans/render-west-ortho.png b/ops/home/plans/render-west-ortho.png index bb1607b..fe5bd11 100644 Binary files a/ops/home/plans/render-west-ortho.png and b/ops/home/plans/render-west-ortho.png differ