@adatechnology/game-floorplan-three 0.5.0 → 0.6.0

package/dist/index.js

@@ -6030,7 +6030,7 @@ function installLightsRoomLight(K, shared) {
 
 // src/destruction/pieces.ts
 import { assemblyPart, getAssembly } from "@adatechnology/game-destruction";
-import { DENSITY, toDestructibleSpec } from "@adatechnology/game-floorplan-structure";
+import { DENSITY, MEMBER_CAGE, toDestructibleSpec } from "@adatechnology/game-floorplan-structure";
 
 // src/destruction/panels.ts
 import { resolveSlabPanels, slabPanelView } from "@adatechnology/game-floorplan-structure";
@@ -6210,7 +6210,11 @@ function installDestructionPieces(K, shared) {
           if (!pc || pc.unit) return sp;
           if (pc.role !== "wall" && pc.role !== "partition") {
             const def = getAssembly(pc.assembly || (pc.material === "concrete" && ["slab", "beam", "column", "stair"].includes(pc.role) ? "reinforced_concrete" : ""));
-            return def && def.reinforcement && !sp.reinforcement ? { ...sp, reinforcement: { ...def.reinforcement } } : sp;
+            const out = def && def.reinforcement && !sp.reinforcement ? { ...sp, reinforcement: { ...def.reinforcement } } : sp;
+            if (out.reinforcement && !out.units && pc.material === "concrete" && (pc.role === "beam" || pc.role === "column") && sp.shape.kind === "box") {
+              return { ...out, units: { size: [MEMBER_CAGE.unit, MEMBER_CAGE.unit, Math.min(...sp.shape.size)], bond: "stack", mortar: "concrete" } };
+            }
+            return out;
           }
           if (!pc.assembly) return sp;
           const [u0, v0, u1, v1] = pc.aabb, alongU = u1 - u0 >= v1 - v0;
@@ -6306,29 +6310,44 @@ function installDestructionBreach(K, _shared) {
       }
       return list;
     }
+    const specOf = (id) => opts.spec()?.parts?.find((q) => q.id === id);
+    const same = (a, b) => a.every((x, k) => Math.abs(x - b[k]) < 1e-3);
+    function hostOf(partId) {
+      if (structure.meshesOf(partId).some((it) => it.mesh)) return partId;
+      const part = structure.byId.get(partId);
+      if (!part) return null;
+      for (const q of structure.parts) {
+        if (q.id !== partId && same(q.aabb, part.aabb) && Math.abs(q.y1 - part.y0) < 0.01 && structure.meshesOf(q.id).some((it) => it.mesh)) return q.id;
+      }
+      return null;
+    }
+    const riders = (hostId) => structure.parts.filter((q) => q.id !== hostId && specOf(q.id)?.units && hostOf(q.id) === hostId && !structure.meshesOf(q.id).some((it) => it.mesh)).map((q) => q.id);
     function draw2(partId, change) {
       if (lod !== 0) return false;
-      const part = structure.byId.get(partId);
-      const spec = opts.spec()?.parts?.find((q) => q.id === partId);
-      if (!part || !spec || !spec.units) return false;
-      let view = views.get(partId);
+      const hostId = hostOf(partId);
+      if (!hostId || !specOf(partId)?.units) return false;
+      let view = views.get(hostId);
       if (!view) {
-        const items = structure.meshesOf(partId).filter((it) => it.mesh);
+        const items = structure.meshesOf(hostId).filter((it) => it.mesh);
         if (!items.length) return false;
-        view = { mesh: null, saved: null, items, paint: wallColour(items), units: 0, opening: null, chips: [] };
+        const parts = [hostId, ...riders(hostId)].filter((id) => structure.byId.get(id) && specOf(id)?.units);
+        view = { mesh: null, saved: null, items, paint: wallColour(items), units: 0, opening: null, chips: new Map(parts.map((id) => [id, []])), openings: /* @__PURE__ */ new Map() };
       }
+      if (!view.chips.has(partId)) return false;
       if (change.opening) {
-        if (view.opening) return false;
-        view.opening = { center: local(change.opening.center), radius: change.opening.radius };
+        if (view.openings.has(partId)) return false;
+        view.openings.set(partId, { center: local(change.opening.center), radius: change.opening.radius });
+        if (partId === hostId) view.opening = view.openings.get(partId);
       }
-      if (change.chip) view.chips.push(local(change.chip));
-      const list = courses(part, spec.units, view.opening, view.chips, view.paint);
+      if (change.chip) view.chips.get(partId).push(local(change.chip));
+      const list = [];
+      for (const [id, chips] of view.chips) list.push(...courses(structure.byId.get(id), specOf(id).units, view.openings.get(id) ?? null, chips, view.paint));
       if (view.mesh) {
         view.mesh.removeFromParent();
         view.mesh.dispose();
       }
       const mesh = new THREE.InstancedMesh(unitGeometry, unitMaterial, Math.max(1, list.length));
-      mesh.name = "breach:" + partId;
+      mesh.name = "breach:" + hostId;
       list.forEach((u, i) => {
         tmp.m.compose(tmp.p.set(u.x, u.y, u.z), tmp.q.identity(), tmp.s.set(u.sx, u.sy, u.sz));
         mesh.setMatrixAt(i, tmp.m);
@@ -6343,7 +6362,7 @@ function installDestructionBreach(K, _shared) {
       if (!view.saved) view.saved = view.items.map((it) => ({ it, v0: it.v0, data: collapseRange(it.mesh, it.v0, it.v1) }));
       view.mesh = mesh;
       view.units = list.length;
-      views.set(partId, view);
+      views.set(hostId, view);
       invalidate();
       invalidateShadow();
       return true;
@@ -8515,6 +8534,7 @@ function createFloorplanTestModule(options = {}) {
   return {
     id: FLOORPLAN_AREA_ID,
     name: text.name,
+    ground: { surface: "lawn" },
     group: text.group,
     get houses() {
       return placed;
@@ -8622,6 +8642,9 @@ import { inferJoints } from "@adatechnology/game-destruction";
 import { markKitOrigin as markKitOrigin2 } from "@adatechnology/game-contracts";
 import { residentialItems } from "@adatechnology/game-floorplan-residential";
 var WOOD_THIN = 0.035;
+var BOARD_TOP_THICK = 0.07;
+var BOARD_TOP_WIDTH = 0.5;
+var BOARD_WIDTH = 0.16;
 var SHELF_SPAN = 1.5;
 var SHELVING = /shelf|bookcase|rack/;
 function carcass(parts, drawn) {
@@ -8636,6 +8659,39 @@ function carcass(parts, drawn) {
     } else if (y <= x && y <= z) part.structure = { role: "beam", maxSpan: SHELF_SPAN * Math.max(x, z) };
   }
 }
+function splitTopsIntoBoards(drawn, materialOf, carcassed) {
+  const tops = /* @__PURE__ */ new Map();
+  if (carcassed) return tops;
+  for (let i = drawn.length - 1; i >= 0; i--) {
+    const p = drawn[i];
+    if (p.key !== "wood" || materialOf.wood !== "wood_hard" || p.shape.kind !== "box" || p.rotation) continue;
+    const [sx, sy, sz] = p.shape.size;
+    const across = sx < sz ? 0 : 2;
+    const width = Math.min(sx, sz);
+    if (sy < WOOD_THIN || sy > BOARD_TOP_THICK || sy >= width || width < BOARD_TOP_WIDTH) continue;
+    const count = Math.round(width / BOARD_WIDTH);
+    const boards = [];
+    for (let b = 0; b < count; b++) {
+      const size = [sx, sy, sz];
+      size[across] = width / count;
+      const position = [...p.position];
+      position[across] += (b + 0.5) * size[across] - width / 2;
+      const min = [...p.min];
+      const max = [...p.max];
+      min[across] = position[across] - size[across] / 2;
+      max[across] = position[across] + size[across] / 2;
+      boards.push({ ...p, id: `${p.id}_b${b}`, shape: { kind: "box", size }, position, min, max, color: shadeBoard(p.color, b) });
+    }
+    drawn.splice(i, 1, ...boards);
+    tops.set(p.id, boards);
+  }
+  return tops;
+}
+function shadeBoard(color, board) {
+  const k = [1, 0.94, 1.05, 0.97, 1.03][board % 5];
+  const channel = (shift) => Math.min(255, Math.round((color >> shift & 255) * k)) << shift;
+  return channel(16) | channel(8) | channel(0);
+}
 var FLOOR_TOUCH = 5e-3;
 var LOOSE = /* @__PURE__ */ new Set(["paper"]);
 var BASE_MATERIAL = {
@@ -8713,10 +8769,12 @@ function recordSpec(THREE, name, root, run, opts) {
   };
   run(A);
   if (!drawn.length) throw new Error(`game-floorplan-three: the builder of "${name}" drew no box or cylinder`);
+  const boardsOf = splitTopsIntoBoards(drawn, materialOf, Boolean(opts.carcass));
   const parts = drawn.map((p) => {
     const thin = Math.min(...p.shape.kind === "box" ? p.shape.size : p.shape.kind === "cylinder" ? [p.shape.radius * 2, p.shape.height] : [p.shape.radius * 2]);
     let material = materialOf[p.key] ?? "plastic";
-    if (p.key === "wood" && material === "wood_hard" && thin < WOOD_THIN) material = "wood_soft";
+    if (p.key === "wood" && material === "wood_hard" && opts.carcass && !opts.materials?.wood) material = "mdf";
+    else if (p.key === "wood" && material === "wood_hard" && thin < WOOD_THIN) material = "wood_soft";
     const part = { id: p.id, material, shape: p.shape, position: p.position };
     if (p.rotation) part.rotation = p.rotation;
     if (!LOOSE.has(material) && p.min[1] <= FLOOR_TOUCH) part.anchored = true;
@@ -8751,6 +8809,13 @@ function recordSpec(THREE, name, root, run, opts) {
     if (area < 0.6 * footprint || p.max[1] < 0.2) continue;
     if (!top || p.max[1] > top.y + 1e-6) top = { part: p.id, y: p.max[1] };
   }
+  for (const boards of boardsOf.values()) {
+    if (top && boards[0].max[1] <= top.y - 1e-6) continue;
+    const mid = boards[boards.length >> 1];
+    const min = [Math.min(...boards.map((b) => b.min[0])), Math.min(...boards.map((b) => b.min[2]))];
+    const max = [Math.max(...boards.map((b) => b.max[0])), Math.max(...boards.map((b) => b.max[2]))];
+    if ((max[0] - min[0]) * (max[1] - min[1]) >= 0.6 * footprint && mid.max[1] >= 0.2) top = { part: mid.id, y: mid.max[1], parts: boards.map((b) => b.id) };
+  }
   if (opts.carcass) carcass(parts, byId);
   const spec = { name, parts, joints, tags: ["furniture"] };
   const colors = new Map(drawn.map((p) => [p.id, p.color]));