diff --git a/ops/home/house3d-card.js b/ops/home/house3d-card.js index 384ae87..e9b9601 100644 --- a/ops/home/house3d-card.js +++ b/ops/home/house3d-card.js @@ -16,7 +16,7 @@ const ROOM_NAMES = { class House3dCard extends HTMLElement { setConfig(config) { this._config = Object.assign( - { entity: "", title: "Дом", room: "", domain: "switch", service: "toggle", model: "/local/house3d/house-web-v50.glb?v=50" }, + { entity: "", title: "Дом", room: "", domain: "switch", service: "toggle", model: "/local/house3d/house-web-v52.glb?v=52" }, config || {}, ); this._root = this.attachShadow({ mode: "open" }); @@ -252,8 +252,8 @@ class House3dCard extends HTMLElement { " · камера " + this._cam.position.length().toFixed(1) + " м"; if (this._tm) this._tm.textContent = this._diag; // интерьер отдельным файлом (не ломает материалы экстерьера) - const iloader = new T.GLTFLoader(); - iloader.load(this._config.interior || "/local/house3d/house-interior-v50.glb?v=50", (ig) => { + const iloader = this._config.interior ? new T.GLTFLoader() : null; + if (iloader) iloader.load(this._config.interior, (ig) => { const im = ig.scene; im.traverse((o) => { if (!o.isMesh) return; diff --git a/ops/home/plans/house-web-v52.glb b/ops/home/plans/house-web-v52.glb new file mode 100644 index 0000000..5ebe3ec Binary files /dev/null and b/ops/home/plans/house-web-v52.glb differ diff --git a/ops/home/plans/house.glb b/ops/home/plans/house.glb index c3f5f43..5ebe3ec 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 new file mode 100644 index 0000000..a8acfd0 --- /dev/null +++ b/ops/home/plans/house_full.py @@ -0,0 +1,756 @@ +# -*- coding: utf-8 -*- +"""Р вЂќР С•Р С Р’В«Р вЂР °СЂРЅРµРІР° 8,5 Г— 14,5Р’В» — СЃР±РѕСЂРєР° v2 Р С—Р С• паспорту, РЎвЂћР В°РЎРѓР В°Р Т‘Р В°Р С Р С‘ спецификации РѕРєРѕРЅ. + +ГеоРСетрия: + • блок 12 100 Г— 8 600, терраса 2 450 РЎРѓ запада (перед блокоРС); + • кровля 0..14 550 Р С—Р С• длине — заканчивается СЂРѕРІРЅРѕ Р С—Р С• краю террасы, свесов нет; + • перекрытие (потолок) только над блокоРС, над террасой — открыто Р Т‘Р С• РєРѕРЅСЊРєР°; + • тех.РїРѕРС. 2 080 Г— 1 500 Р Р†РЎвЂ№РЎРѓРЎвЂљРЎС“Р С—Р С•Р С Р Р…Р В° север (x 3 214..5 294); + • крыльцо 1 800 Г— 1 500 Р Р†РЎвЂ№РЎРѓРЎвЂљРЎС“Р С—Р С•Р С Р Р…Р В° СЋРі (x 3 710..5 510). + +РћРєРЅР° (спецификация 04.08.2024): + запад: 2 Г— 1 400Г—1 840 (sill 260, верх Р Р† РѕРґРёРЅ уровень РЎРѓ дверью), ДПВ 1 600Г—2 100, + пятиугольник 1 600/1 000/1 291, РґРІРµ трапеции 1 400 (290/800); + СЋРі: 1 400Г—1 840 (sill 380), дверь 861, 1 000Г—1 440 (sill 780); + север: 2 Г— 900Г—1 140 (sill 1 060), тех.РїРѕРС. 800Г—1 140 (sill 500); + восток: 2 Г— 1 000Г—1 440 (sill 920). + +blender -b -P house_v2.py +""" +import math +import os + +import bpy +from mathutils import Vector + +OUT = os.path.dirname(os.path.abspath(__file__)) + +LX, LY = 12.10, 8.60 # блок +TER = 2.45 # терраса (запад) +Z0 = 0.80 # верх свай +WH = 2.75 # высота стены +Z1 = Z0 + WH +RH = 1.75 # РїРѕРґСЉСвЂР С Р С”РЎР‚Р С•Р Р†Р В»Р С‘ +ZR = Z1 + RH +T = 0.20 +YM = LY / 2 + +TECH_X0, TECH_X1, TECH_D = 3.214, 5.294, 1.50 +PORCH_X0, PORCH_X1, PORCH_D = 3.710, 5.510, 1.50 + + +def lin(c): + return c / 12.92 if c <= 0.04045 else ((c + 0.055) / 1.055) ** 2.4 + + +def col(h, a=1.0): + h = h.lstrip("#") + r, g, b = (int(h[i:i + 2], 16) / 255 for i in (0, 2, 4)) + return (lin(r), lin(g), lin(b), a) + + +def mat(name, hexv, rough=0.6, metal=0.0, glass=False, stripes=None, scale=25.0, strength=0.3): + m = bpy.data.materials.new(name) + m.use_nodes = True + nt = m.node_tree + b = nt.nodes["Principled BSDF"] + b.inputs["Base Color"].default_value = col(hexv) + b.inputs["Roughness"].default_value = rough + b.inputs["Metallic"].default_value = metal + if glass: + b.inputs["Transmission Weight"].default_value = 0.55 + b.inputs["Roughness"].default_value = 0.12 + b.inputs["IOR"].default_value = 1.45 + b.inputs["Metallic"].default_value = 0.25 + b.inputs["Base Color"].default_value = col("6C8496") + if stripes: + tex = nt.nodes.new("ShaderNodeTexWave") + tex.wave_type = "BANDS" + tex.bands_direction = stripes + tex.inputs["Scale"].default_value = scale + tex.inputs["Distortion"].default_value = 0.0 + bmp = nt.nodes.new("ShaderNodeBump") + bmp.inputs["Strength"].default_value = strength + nt.links.new(tex.outputs["Color"], bmp.inputs["Height"]) + nt.links.new(bmp.outputs["Normal"], b.inputs["Normal"]) + return m + + +def mat_tex(name, img_path, rough=0.6, metallic=0.0): + m = bpy.data.materials.new(name) + m.use_nodes = True + nt = m.node_tree + b = nt.nodes["Principled BSDF"] + b.inputs["Roughness"].default_value = rough + b.inputs["Metallic"].default_value = metallic + img = bpy.data.images.load(img_path) + tex = nt.nodes.new("ShaderNodeTexImage") + tex.image = img + nt.links.new(tex.outputs["Color"], b.inputs["Base Color"]) + return m + + +def box(name, x0, x1, y0, y1, z0, z1, m): + bpy.ops.mesh.primitive_cube_add(size=2) + o = bpy.context.object + o.name = name + o.scale = ((x1 - x0) / 2, (y1 - y0) / 2, (z1 - z0) / 2) + o.location = ((x0 + x1) / 2, (y0 + y1) / 2, (z0 + z1) / 2) + o.data.materials.append(m) + return o + + +def cut(target, x0, x1, y0, y1, z0, z1, m=None): + c = box("cut", x0, x1, y0, y1, z0, z1, m or target.data.materials[0]) + mod = target.modifiers.new("b", "BOOLEAN") + mod.operation = "DIFFERENCE" + mod.object = c + mod.solver = "EXACT" + bpy.context.view_layer.objects.active = target + bpy.ops.object.modifier_apply(modifier=mod.name) + bpy.data.objects.remove(c, do_unlink=True) + + +def prism(name, pts2d, x0, x1, m=None): + n = len(pts2d) + verts = [(x0, y, z) for y, z in pts2d] + [(x1, y, z) for y, z in pts2d] + faces = [tuple(range(n)), tuple(n + i for i in range(n)[::-1])] + for i in range(n): + j = (i + 1) % n + faces.append((i, j, n + j, n + i)) + me = bpy.data.meshes.new(name) + me.from_pydata(verts, [], faces) + me.update() + o = bpy.data.objects.new(name, me) + bpy.context.collection.objects.link(o) + if m: + o.data.materials.append(m) + return o + + +def cut_prism(target, pts2d, x0, x1): + c = prism("cut", pts2d, x0, x1) + mod = target.modifiers.new("b", "BOOLEAN") + mod.operation = "DIFFERENCE" + mod.object = c + mod.solver = "EXACT" + bpy.context.view_layer.objects.active = target + bpy.ops.object.modifier_apply(modifier=mod.name) + bpy.data.objects.remove(c, do_unlink=True) + + +def quad(name, pts, m, th=0.10): + me = bpy.data.meshes.new(name) + me.from_pydata(pts, [], [(0, 1, 2, 3)]) + me.update() + o = bpy.data.objects.new(name, me) + bpy.context.collection.objects.link(o) + o.data.materials.append(m) + s = o.modifiers.new("s", "SOLIDIFY") + s.thickness = th + s.offset = -1.0 + return o + + + +def frame_prism(name, pts, x0, x1, m, w=0.07): + """Рамка (наличник) по контуру многоугольника — полоса шириной w наружу.""" + n = len(pts) + cx = sum(pt[0] for pt in pts) / n + cy = sum(pt[1] for pt in pts) / n + for i in range(n): + p1 = pts[i] + p2 = pts[(i + 1) % n] + dx = p2[0] - p1[0] + dy = p2[1] - p1[1] + L = math.hypot(dx, dy) or 1.0 + nx, ny = dy / L, -dx / L + mx, my = (p1[0] + p2[0]) / 2, (p1[1] + p2[1]) / 2 + if (mx - cx) * nx + (my - cy) * ny < 0: + nx, ny = -nx, -ny + q = [(p1[0], p1[1]), (p2[0], p2[1]), + (p2[0] + nx * w, p2[1] + ny * w), (p1[0] + nx * w, p1[1] + ny * w)] + prism("%s_e%d" % (name, i), q, x0, x1, m) + + +def gable(name, x, zb, zt, th, m): + v = [(x, 0, zb), (x, LY, zb), (x, YM, zt), + (x + th, 0, zb), (x + th, LY, zb), (x + th, YM, zt)] + f = [(2, 1, 0), (3, 4, 5), (1, 4, 3, 0), (2, 5, 4, 1), (0, 3, 5, 2)] + me = bpy.data.meshes.new(name) + me.from_pydata(v, [], f) + me.update() + o = bpy.data.objects.new(name, me) + bpy.context.collection.objects.link(o) + o.data.materials.append(m) + return o + + +def win_x(name, a0, a1, z0, z1, y, gl, fr): + box(name + "_g", a0, a1, y - 0.03, y + 0.03, z0, z1, gl) + box(name + "_f", a0 - 0.06, a1 + 0.06, y - 0.05, y + 0.05, z0 - 0.06, z0, fr) + box(name + "_t", a0 - 0.06, a1 + 0.06, y - 0.05, y + 0.05, z1, z1 + 0.06, fr) + box(name + "_l", a0 - 0.06, a0, y - 0.05, y + 0.05, z0, z1, fr) + box(name + "_r", a1, a1 + 0.06, y - 0.05, y + 0.05, z0, z1, fr) + + +def win_y(name, a0, a1, z0, z1, x, gl, fr): + box(name + "_g", x - 0.03, x + 0.03, a0, a1, z0, z1, gl) + box(name + "_f", x - 0.05, x + 0.05, a0 - 0.06, a1 + 0.06, z0 - 0.06, z0, fr) + box(name + "_t", x - 0.05, x + 0.05, a0 - 0.06, a1 + 0.06, z1, z1 + 0.06, fr) + box(name + "_l", x - 0.05, x + 0.05, a0 - 0.06, a0, z0, z1, fr) + box(name + "_r", x - 0.05, x + 0.05, a1, a1 + 0.06, z0, z1, fr) + + +def casing_y(name, a0, a1, z0, z1, x, m, wdt=0.10, dep=0.05): + box(name + "_L", x - dep, x + dep, a0 - wdt, a0, z0 - wdt, z1 + wdt, m) + box(name + "_R", x - dep, x + dep, a1, a1 + wdt, z0 - wdt, z1 + wdt, m) + box(name + "_B", x - dep, x + dep, a0 - wdt, a1 + wdt, z0 - wdt, z0, m) + box(name + "_T", x - dep, x + dep, a0 - wdt, a1 + wdt, z1, z1 + wdt, m) + + +def casing_x(name, a0, a1, z0, z1, y, m, wdt=0.10, dep=0.05): + box(name + "_L", a0 - wdt, a0, y - dep, y + dep, z0 - wdt, z1 + wdt, m) + box(name + "_R", a1, a1 + wdt, y - dep, y + dep, z0 - wdt, z1 + wdt, m) + box(name + "_B", a0 - wdt, a1 + wdt, y - dep, y + dep, z0 - wdt, z0, m) + box(name + "_T", a0 - wdt, a1 + wdt, y - dep, y + dep, z1, z1 + wdt, m) + + +def main(): + bpy.ops.wm.read_factory_settings(use_empty=True) + sc = bpy.context.scene + + TXT = OUT + metal = mat_tex("RAL7024", os.path.join(TXT, "tex_seam.png"), 0.42, 0.35) + wood = mat_tex("Olenenok", os.path.join(TXT, "tex_wood.png"), 0.72, 0.0) + deck_dark = mat_tex("DeckGraphite", os.path.join(TXT, "tex_deck.png"), 0.78, 0.0) + ceil_m = mat("CeilingBoard", "E7E0D2", 0.7, 0.0, stripes="Y", scale=18, strength=0.2) + roofm = mat_tex("Roof", os.path.join(TXT, "tex_roof.png"), 0.45, 0.3) + glass = mat("Glass", "101B21", glass=True) + glass_l = mat("GlassLight", "7E97A8", 0.16, 0.30) + b = glass_l.node_tree.nodes["Principled BSDF"] + b.inputs["Transmission Weight"].default_value = 0.25 + frame = mat("Frame", "1B1E22", 0.45, 0.4) + trim = mat("Trim", "23262A", 0.5, 0.25) + pilem = mat("Concrete", "BDB8AB", 0.9) + stone = mat_tex("PlinthStone", os.path.join(TXT, "tex_stone.png"), 0.85, 0.0) + deck_h = mat_tex("DeckGraphiteH", os.path.join(TXT, "tex_deck_h.png"), 0.78, 0.0) + gravel = mat("Gravel", "8C8577", 0.95, stripes="Z", scale=60, strength=0.3) + + # ---------- сваи ---------- + # сваи скрыты зашитым цоколем + for y in (2.6, 4.3, 6.0): + for x in (0.45, LX - 0.45): + bpy.ops.mesh.primitive_cylinder_add(radius=0.075, depth=Z0, location=(x, y, Z0 / 2)) + bpy.context.object.data.materials.append(pilem) + + # ---------- РїРѕР»; потолка нет — открыто Р Т‘Р С• РєРѕРЅСЊРєР° (РѕРґРёРЅ этаж) ---------- + box("floor", -TER - 0.03, LX + 0.03, -0.03, LY + 0.03, Z0 - 0.22, Z0, trim) + + # ---------- СЋРі: боковая стена террасы Р Т‘Р С• ецкрая + РѕРєРЅР°/дверь ---------- + south = box("w_south", -TER, LX, 0, T, Z0, Z1, metal) + cut(south, 1.055, 2.455, -0.1, T + 0.1, Z0 + 0.38, Z0 + 2.22) + cut(south, 4.180, 5.041, -0.1, T + 0.1, Z0, Z0 + 2.10) + cut(south, 6.500, 7.500, -0.1, T + 0.1, Z0 + 0.78, Z0 + 2.22) + win_x("ws_a", 1.075, 2.435, Z0 + 0.40, Z0 + 2.20, T / 2, glass, frame) + casing_x("wn_s_a", 1.075, 2.435, Z0 + 0.40, Z0 + 2.20, -0.02, trim) + win_x("ws_b", 6.520, 7.480, Z0 + 0.80, Z0 + 2.20, T / 2, glass, frame) + casing_x("wn_s_b", 6.520, 7.480, Z0 + 0.80, Z0 + 2.20, -0.02, trim) + box("door_s", 4.200, 5.021, -0.02, T * 0.7, Z0 + 0.02, Z0 + 2.08, frame) + casing_x("wn_s_d", 4.200, 5.021, Z0, Z0 + 2.08, -0.02, trim) + box("door_s_g", 4.260, 4.960, -0.04, -0.005, Z0 + 0.90, Z0 + 2.00, glass) + + # ---------- север: 2 Г— 900Г—1140 (sill 1060) ---------- + north = box("w_north", -TER, LX, LY - T, LY, Z0, Z1, metal) + for (a, b) in [(1.300, 2.200), (6.400, 7.300)]: + cut(north, a, b, LY - T - 0.1, LY + 0.1, Z0 + 1.06, Z0 + 2.20) + win_x("wn_%d" % int(a * 100), a + 0.02, b - 0.02, Z0 + 1.08, Z0 + 2.18, LY - T / 2, glass, frame) + casing_x("wn_c_%d" % int(a * 100), a + 0.02, b - 0.02, Z0 + 1.08, Z0 + 2.18, LY + 0.02, trim) + + # ---------- восток: 2 Г— 1000Г—1440 (sill 920) ---------- + east = box("w_east", LX - T, LX, T, LY - T, Z0, Z1, wood) + for i, y0 in enumerate((1.725, 5.875)): + cut(east, LX - T - 0.1, LX + 0.1, y0, y0 + 1.0, Z0 + 0.92, Z0 + 2.36) + win_y("we_%d" % i, y0 + 0.02, y0 + 0.98, Z0 + 0.94, Z0 + 2.34, LX - T / 2, glass, frame) + casing_y("we_c_%d" % i, y0 + 0.02, y0 + 0.98, Z0 + 0.94, Z0 + 2.34, LX + 0.02, trim) + + # ---------- запад: РѕРєРЅР° 1400, ДПВ 1600, верхний СЂСЏРґ ---------- + west = box("w_west", 0, T, 0, LY, Z0, Z1, wood) + for (a, b) in [(1.495, 2.895), (5.715, 7.115)]: + cut(west, -0.1, T + 0.1, a, b, Z0 + 0.26, Z0 + 2.10) + win_y("ww_%d" % int(a * 100), a + 0.02, b - 0.02, Z0 + 0.28, Z0 + 2.08, T / 2, glass, frame) + casing_y("ww_c_%d" % int(a * 100), a + 0.02, b - 0.02, Z0 + 0.28, Z0 + 2.08, -0.02, trim) + cut(west, -0.1, T + 0.1, 3.505, 5.105, Z0, Z0 + 2.10) + box("door_w", T * 0.25, T * 0.75, 3.525, 5.085, Z0 + 0.02, Z0 + 2.08, frame) + casing_y("ww_c_door", 3.525, 5.085, Z0, Z0 + 2.08, -0.02, trim) + box("door_w_g1", T * 0.3, T * 0.4, 3.560, 4.280, Z0 + 0.10, Z0 + 2.00, glass) + box("door_w_g2", T * 0.3, T * 0.4, 4.330, 5.050, Z0 + 0.10, Z0 + 2.00, glass) + + # ---------- фронтоны ---------- + gw = gable("g_west", 0.0, Z1, ZR, T, wood) + ge = gable("g_east", LX - T, Z1, ZR, T, wood) + + # верхние РѕРєРЅР° западного фронтона: пятиугольник 1600 (1000/1291) + трапеции 1400 (290/800) + zb = Z1 + 0.10 + pent = [(3.505, zb), (5.105, zb), (5.105, zb + 1.000), + (4.305, zb + 1.291), (3.505, zb + 1.000)] + cut_prism(gw, pent, -0.3, T + 0.3) + prism("gw_pent_glass", pent, 0.02, T * 0.5, glass_l) + frame_prism("gw_pent_casing", pent, -0.03, 0.03, trim, 0.07) + + for i, (outer, inner) in enumerate([(1.495, 2.895), (7.115, 5.715)]): + tri = [(outer, zb), (inner, zb), + (inner, zb + 0.800), (outer, zb + 0.290)] + cut_prism(gw, tri, -0.3, T + 0.3) + prism("gw_tr_glass_%d" % i, tri, 0.02, T * 0.5, glass_l) + frame_prism("gw_tr_casing_%d" % i, tri, -0.03, 0.03, trim, 0.07) + + # ---------- кровля: РѕС‚ края террасы Р Т‘Р С• восточной стены, без свесов ---------- + quad("r_south", [(-TER, 0, Z1), (LX, 0, Z1), (LX, YM, ZR), (-TER, YM, ZR)], roofm, 0.10) + quad("r_north", [(-TER, YM, ZR), (LX, YM, ZR), (LX, LY, Z1), (-TER, LY, Z1)], roofm, 0.10) + box("ridge", -TER, LX, YM - 0.09, YM + 0.09, ZR - 0.02, ZR + 0.08, trim) + + # ---------- терраса ---------- + box("deck", -TER, 0.0, 0.02, LY - 0.02, Z0 - 0.26, Z0 - 0.02, deck_dark) + n = max(1, int(round((LY - 0.04) / 0.15))) + for i in range(n): + y0 = 0.02 + i * ((LY - 0.04) / n) + box("plank_%02d" % i, -TER + 0.02, -0.02, y0 + 0.006, y0 + (LY - 0.04) / n - 0.012, + Z0 - 0.02, Z0 + 0.012, deck_dark) + box("terr_lin_s", -TER + 0.01, -0.01, T, T + 0.02, Z0, Z1, wood) + box("terr_lin_n", -TER + 0.01, -0.01, LY - T - 0.02, LY - T, Z0, Z1, wood) + # стойки: 2 высокие через 2 400 Р С—Р С• Р С”РЎР‚Р В°РЎРЏР С Р В»Р ВµРЎРѓРЎвЂљР Р…Р С‘РЎвЂ РЎвЂ№ — Р Т‘Р С• СЃР°РСРѕР№ кровли + POST1, POST2 = 2.82, 5.22 + def roof_z(y): + return Z1 + RH * (1.0 - abs(y - YM) / YM) + for py in (POST1, POST2): + box("tpost_%d" % int(py * 100), -TER + 0.05, -TER + 0.19, + py - 0.07, py + 0.07, 0.16, roof_z(py) - 0.02, trim) + for py in (1.473, LY - 1.473): + box("spost_%d" % int(py * 100), -TER + 0.05, -TER + 0.15, + py - 0.05, py + 0.05, 0.16, Z0 + 1.20, trim) + + # наличники вызываются как casing_x/casing_y(... , trim) + # ограждение (графит), РїСЂРѕСвЂР С Р С—Р С•Р Т‘ лестницу + for zh in (Z0 + 0.34, Z0 + 0.70, Z0 + 1.06): + box("rail_a_%d" % int(zh * 100), -TER + 0.02, -TER + 0.12, 0.05, POST1, zh, zh + 0.13, trim) + box("rail_b_%d" % int(zh * 100), -TER + 0.02, -TER + 0.12, POST2, LY - 0.05, zh, zh + 0.13, trim) + # ступени Р Сежду стойкаРСР С‘ + for i in range(4): + box("tstep_%d" % i, -TER - 0.32 * (i + 1), -TER - 0.32 * i + 0.02, POST1, POST2, 0.02, Z0 - 0.16 * i, wood) + + # ---------- настил перед РґРѕРСР С•Р С Р С‘ РґРѕСЂРѕР¶РєР° (графит) ---------- + # цоколь зашит бежевым камнем + box("plinth", -TER - 0.08, LX + 0.08, -0.12, LY + 0.12, 0.02, Z0 - 0.24, stone) + box("plinth_tech", TECH_X0 - 0.06, TECH_X1 + 0.06, LY, LY + TECH_D + 0.06, 0.02, Z0 - 0.24, stone) + box("plinth_porch", PORCH_X0 - 0.06, PORCH_X1 + 0.06, -PORCH_D - 0.06, 0.0, 0.02, Z0 - 0.28, stone) + + # настил перед домом: доски поперёк (горизонтально) + pad_x0, pad_x1 = -TER - 4.20, -TER + 0.02 + npad = max(1, int(round((LY + 1.50) / 0.15))) + for i in range(npad): + y0 = -1.50 + i * ((LY + 1.50) / npad) + box("gplank_%03d" % i, pad_x0, pad_x1, y0 + 0.006, y0 + (LY + 1.50) / npad - 0.012, 0.03, 0.16, deck_h) + + + # ---------- дорожка: 10 см от дома, огибает крыльцо, с перилами ---------- + def plank_rect(prefix, x0, x1, y0, y1, along="x"): + w = 0.15 + if along == "x": + n = max(1, int(round((y1 - y0) / w))) + for i in range(n): + yy = y0 + i * ((y1 - y0) / n) + box("%s_%03d" % (prefix, i), x0, x1, yy + 0.006, yy + (y1 - y0) / n - 0.012, 0.03, 0.16, deck_h) + else: + n = max(1, int(round((x1 - x0) / w))) + for i in range(n): + xx = x0 + i * ((x1 - x0) / n) + box("%s_%03d" % (prefix, i), xx + 0.006, xx + (x1 - x0) / n - 0.012, y0, y1, 0.03, 0.16, deck_h) + + def rail_x(name, x0, x1, y): + for zh in (0.34, 0.70, 1.06): + box("%s_r%d" % (name, int(zh * 100)), x0, x1, y - 0.05, y + 0.05, zh, zh + 0.11, trim) + n = max(1, int(round((x1 - x0) / 1.5))) + for i in range(n + 1): + xx = x0 + i * ((x1 - x0) / n) + box("%s_p%d" % (name, i), xx - 0.05, xx + 0.05, y - 0.05, y + 0.05, 0.16, 1.17, trim) + + def rail_y(name, y0, y1, x): + for zh in (0.34, 0.70, 1.06): + box("%s_r%d" % (name, int(zh * 100)), x - 0.05, x + 0.05, y0, y1, zh, zh + 0.11, trim) + n = max(1, int(round((y1 - y0) / 1.5))) + for i in range(n + 1): + yy = y0 + i * ((y1 - y0) / n) + box("%s_p%d" % (name, i), x - 0.05, x + 0.05, yy - 0.05, yy + 0.05, 0.16, 1.17, trim) + + wx0, wx1 = -TER - 4.20, LX + 2.10 + py, PXD = -0.10, 1.20 + pA1 = PORCH_X0 - 1.20 + pB0 = PORCH_X1 + 1.20 + pd0, pd1 = -2.80, -1.60 + + plank_rect("wplankA", wx0, pA1, py - PXD, py, "y") + plank_rect("wplankB", pB0, wx1, py - PXD, py, "y") + plank_rect("wplankL", pA1, PORCH_X0, py - PXD - 1.50, py - PXD, "x") + plank_rect("wplankR", PORCH_X1, pB0, py - PXD - 1.50, py - PXD, "x") + plank_rect("wplankD", PORCH_X0, PORCH_X1, pd0, pd1, "y") + + + + # ---------- крыльцо: выступ Р Р…Р В° СЋРі, лестница РЎРѓ задней стороны, козырСвЂР С” ---------- + box("porch_floor", PORCH_X0, PORCH_X1, -PORCH_D, 0.0, Z0 - 0.26, Z0 - 0.02, deck_dark) + for zh in (Z0 + 0.34, Z0 + 0.70, Z0 + 1.06): + box("p_rail_f_%d" % int(zh * 100), PORCH_X0 + 0.05, PORCH_X1 - 0.05, -PORCH_D + 0.02, -PORCH_D + 0.10, zh, zh + 0.13, trim) + box("p_rail_l_%d" % int(zh * 100), PORCH_X0 + 0.02, PORCH_X0 + 0.10, -PORCH_D + 0.10, -0.10, zh, zh + 0.13, trim) + # ступени РЎРѓ восточной (задней) стороны крыльца + for i in range(4): + box("pstep_%d" % i, PORCH_X1 + 0.32 * i, PORCH_X1 + 0.32 * (i + 1), + -PORCH_D + 0.10, -0.05, 0.02, Z0 - 0.18 * i, wood) + # козырСвЂР С” над Р С”РЎР‚РЎвЂ№Р В»РЎРЉРЎвЂ Р С•Р С + # перила у лестницы крыльца (с двух сторон) + for side, yy in (("a", -PORCH_D + 0.06), ("b", -0.12)): + for i in range(5): + x = PORCH_X1 + 0.32 * i + zt = Z0 - 0.18 * min(i, 3) + 0.95 + box("pst_%s_%d" % (side, i), x - 0.035, x + 0.035, yy - 0.035, yy + 0.035, + max(0.02, Z0 - 0.18 * min(i, 3)), zt, trim) + x0, x1 = PORCH_X1, PORCH_X1 + 1.28 + z0, z1 = Z0 + 0.95, Z0 + 0.23 + quad("pst_rail_%s_hi" % side, [(x0, yy, z0), (x1, yy, z1), (x1, yy, z1 + 0.09), (x0, yy, z0 + 0.09)], trim, 0.06) + quad("pst_rail_%s_lo" % side, [(x0, yy, z0 - 0.42), (x1, yy, z1 - 0.42), (x1, yy, z1 - 0.33), (x0, yy, z0 - 0.33)], trim, 0.05) + + # перила у лестницы крыльца + for side, yy in (("a", -PORCH_D + 0.06), ("b", -0.12)): + for i in range(5): + x = PORCH_X1 + 0.32 * i + zb_i = max(0.02, Z0 - 0.18 * min(i, 3)) + box("pst_%s_%d" % (side, i), x - 0.035, x + 0.035, yy - 0.035, yy + 0.035, + zb_i, zb_i + 0.95, trim) + x0, x1 = PORCH_X1, PORCH_X1 + 1.28 + z0, z1 = Z0 + 0.95, Z0 + 0.23 + quad("pst_rail_%s_hi" % side, + [(x0, yy, z0), (x1, yy, z1), (x1, yy, z1 + 0.09), (x0, yy, z0 + 0.09)], trim, 0.06) + quad("pst_rail_%s_lo" % side, + [(x0, yy, z0 - 0.42), (x1, yy, z1 - 0.42), (x1, yy, z1 - 0.33), (x0, yy, z0 - 0.33)], trim, 0.05) + + quad("porch_roof", [(PORCH_X0 - 0.12, 0.02, Z1 - 0.02), (PORCH_X1 + 0.12, 0.02, Z1 - 0.02), + (PORCH_X1 + 0.12, -PORCH_D - 0.12, Z1 - 0.34), + (PORCH_X0 - 0.12, -PORCH_D - 0.12, Z1 - 0.34)], roofm, 0.08) + for px in (PORCH_X0 + 0.06, PORCH_X1 - 0.06): + box("porch_post_%d" % int(px * 100), px - 0.05, px + 0.05, + -PORCH_D - 0.10, -PORCH_D + 0.00, Z0 - 0.02, Z1 - 0.34, trim) + + # ---------- тех.РїРѕРј. (выступ РЅР° север), скат параллелен кровле ---------- + # тех.пом.: объём с наклонным верхом — продолжение ската дома, стены клик-фальц + slope = RH / YM + tech_pts = [(LY, 0.02), (LY + TECH_D, 0.02), + (LY + TECH_D, Z1 - slope * TECH_D), (LY, Z1)] + tech = prism("tech", tech_pts, TECH_X0, TECH_X1, metal) + quad("tech_roof", [(TECH_X0 - 0.06, LY - 0.12, Z1 + slope * 0.12), (TECH_X1 + 0.06, LY - 0.12, Z1 + slope * 0.12), + (TECH_X1 + 0.06, LY + TECH_D + 0.06, Z1 - slope * (TECH_D + 0.06)), + (TECH_X0 - 0.06, LY + TECH_D + 0.06, Z1 - slope * (TECH_D + 0.06))], roofm, 0.08) + # РѕРєРЅРѕ тех.РїРѕРј. 800Г—1140 (sill 500) РЅР° северном фасаде + tech_win_x0, tech_win_x1 = TECH_X0 + 0.62, TECH_X0 + 1.42 + tw_z0, tw_z1 = Z0 + 0.50, Z0 + 1.64 + cut(tech, tech_win_x0, tech_win_x1, LY + TECH_D - 0.25, LY + TECH_D + 0.25, tw_z0, tw_z1) + box("tech_glass", tech_win_x0, tech_win_x1, LY + TECH_D - 0.06, LY + TECH_D - 0.02, tw_z0, tw_z1, glass) + casing_x("tech_c", tech_win_x0, tech_win_x1, tw_z0, tw_z1, LY + TECH_D + 0.02, trim) + + # ---------- Р·РµРСля ---------- + bpy.ops.mesh.primitive_plane_add(size=160, location=(LX / 2, LY / 2, -0.02)) + bpy.context.object.data.materials.append(gravel) + + # ---------- свет ---------- + w = bpy.data.worlds.new("World") + sc.world = w + w.use_nodes = True + nt = w.node_tree + sky = nt.nodes.new("ShaderNodeTexSky") + sky.sky_type = "NISHITA" + sky.sun_elevation = math.radians(30) + sky.sun_rotation = math.radians(200) + nt.links.new(sky.outputs["Color"], nt.nodes["Background"].inputs["Color"]) + nt.nodes["Background"].inputs["Strength"].default_value = 0.32 + + bpy.ops.object.light_add(type="SUN", location=(-38, 6, 24)) + sun = bpy.context.object + sun.data.energy = 3.0 + sun.data.angle = math.radians(2.5) + sun.rotation_euler = (Vector((LX / 2, LY / 2, 0)) - sun.location).to_track_quat("-Z", "Y").to_euler() + + bpy.ops.object.light_add(type="AREA", location=(-9, LY / 2, 4)) + fl = bpy.context.object + fl.data.energy = 260 + fl.data.size = 12 + fl.rotation_euler = (Vector((1.0, LY / 2, 1.6)) - fl.location).to_track_quat("-Z", "Y").to_euler() + + # ---------- РєР°РСеры Р С‘ рендер ---------- + cd = bpy.data.cameras.new("Cam") + cd.lens = 42 + cam = bpy.data.objects.new("Cam", cd) + bpy.context.collection.objects.link(cam) + sc.camera = cam + + sc.render.engine = "CYCLES" + sc.cycles.device = "CPU" + sc.cycles.samples = 72 + sc.cycles.use_denoising = False + sc.cycles.max_bounces = 6 + sc.render.resolution_x, sc.render.resolution_y = 1200, 760 + sc.view_settings.view_transform = "AgX" + sc.view_settings.exposure = -0.45 + + def shot(name, loc, target): + cam.location = loc + cam.rotation_euler = (Vector(target) - Vector(loc)).to_track_quat("-Z", "Y").to_euler() + sc.render.filepath = os.path.join(OUT, name) + bpy.ops.render.render(write_still=True) + print("render:", name, flush=True) + + shot("render-terrace.png", (-TER - 11.0, YM, 2.4), (0.5, YM, 2.0)) + shot("render-front.png", (-8.0, -9.0, 4.6), (5.0, 4.0, 1.9)) + shot("render-side.png", (LX + 9.5, -9.0, 4.4), (6.2, 4.0, 1.9)) + + # ---------- UV-развёртка РїРѕРґ текстуры (кубическая проекция) ---------- + uv_sizes = {"Olenenok": 1.2, "RAL7024": 2.4, "Roof": 3.2, "DeckGraphite": 1.6, "DeckGraphiteH": 1.6, "PlinthStone": 1.1} + bpy.ops.object.select_all(action="DESELECT") + for _o in bpy.data.objects: + if _o.type == "MESH": + _o.select_set(True) + bpy.context.view_layer.objects.active = _o + bpy.ops.object.transform_apply(location=False, rotation=False, scale=True) + bpy.ops.object.select_all(action="DESELECT") + cd.type = "ORTHO" + cd.ortho_scale = 10.2 + cam.location = (-14.0, YM, 2.9) + cam.rotation_euler = (Vector((0.0, YM, 2.9)) - cam.location).to_track_quat("-Z", "Y").to_euler() + sc.render.resolution_x, sc.render.resolution_y = 1000, 900 + sc.render.filepath = os.path.join(OUT, "render-west-ortho.png") + bpy.ops.render.render(write_still=True) + print("render: render-west-ortho.png", flush=True) + cd.type = "PERSP" + cd.ortho_scale = 10.2 + sc.render.resolution_x, sc.render.resolution_y = 1200, 760 + for o in list(bpy.data.objects): + if o.type != "MESH" or not o.data.materials: + continue + size = uv_sizes.get(o.data.materials[0].name) + if size is None: + continue + bpy.ops.object.select_all(action="DESELECT") + o.select_set(True) + bpy.context.view_layer.objects.active = o + bpy.ops.object.mode_set(mode="EDIT") + bpy.ops.mesh.select_all(action="SELECT") + bpy.ops.uv.cube_project(cube_size=size) + bpy.ops.object.mode_set(mode="OBJECT") + + # UV-фолбэк для текстурных мешей без развёртки + for o in list(bpy.data.objects): + if o.type != "MESH" or not o.data.materials or o.data.uv_layers: + continue + nm = o.data.materials[0].name + if nm not in uv_sizes: + continue + bpy.ops.object.select_all(action="DESELECT") + o.select_set(True) + bpy.context.view_layer.objects.active = o + bpy.ops.object.mode_set(mode="EDIT") + bpy.ops.mesh.select_all(action="SELECT") + bpy.ops.uv.cube_project(cube_size=uv_sizes[nm]) + bpy.ops.object.mode_set(mode="OBJECT") + + + # ================= ИНТЕРЬЕР (в той же сцене) ================= + import json as _json + _poly = _json.load(open(os.path.join(OUT, "room-zones.json"), encoding="utf-8")) + _X0, _Y0, _SX, _SY = 180.0, 173.0, 42.0, 41.4 + ROOMS_M = {} + for _k, _v in _poly.items(): + ROOMS_M[_k] = [((_x - _X0) / _SX, (_y - _Y0) / _SY) for _x, _y in _v] + + ZI = 0.78 # пол интерьера + WHI = 2.55 # высота стен внутри + + TDIR = OUT + _wood = mat_tex("I_FloorWood", os.path.join(TDIR, "tex_int_floor.png"), 0.5) + _tile = mat_tex("I_FloorTile", os.path.join(TDIR, "tex_int_tile.png"), 0.35) + _stone = mat_tex("I_FloorStone", os.path.join(TDIR, "tex_int_stone.png"), 0.45) + _wlight = mat_tex("I_WallLight", os.path.join(TDIR, "tex_int_wall.png"), 0.85) + _wgreen = mat_tex("I_WallGreen", os.path.join(TDIR, "tex_int_green.png"), 0.8) + _wblue = mat_tex("I_WallBlue", os.path.join(TDIR, "tex_int_blue.png"), 0.8) + _wtile = mat_tex("I_TileDark", os.path.join(TDIR, "tex_int_tile.png"), 0.3) + _white = mat("I_White", "F2F2EE", 0.5) + _grey = mat("I_Grey", "8E9A9E", 0.7) + _fabric = mat("I_Fabric", "4A3F45", 0.85) + _furwood = mat("I_FurnWood", "A9825A", 0.6) + _black2 = mat("I_Black", "1E2024", 0.5) + _steel = mat("I_Steel", "9AA3A8", 0.35, 0.7) + _lamp = mat("I_LampWarm", "FFE7C0", 0.4, 0.0) + _b = _lamp.node_tree.nodes["Principled BSDF"] + _b.inputs["Emission Color"].default_value = col("FFD9A0") + _b.inputs["Emission Strength"].default_value = 6.0 + + I_FLOOR = { + "kitchen": _wood, "koridor": _stone, "prihozhaya": _stone, + "tambur": _tile, "kryltso": _wood, "spalnia": _wood, + "danina_komnata": _wood, "kabinet": _wood, "garderob": _wood, + "kladovaia": _tile, "sanuzel": _tile, "tualet": _tile, + "postirochnaia": _tile, "terrasa": _wood, + } + I_WALL = { + "spalnia": _wgreen, "kabinet": _wblue, "sanuzel": _wtile, "tualet": _wtile, + "koridor": _wlight, "kitchen": _wlight, "danina_komnata": _wlight, + "prihozhaya": _wlight, "tambur": _wlight, "garderob": _wlight, + "kladovaia": _wlight, "postirochnaia": _wlight, "terrasa": wood, "kryltso": wood, + } + + def _floor_poly(name, poly, z, th, m): + n = len(poly) + verts = [(x, y, z) for x, y in poly] + [(x, y, z - th) for x, y in poly] + faces = [tuple(range(n)), tuple(n + i for i in range(n)[::-1])] + for i in range(n): + j = (i + 1) % n + faces.append((i, j, n + j, n + i)) + me = bpy.data.meshes.new(name) + me.from_pydata(verts, [], faces) + me.update() + o = bpy.data.objects.new(name, me) + bpy.context.collection.objects.link(o) + o.data.materials.append(m) + return o + + _groups = {} + for _rid, _p in ROOMS_M.items(): + _floor_poly("zone_%s" % _rid, _p, ZI - 0.02, 0.06, I_FLOOR.get(_rid, _wood)) + _floor_poly("ceil_%s" % _rid, _p, ZI + WHI + 0.06, 0.06, _wlight) + _cx = sum(q[0] for q in _p) / len(_p) + _cy = sum(q[1] for q in _p) / len(_p) + box("ilamp_%s" % _rid, _cx - 0.15, _cx + 0.15, _cy - 0.15, _cy + 0.15, + ZI + WHI - 0.06, ZI + WHI, _lamp) + + def _bbox(rid): + p = ROOMS_M[rid] + return (min(q[0] for q in p), max(q[0] for q in p), + min(q[1] for q in p), max(q[1] for q in p)) + + # спальня + x0, x1, y0, y1 = _bbox("spalnia") + box("ib_bed", x0 + 0.4, x0 + 2.2, y0 + 1.2, y0 + 3.2, ZI + 0.1, ZI + 0.55, _grey) + box("ib_bed_t", x0 + 0.45, x0 + 2.15, y0 + 1.25, y0 + 3.15, ZI + 0.55, ZI + 0.62, _fabric) + box("ib_head", x0 + 0.4, x0 + 2.2, y0 + 3.1, y0 + 3.2, ZI + 0.55, ZI + 1.15, _grey) + box("ib_ward", x1 - 0.65, x1 - 0.05, y0 + 0.3, y0 + 2.9, ZI, ZI + 2.2, _white) + + # кухня-гостиная + x0, x1, y0, y1 = _bbox("kitchen") + box("ik_table", x0 + 1.4, x0 + 2.6, y0 + 0.9, y0 + 1.9, ZI + 0.72, ZI + 0.76, _furwood) + for i in range(4): + box("ik_ch_%d" % i, x0 + 1.55 + i * 0.35, x0 + 1.85 + i * 0.35, y0 + 0.6, y0 + 0.9, + ZI, ZI + 0.45, _black2) + box("ik_sofa", x0 + 0.4, x0 + 2.4, y0 + 3.2, y0 + 4.2, ZI, ZI + 0.45, _fabric) + box("ik_island", x0 + 2.9, x0 + 3.5, y0 + 0.4, y0 + 2.6, ZI, ZI + 0.9, _white) + box("ik_tv", x0 + 0.5, x0 + 1.9, y0 + 5.6, y0 + 5.75, ZI + 0.5, ZI + 1.1, _black2) + + # кабинет + x0, x1, y0, y1 = _bbox("kabinet") + box("io_desk", x0 + 0.5, x0 + 2.5, y0 + 0.5, y0 + 1.1, ZI + 0.7, ZI + 0.74, _furwood) + box("io_ch", x0 + 1.2, x0 + 1.6, y0 + 1.2, y0 + 1.6, ZI, ZI + 0.5, _black2) + box("io_shelf", x1 - 0.5, x1 - 0.1, y0 + 0.4, y0 + 3.4, ZI, ZI + 2.0, _white) + + # санузел + x0, x1, y0, y1 = _bbox("sanuzel") + box("ib_bath", x1 - 0.9, x1 - 0.1, y0 + 0.4, y0 + 2.1, ZI, ZI + 0.55, _white) + box("ib_van", x0 + 0.3, x0 + 1.0, y0 + 1.6, y0 + 2.4, ZI, ZI + 0.85, _furwood) + box("ib_sink", x0 + 0.35, x0 + 0.95, y0 + 1.7, y0 + 2.3, ZI + 0.85, ZI + 0.95, _white) + + # комната 12,04 + x0, x1, y0, y1 = _bbox("danina_komnata") + box("id_bed", x0 + 0.3, x0 + 1.8, y0 + 1.0, y0 + 3.0, ZI + 0.1, ZI + 0.55, _grey) + box("id_desk", x0 + 2.2, x1 - 0.2, y0 + 0.4, y0 + 1.0, ZI + 0.7, ZI + 0.74, _furwood) + + # двери + _hx = sum(q[0] for q in ROOMS_M["koridor"]) / len(ROOMS_M["koridor"]) + _hy = sum(q[1] for q in ROOMS_M["koridor"]) / len(ROOMS_M["koridor"]) + for _rid, _p in ROOMS_M.items(): + if _rid in ("koridor", "terrasa", "kryltso", "kitchen"): + continue + _n = len(_p) + _best = None + for _i in range(_n): + _ax, _ay = _p[_i] + _bx, _by = _p[(_i + 1) % _n] + if math.hypot(_bx - _ax, _by - _ay) < 0.9: + continue + _mx, _my = (_ax + _bx) / 2, (_ay + _by) / 2 + _d = (_mx - _hx) ** 2 + (_my - _hy) ** 2 + if _best is None or _d < _best[0]: + _best = (_d, _ax, _ay, _bx, _by, _mx, _my) + if not _best: + continue + _, _ax, _ay, _bx, _by, _mx, _my = _best + _dx, _dy = _bx - _ax, _by - _ay + _L = math.hypot(_dx, _dy) or 1.0 + _ux, _uy = _dx / _L, _dy / _L + if abs(_ux) > abs(_uy): + box("idoor_%s" % _rid, _mx - 0.45, _mx + 0.45, _my - 0.03, _my + 0.03, + ZI + 0.02, ZI + 2.05, _white) + else: + box("idoor_%s" % _rid, _mx - 0.03, _mx + 0.03, _my - 0.45, _my + 0.45, + ZI + 0.02, ZI + 2.05, _white) + + # перегородки по границам комнат + for _rid, _p in ROOMS_M.items(): + _n = len(_p) + for _i in range(_n): + _ax, _ay = _p[_i] + _bx, _by = _p[(_i + 1) % _n] + if math.hypot(_bx - _ax, _by - _ay) < 0.2: + continue + _mx, _my = (_ax + _bx) / 2, (_ay + _by) / 2 + _dx, _dy = _bx - _ax, _by - _ay + if abs(_dx) > abs(_dy): + box("ipart_%s_%d" % (_rid, _i), min(_ax, _bx), max(_ax, _bx), + _my - 0.05, _my + 0.05, ZI, ZI + WHI, I_WALL.get(_rid, _wlight)) + else: + box("ipart_%s_%d" % (_rid, _i), _mx - 0.05, _mx + 0.05, + min(_ay, _by), max(_ay, _by), ZI, ZI + WHI, I_WALL.get(_rid, _wlight)) + + # UV для текстур интерьера + _uv = {"I_FloorWood": 1.2, "I_FloorTile": 1.0, "I_WallLight": 1.5, + "I_WallGreen": 0.9, "I_TileDark": 0.8, "I_WallBlue": 0.9, "I_FloorStone": 1.0} + bpy.ops.object.select_all(action="DESELECT") + for _o in bpy.data.objects: + if _o.type != "MESH" or not _o.data.materials: + continue + _sz = _uv.get(_o.data.materials[0].name) + if _sz is None: + continue + _o.select_set(True) + bpy.context.view_layer.objects.active = _o + bpy.ops.object.transform_apply(location=False, rotation=False, scale=True) + bpy.ops.object.mode_set(mode="EDIT") + bpy.ops.mesh.select_all(action="SELECT") + bpy.ops.uv.cube_project(cube_size=_sz) + bpy.ops.object.mode_set(mode="OBJECT") + _o.select_set(False) + print("интерьер добавлен", flush=True) + # ================= /ИНТЕРЬЕР ================= + + for o in list(bpy.data.objects): + if o.type == "MESH" and o.name.startswith("Plane"): + bpy.data.objects.remove(o, do_unlink=True) + bpy.ops.object.select_all(action="SELECT") + glb = os.path.join(OUT, "house.glb") + bpy.ops.export_scene.gltf(filepath=glb, export_format="GLB", export_apply=True, + use_selection=True, export_yup=True) + print("glb:", os.path.getsize(glb), flush=True) + print("done") + + +if __name__ == "__main__": + main() + + + + + diff --git a/ops/home/plans/render-front.png b/ops/home/plans/render-front.png index ec72512..c209579 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 e8d9acd..47e0edf 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 8baf49b..196199e 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 cdfc4e1..06fbca2 100644 Binary files a/ops/home/plans/render-west-ortho.png and b/ops/home/plans/render-west-ortho.png differ diff --git a/ops/home/tablet-card.js b/ops/home/tablet-card.js new file mode 100644 index 0000000..04b669b --- /dev/null +++ b/ops/home/tablet-card.js @@ -0,0 +1,294 @@ +/* Панель для настенного планшета (Galaxy Tab S5e, 2560×1600, горизонтально). + * Принципы: без прокрутки, тач-цели ≥ 64px, цвет только для состояния, + * слева — план дома как селектор комнаты, справа — крупные органы управления. + */ +const ZONES = { + terrasa: [[180,173],[283,173],[283,529],[180,529]], + kitchen: [[291,172],[424,172],[424,296],[439,296],[439,349],[439,522],[291,524]], + postirochnaia: [[426,113],[497,115],[497,221],[426,221]], + sanuzel: [[501,170],[501,223],[426,225],[426,294],[479,296],[557,294],[557,172]], + tualet: [[557,236],[608,236],[608,294],[557,292]], + garderob: [[559,171],[559,231],[654,233],[654,173]], + kladovaia: [[610,235],[654,235],[654,293],[608,293]], + koridor: [[439,294],[439,349],[685,347],[683,296]], + prihozhaya: [[439,349],[515,349],[512,442],[441,440]], + kabinet: [[657,176],[654,294],[683,294],[685,345],[787,347],[787,176],[657,174]], + danina_komnata: [[515,351],[632,351],[630,520],[517,522]], + spalnia: [[637,349],[787,345],[787,524],[637,524]], + kryltso: [[439,529],[441,593],[521,593],[521,529]], + tambur: [[444,445],[512,442],[515,524],[441,524]], +}; +const ROOM_NAMES = { + kitchen: "Кухня-гостиная", koridor: "Холл", spalnia: "Спальня", + danina_komnata: "Комната Дани", kabinet: "Кабинет", sanuzel: "Санузел", + tualet: "Туалет", garderob: "Гардеробная", kladovaia: "Постирочная", + tambur: "Тамбур", prihozhaya: "Прихожая", postirochnaia: "Серверная", + terrasa: "Терраса", kryltso: "Крыльцо", +}; +const ROOM_ORDER = ["kitchen", "koridor", "spalnia", "danina_komnata", "kabinet", + "sanuzel", "tualet", "garderob", "kladovaia", "tambur", "prihozhaya", + "postirochnaia", "terrasa", "kryltso"]; + +class TabletCard extends HTMLElement { + constructor() { + super(); + this._areas = []; + this._ent2area = {}; + this._selected = "kitchen"; + this._loaded = false; + this._busy = false; + this.attachShadow({ mode: "open" }); + } + + setConfig(config) { this._config = config || {}; } + + set hass(hass) { + this._hass = hass; + if (!this._loaded) { this._loaded = true; this._load(); } + else if (!this._busy) this._render(); + } + + async _load() { + try { + const [areas, devices, entities] = await Promise.all([ + this._hass.callWS({ type: "config/area_registry/list" }), + this._hass.callWS({ type: "config/device_registry/list" }), + this._hass.callWS({ type: "config/entity_registry/list" }), + ]); + this._areas = areas; + const devArea = {}; + for (const d of devices) if (d.area_id) devArea[d.id] = d.area_id; + this._ent2area = {}; + for (const e of entities) { + const a = e.area_id || devArea[e.device_id]; + if (a) this._ent2area[e.entity_id] = a; + } + } catch (e) { this._err = String(e); } + this._render(); + } + + _of(area) { + return Object.entries(this._ent2area).filter(([, a]) => a === area) + .map(([e]) => e).filter((e) => this._hass.states[e]); + } + + _on(area) { + return this._of(area).filter((e) => { + const s = this._hass.states[e]; + return /^light\.|^switch\./.test(e) && s.state === "on"; + }).length; + } + + _call(domain, service, data) { + this._busy = true; + this._hass.callService(domain, service, data).finally(() => { + this._busy = false; + this._render(); + }); + } + + _plan() { + const px = ([x, y]) => `${x},${y}`; + return ``; + } + + _tiles(area) { + const ens = this._of(area); + const groups = {}; + for (const e of ens) (groups[e.split(".")[0]] ||= []).push(e); + const out = []; + const st = (e) => this._hass.states[e]; + + for (const e of groups.light || []) { + const s = st(e); + const on = s.state === "on"; + const br = s.attributes.brightness ? Math.round(s.attributes.brightness / 255 * 100) : 100; + out.push(`