diff --git a/ops/home/plans/bathC-inside.png b/ops/home/plans/bathC-inside.png new file mode 100644 index 0000000..53acd97 Binary files /dev/null and b/ops/home/plans/bathC-inside.png differ diff --git a/ops/home/plans/bathC-top.png b/ops/home/plans/bathC-top.png new file mode 100644 index 0000000..ac2d041 Binary files /dev/null and b/ops/home/plans/bathC-top.png differ diff --git a/ops/home/plans/house-web-v63.glb b/ops/home/plans/house-web-v63.glb new file mode 100644 index 0000000..5181537 Binary files /dev/null and b/ops/home/plans/house-web-v63.glb differ diff --git a/ops/home/plans/house.glb b/ops/home/plans/house.glb index e89cda5..5181537 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 e70b135..cf65dcd 100644 --- a/ops/home/plans/house_full.py +++ b/ops/home/plans/house_full.py @@ -728,71 +728,84 @@ def main(): min(_ay, _by), max(_ay, _by), ZI, ZI + WHI, I_WALL.get(_rid, _wlight)) - # ================= ВАННАЯ (раскладка по схеме владельца) ================= + # ================= ВАННАЯ C (по привязкам владельца) ================= + # C1 — дверь, C3 — робот, C4 — ванна (дерево), C6 — окно, C7 — раковина и шкафы _bw = mat_tex("B_Wood", os.path.join(TDIR, "tex_bath_wood.png"), 0.35) _bd = mat_tex("B_Dark", os.path.join(TDIR, "tex_bath_dark.png"), 0.4) _white2 = mat("B_White", "F4F4F0", 0.25) _chrome = mat("B_Chrome", "B9C0C6", 0.25, 0.9) _blackm = mat("B_Black", "16181A", 0.35, 0.6) _bwood = mat("B_WoodCab", "8B5E3C", 0.45) - _stone = mat("B_Stone", "6E7679", 0.4) + _bstone = mat("B_Stone", "6E7679", 0.4) + _gmat = mat("B_Mat", "C8B49A", 0.9) - _bp = ROOMS_M["sanuzel"] - _bx0 = min(q[0] for q in _bp); _bx1 = max(q[0] for q in _bp) - _by0 = min(q[1] for q in _bp); _by1 = max(q[1] for q in _bp) + # контур: L-образный (низ широкий, верх — узкая часть у окна) + _bx0, _bx1 = 3.38, 6.55 + _by0, _by1 = 5.68, 8.60 + _nw = 5.15 # западная граница верхней части + _ny = 7.25 # северная граница нижней части - # пол: тёмная плитка - _floor_poly("bath_floor", _bp, ZI - 0.015, 0.03, _bd) + _floor_poly("bath_floor", ROOMS_M["sanuzel"], ZI - 0.015, 0.03, _bd) - # стены: «дерево» на южной и восточной, тёмные на северной и западной - box("bath_w_s", _bx0, _bx1, _by0, _by0 + 0.03, ZI, ZI + WHI, _bw) - box("bath_w_e", _bx1 - 0.03, _bx1, _by0, _by1, ZI, ZI + WHI, _bw) - box("bath_w_n", _bx0, _bx1, _by1 - 0.03, _by1, ZI, ZI + WHI, _bd) - box("bath_w_w", _bx0, _bx0 + 0.03, _by0, _by1, ZI, ZI + WHI, _bd) + # стены: дерево — C4 (север нижней части) и C5 (запад верхней), остальное тёмное + box("bath_c4", _bx0, _nw, _ny - 0.03, _ny, ZI, ZI + WHI, _bw) + box("bath_c5", _nw - 0.03, _nw, _ny, _by1, ZI, ZI + WHI, _bw) + box("bath_c7", _bx1 - 0.03, _bx1, _by0, _by1, ZI, ZI + WHI, _bd) + box("bath_c6", _nw, _bx1, _by1 - 0.03, _by1, ZI, ZI + WHI, _bd) + box("bath_c3", _bx0, _bx0 + 0.03, _by0, _ny, ZI, ZI + WHI, _bd) + box("bath_c1", 4.67, _bx1, _by0, _by0 + 0.03, ZI, ZI + WHI, _bd) + box("bath_c2", _bx0, 4.67, _by0, _by0 + 0.03, ZI, ZI + WHI, _bd) - # --- ВАННА: вдоль южной стены, слева --- - _tx0, _tx1 = _bx0 + 0.12, _bx0 + 1.92 - _ty0, _ty1 = _by0 + 0.12, _by0 + 0.87 + # окно на C6 + box("bath_win", 5.45, 6.25, _by1 - 0.05, _by1 + 0.01, ZI + 1.35, ZI + 2.05, _chrome) + box("bath_win_glass", 5.5, 6.2, _by1 - 0.03, _by1 - 0.01, ZI + 1.4, ZI + 2.0, + mat("B_WinGlass", "C9D4DA", 0.1)) + + # ВАННА на C4 (дерево), вдоль стены + _tx0, _tx1 = _bx0 + 0.1, _nw - 0.1 + _ty0, _ty1 = _ny - 0.82, _ny - 0.07 box("bath_tub", _tx0, _tx1, _ty0, _ty1, ZI + 0.02, ZI + 0.58, _white2) - box("bath_tub_in", _tx0 + 0.08, _tx1 - 0.08, _ty0 + 0.08, _ty1 - 0.08, - ZI + 0.28, ZI + 0.62, _bd) - box("bath_tub_front", _tx0, _tx1, _ty1, _ty1 + 0.04, ZI + 0.02, ZI + 0.6, _bwood) - # стеклянный экран у изголовья (правая сторона ванны) - box("bath_glass", _tx1 - 0.01, _tx1 + 0.02, _ty0, _ty1, - ZI + 0.6, ZI + 1.85, _chrome) - # душевая стойка на южной стене над ванной - box("bath_shaft", _tx0 + 0.25, _tx0 + 0.29, _by0 + 0.05, _by0 + 0.09, - ZI + 0.62, ZI + 2.2, _blackm) - box("bath_rain", _tx0 + 0.05, _tx0 + 0.55, _by0 + 0.06, _by0 + 0.14, - ZI + 2.1, ZI + 2.14, _blackm) + box("bath_tub_in", _tx0 + 0.09, _tx1 - 0.09, _ty0 + 0.09, _ty1 - 0.09, + 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) - # --- УНИТАЗ: вверху у окна, справа --- - _wx0, _wx1 = _bx1 - 0.78, _bx1 - 0.34 - _wy0, _wy1 = _by1 - 1.25, _by1 - 0.72 - box("bath_wc", _wx0, _wx1, _wy0, _wy1, ZI, ZI + 0.42, _white2) - box("bath_wc_t", _wx0 + 0.02, _wx1 - 0.02, _wy0 + 0.02, _wy1 - 0.02, ZI + 0.42, ZI + 0.46, _white2) - box("bath_wc_panel", _wx0 - 0.02, _wx1 + 0.02, _by1 - 0.09, _by1 - 0.03, ZI + 0.35, ZI + 0.95, _bwood) + # РАКОВИНА и шкафы на C7 + _vx0, _vx1 = _bx1 - 0.55, _bx1 - 0.06 + _vy0, _vy1 = 5.95, 6.85 + 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_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) - # --- РАКОВИНА: вдоль восточной стены --- - _vx0, _vx1 = _bx1 - 0.53, _bx1 - 0.08 - _vy0, _vy1 = _by0 + 1.05, _by0 + 1.95 - box("bath_van", _vx0, _vx1, _vy0, _vy1, ZI + 0.35, ZI + 0.82, _bwood) - box("bath_vtop", _vx0 - 0.02, _vx1 + 0.02, _vy0 - 0.02, _vy1 + 0.02, ZI + 0.82, ZI + 0.86, _stone) - box("bath_sink", _vx0 + 0.06, _vx1 - 0.06, _vy0 + 0.15, _vy1 - 0.15, ZI + 0.86, ZI + 1.0, _white2) - box("bath_mirror", _bx1 - 0.06, _bx1 - 0.04, _vy0 + 0.05, _vy1 - 0.05, ZI + 1.15, ZI + 2.0, _chrome) - box("bath_mirror_l", _bx1 - 0.05, _bx1 - 0.02, _vy0 + 0.02, _vy1 - 0.02, ZI + 1.13, ZI + 1.17, _lamp) + # УНИТАЗ у окна (на C6) + box("bath_wc", 5.55, 6.05, 7.85, 8.4, ZI, ZI + 0.42, _white2) + box("bath_wc_t", 5.57, 6.03, 7.87, 8.38, ZI + 0.42, ZI + 0.46, _white2) + box("bath_wc_panel", 5.55, 6.05, _by1 - 0.1, _by1 - 0.03, ZI + 0.3, ZI + 1.0, _bwood) - # --- полки с полотенцами у западной стены --- - box("bath_shelf", _bx0 + 0.05, _bx0 + 0.4, _by1 - 1.9, _by1 - 1.35, ZI + 1.05, ZI + 1.09, _bwood) - box("bath_towel1", _bx0 + 0.08, _bx0 + 0.37, _by1 - 1.88, _by1 - 1.37, ZI + 1.09, ZI + 1.22, _blackm) - box("bath_towel2", _bx0 + 0.08, _bx0 + 0.37, _by1 - 1.88, _by1 - 1.37, ZI + 1.22, ZI + 1.34, _bd) + # полки с полотенцами над ванной на C4 + box("bath_shelf", 3.65, 4.25, _ny - 0.32, _ny - 0.05, ZI + 1.35, ZI + 1.39, _blackm) + box("bath_towel1", 3.68, 4.22, _ny - 0.3, _ny - 0.08, ZI + 1.39, ZI + 1.55, _blackm) + box("bath_towel2", 3.68, 4.22, _ny - 0.3, _ny - 0.08, ZI + 1.55, ZI + 1.7, _bd) - # коврик и потолочный свет - box("bath_mat", ( _tx0 + _tx1) / 2 - 0.4, (_tx0 + _tx1) / 2 + 0.4, - _ty1 + 0.25, _ty1 + 0.95, ZI + 0.005, ZI + 0.02, mat("B_Mat", "C8B49A", 0.9)) - box("bath_light", (_bx0 + _bx1) / 2 - 0.3, (_bx0 + _bx1) / 2 + 0.3, - (_by0 + _by1) / 2 - 0.03, (_by0 + _by1) / 2 + 0.03, ZI + WHI - 0.05, ZI + WHI - 0.01, _lamp) - print("ванная собрана по схеме", flush=True) + # робот-пылесос у 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_mat", 4.9, 5.8, 5.95, 7.05, ZI + 0.005, ZI + 0.02, _gmat) + box("bath_light", 5.2, 5.9, 7.0, 7.06, ZI + WHI - 0.05, ZI + WHI - 0.01, _lamp) + + # дверь на C1 (в холл) + box("bath_door", 5.75, 6.45, _by0 + 0.02, _by0 + 0.08, ZI + 0.02, ZI + 2.05, _white) + box("bath_door_stripe", 5.75, 6.45, _by0 + 0.01, _by0 + 0.09, ZI + 1.15, ZI + 1.3, _blackm) + print("ванная C собрана по привязкам", flush=True) # ================= /ВАННАЯ ================= # UV для текстур интерьера diff --git a/ops/home/plans/render-front.png b/ops/home/plans/render-front.png index 2a4b0c7..2486fac 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 d301616..8073098 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 cf0b05a..e31b88e 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 7a76d7f..e6388d4 100644 Binary files a/ops/home/plans/render-west-ortho.png and b/ops/home/plans/render-west-ortho.png differ