diff --git a/ops/home/plans/house-web-v54.glb b/ops/home/plans/house-web-v54.glb new file mode 100644 index 0000000..89955ed Binary files /dev/null and b/ops/home/plans/house-web-v54.glb differ diff --git a/ops/home/plans/house.glb b/ops/home/plans/house.glb index 5ebe3ec..89955ed 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 a8acfd0..8e1c4da 100644 --- a/ops/home/plans/house_full.py +++ b/ops/home/plans/house_full.py @@ -566,8 +566,13 @@ def main(): _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 = {} + # план: x от края террасы, y от северной стены; + # дом: x от стены блока (терраса -2.45..0), y от южной стены + _TER = 2.45 + _LY = 8.60 for _k, _v in _poly.items(): - ROOMS_M[_k] = [((_x - _X0) / _SX, (_y - _Y0) / _SY) for _x, _y in _v] + ROOMS_M[_k] = [round((_x - _X0) / _SX - _TER, 3) for _x, _y in _v] + ROOMS_M[_k] = [((_x - _X0) / _SX - _TER, _LY - (_y - _Y0) / _SY) for _x, _y in _v] ZI = 0.78 # пол интерьера WHI = 2.55 # высота стен внутри diff --git a/ops/home/plans/render-front.png b/ops/home/plans/render-front.png index c209579..534c664 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 47e0edf..7f27572 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 196199e..670b72b 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 06fbca2..019fec8 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/plans/v54-outside.png b/ops/home/plans/v54-outside.png new file mode 100644 index 0000000..b834701 Binary files /dev/null and b/ops/home/plans/v54-outside.png differ diff --git a/ops/home/plans/v54-top.png b/ops/home/plans/v54-top.png new file mode 100644 index 0000000..d71db42 Binary files /dev/null and b/ops/home/plans/v54-top.png differ