@adatechnology/game-floorplan 0.3.0 → 0.3.2

package/dist/index.js

@@ -460,6 +460,7 @@ var STEP = 0.05;
 var MAX_CANDIDATES = 80;
 function carCandidates(slot, item, car) {
   const front = [slot.frontU, slot.frontV];
+  if (!slot._cell) throw new Error("Slot without a cell: " + slot.id);
   const zone = slot._cell.R;
   const alongV = Math.abs(front[1]) === 1;
   const [extentU, extentV] = extent([item.w, item.d], front);
@@ -685,6 +686,7 @@ function candidatesOf(cats) {
 }
 function itemRect(slot, it, shift) {
   const c = slot._cell;
+  if (!c) throw new Error("Slot without a cell: " + slot.id);
   const f = c.f;
   const [extentU, extentV] = extent([it.w, it.d], f);
   const R = c.R;
@@ -789,7 +791,7 @@ function fillRoom(plan, room, slots2, rng) {
       if (!parent) return null;
       for (const { it } of cands) {
         if (it.w > parent.w + EPS || it.d > parent.d + EPS) continue;
-        const f = [parent.frontU, parent.frontV];
+        const f = [parent.frontU ?? 0, parent.frontV ?? 1];
         const r = parent.aabb;
         const [extentU, extentV] = extent([it.w, it.d], f);
         const cu = (r[0] + r[2]) / 2 - f[0] * (parent.d / 2 - it.d / 2);
@@ -823,7 +825,7 @@ function fillRoom(plan, room, slots2, rng) {
         if (!car && !relax && s.clearance > 0 && !it.low) {
           cl2 = clearRect(r3, f, s.clearance);
           if (!insideUnion(cl2, inners)) continue;
-          if (items.some((m2) => !m2.low && !m2.flat && !m2.on && overlaps(cl2, m2._r))) continue;
+          if (items.some((m2) => !m2.low && !m2.flat && !m2.on && overlaps(cl2, m2._r ?? m2.aabb))) continue;
         }
         if (!it.low && reserves.some((q) => overlaps(r3, q))) continue;
         let rimRect2 = null;
@@ -1011,7 +1013,7 @@ function createPlacementContext(plan, items) {
         if (!(opts.without && opts.without(r))) return r;
         continue;
       }
-      if (occupied.some((m) => !m.low && !m.flat && !m.on && !m.decor && m.clearance > 0 && overlaps(r, clearRect(m._r, [m.frontU, m.frontV], m.clearance)))) continue;
+      if (occupied.some((m) => !m.low && !m.flat && !m.on && !m.decor && (m.clearance ?? 0) > 0 && overlaps(r, clearRect(m._r, [m.frontU ?? 0, m.frontV ?? 1], m.clearance ?? 0)))) continue;
       if (opts.without && opts.without(r)) continue;
       if (!reachable(opts.railing || gridOf(room), solidList.concat([r]), room.outdoor ? 0.16 : plan.playerRadius)) continue;
       return r;
@@ -1278,7 +1280,7 @@ function checkLot(zoneIn, lot, plan) {
   const far = m.built / area;
   if (far > zone.maxFar + 1e-9) out.push({ rule: "far", actual: r2(far), limit: zone.maxFar });
   let permeable = 0;
-  for (const z of lot.zones) if (registries().PERMEABLE_GROUNDS.has(z.ground)) for (const p of z.parts) permeable += (p[2] - p[0]) * (p[3] - p[1]);
+  for (const z of lot.zones) if (z.ground && registries().PERMEABLE_GROUNDS.has(z.ground)) for (const p of z.parts) permeable += (p[2] - p[0]) * (p[3] - p[1]);
   const permeability = permeable / area;
   if (permeability < zone.permeableMin - 1e-9) out.push({ rule: "permeable", actual: r2(permeability), limit: zone.permeableMin });
   return out;
@@ -1321,12 +1323,12 @@ function enforcePermeability(lot, zones, zone, adjustments) {
   const [u0, v0, u1, v1] = lot.rect;
   const area = (u1 - u0) * (v1 - v0);
   const areaOfZone = (z) => z.parts.reduce((s, p) => s + (p[2] - p[0]) * (p[3] - p[1]), 0);
-  let permeable = zones.filter((z) => registries().PERMEABLE_GROUNDS.has(z.ground)).reduce((s, z) => s + areaOfZone(z), 0);
+  let permeable = zones.filter((z) => z.ground != null && registries().PERMEABLE_GROUNDS.has(z.ground)).reduce((s, z) => s + areaOfZone(z), 0);
   if (permeable / area >= zone.permeableMin) return;
-  const candidates = zones.filter((z) => ADJUSTABLE_ZONES.has(z.type) && !registries().PERMEABLE_GROUNDS.has(z.ground)).sort((a, b) => areaOfZone(b) - areaOfZone(a));
+  const candidates = zones.filter((z) => ADJUSTABLE_ZONES.has(z.type) && !(z.ground != null && registries().PERMEABLE_GROUNDS.has(z.ground))).sort((a, b) => areaOfZone(b) - areaOfZone(a));
   for (const z of candidates) {
     if (permeable / area >= zone.permeableMin) break;
-    adjustments.push({ field: "ground:" + z.id, from: z.ground, to: target, reason: "permeable_min" });
+    adjustments.push({ field: "ground:" + z.id, from: z.ground ?? "", to: target, reason: "permeable_min" });
     z.ground = target;
     permeable += areaOfZone(z);
   }
@@ -1595,9 +1597,9 @@ function buildLot(plan, tpl, w, d, op, style, styleId, bc) {
       height: type === "pedestrian" ? style.height : Math.min(style.height, 2.2),
       side,
       to: toTarget || null,
-      material: "iron"
+      material: "iron",
+      zones: openingZones(u, v, "u", width, openingDepth(width, type === "pedestrian" ? width : 0))
     };
-    g.zones = openingZones(u, v, "u", width, openingDepth(width, type === "pedestrian" ? width : 0));
     gates.push(g);
     return g;
   };
@@ -1884,7 +1886,7 @@ function resolveSlot(plan, room, def, byId, zones) {
   };
   const invalid = (m) => Object.assign(base, { valid: false, reason: m, x: 0, z: 0, ry: 0, w: 0, d: 0, frontU: 0, frontV: 1, aabb: [0, 0, 0, 0], _cell: null });
   if (def.anchor === "on" || def.anchor === "inside") {
-    const parent = byId[def.parent];
+    const parent = def.parent ? byId[def.parent] : void 0;
     if (!parent || !parent.valid) return invalid("invalid_parent");
     return Object.assign(base, { x: parent.x, z: parent.z, ry: parent.ry, w: parent.w, d: parent.d, frontU: parent.frontU, frontV: parent.frontV, aabb: parent.aabb, _cell: parent._cell });
   }
@@ -1925,9 +1927,10 @@ function resolveSlot(plan, room, def, byId, zones) {
       const windowList = windowsOfRoom(plan, room);
       win = windowList[def.n];
       if (!win) return invalid("no_window");
+      const found2 = win;
       side = room.outdoor ? SIDE_OPPOSITE[win.side] : WINDOW_SIDE[win.side];
       const cand = room.parts.map(inner).find(
-        (r) => (win.axis === "u" ? win.u >= r[0] - TOL && win.u <= r[2] + TOL : win.v >= r[1] - TOL && win.v <= r[3] + TOL) && (side === "left" && eq(r[0], win.pos + MARGIN) || side === "right" && eq(r[2], win.pos - MARGIN) || side === "front" && eq(r[1], win.pos + MARGIN) || side === "back" && eq(r[3], win.pos - MARGIN))
+        (r) => (found2.axis === "u" ? found2.u >= r[0] - TOL && found2.u <= r[2] + TOL : found2.v >= r[1] - TOL && found2.v <= r[3] + TOL) && (side === "left" && eq(r[0], found2.pos + MARGIN) || side === "right" && eq(r[2], found2.pos - MARGIN) || side === "front" && eq(r[1], found2.pos + MARGIN) || side === "back" && eq(r[3], found2.pos - MARGIN))
       );
       if (!cand) return invalid("window_outside_room");
       R = cand;
@@ -2121,7 +2124,7 @@ function generate(template, options) {
     if (m.category) out.color = colorOf(m, seed);
     return out;
   });
-  const result = {
+  const base = {
     template: tpl.id,
     name: translate("templates", tpl.id, locale),
     use: useOf(tpl),
@@ -2158,8 +2161,8 @@ function generate(template, options) {
     building: tpl.building ? tpl.building(plan.w, plan.d, op) : null,
     missing
   };
-  if (tpl.singleFloor) result.floorNumber = op.floor || 3;
-  result.partyWalls = tpl.partyWalls || [];
+  if (tpl.singleFloor) base.floorNumber = op.floor || 3;
+  const result = Object.assign(base, { partyWalls: tpl.partyWalls || [] });
   if (plan.config) result.config = plan.config;
   runResultExtensions(plan, result, seed, op);
   if (zone) {