@adatechnology/game-vegetation-three 0.3.0 → 0.3.1

package/dist/index.global.js

@@ -41,7 +41,7 @@ var GameVegetationThree = (() => {
     scatterLot: () => scatterLot
   });
 
-  // ../game-shapes/dist/chunk-IFXQIDSA.js
+  // ../game-shapes/dist/chunk-M5N2SHNL.js
   function canonicalJson(value) {
     if (value === null) return "null";
     if (typeof value === "number") return Object.is(value, -0) ? "-0" : Number.isFinite(value) ? String(value) : JSON.stringify(String(value));
@@ -1288,8 +1288,8 @@ var GameVegetationThree = (() => {
       groups: []
     };
   }
-  function make(kind, p) {
-    switch (kind) {
+  function make(p) {
+    switch (p.kind) {
       case "box": {
         const size = p.size ?? [1, 1, 1];
         const segments = p.segments ?? [1, 1, 1];
@@ -1318,7 +1318,7 @@ var GameVegetationThree = (() => {
       case "mesh":
         return mesh(p);
       default:
-        throw new Error(`game-shapes: unknown primitive kind "${String(kind)}"`);
+        throw new Error(`game-shapes: unknown primitive kind "${String(p.kind)}"`);
     }
   }
   var templates = /* @__PURE__ */ new Map();
@@ -1326,7 +1326,7 @@ var GameVegetationThree = (() => {
   var stats = { hits: 0, misses: 0 };
   function buildPrimitive(node, options = {}) {
     const parameters = primitiveParameters(node, options);
-    if (node.kind === "mesh" || templateLimit === 0) return make(node.kind, parameters);
+    if (node.kind === "mesh" || templateLimit === 0) return make({ ...node, ...parameters });
     const key = `${node.kind}:${canonicalJson(parameters)}`;
     const cached = templates.get(key);
     if (cached) {
@@ -1336,7 +1336,7 @@ var GameVegetationThree = (() => {
       return cached;
     }
     stats.misses++;
-    const built = make(node.kind, parameters);
+    const built = make({ ...node, ...parameters });
     templates.set(key, built);
     if (templates.size > templateLimit) templates.delete(templates.keys().next().value);
     return built;
@@ -1721,7 +1721,7 @@ var GameVegetationThree = (() => {
     validateSpec: () => validateSpec
   });
 
-  // ../game-vegetation/dist/chunk-WNYTFZR4.js
+  // ../game-vegetation/dist/chunk-CJRLKDWB.js
   var __defProp2 = Object.defineProperty;
   var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
   var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -9502,6 +9502,7 @@ gl_Position = projectionMatrix * mvPosition;
   }
 
   // src/test-area/nursery.ts
+  var isMesh = (o) => o.isMesh === true;
   var LOT = { W: 12, D: 20 };
   var HOUSE = { x0: 2.5, x1: 9.5, z0: 6.5, z1: 13 };
   var WAY = [[6, 1.2], [6, 5.4], [10.8, 5.4], [10.8, 14.2], [8, 18.6], [3, 18.6], [1.2, 14.2], [1.2, 5.4], [4, 3.2], [8, 3.2]];
@@ -9593,14 +9594,14 @@ gl_Position = projectionMatrix * mvPosition;
     let attached = false;
     const disposeObject = (object2) => {
       object2.traverse((child) => {
-        child.geometry?.dispose?.();
+        if (isMesh(child)) child.geometry?.dispose?.();
       });
     };
     const clearGroup = (g) => {
       for (const child of [...g.children]) {
         g.remove(child);
         disposeObject(child);
-        child.material?.dispose?.();
+        if (isMesh(child) && !Array.isArray(child.material)) child.material?.dispose?.();
       }
     };
     const ensure = () => {
@@ -9657,7 +9658,7 @@ gl_Position = projectionMatrix * mvPosition;
         const buildMs = Date.now() - t0;
         lotObject = sdk.createLotObject(THREE, data, materials);
         lotObject.traverse((c) => {
-          if (c.isMesh) {
+          if (isMesh(c)) {
             c.castShadow = true;
             c.receiveShadow = true;
           }
@@ -9832,7 +9833,7 @@ gl_Position = projectionMatrix * mvPosition;
       return root;
     }
     function buildSpec(root, def) {
-      const meshes = root.children.filter((c) => c.isMesh && c.userData.veg);
+      const meshes = root.children.filter((c) => c.isMesh === true && Boolean(c.userData.veg));
       const byId2 = {};
       for (const m of meshes) byId2[m.userData.veg.id] = m;
       const parts = [];
@@ -9961,6 +9962,7 @@ gl_Position = projectionMatrix * mvPosition;
           id: def.id,
           name: def.name ? def.name[loc === "en" ? 1 : 0] : species2.name(def.base ?? def.id, loc),
           build: (THREE) => buildObject(THREE, def),
+          // the room hands its three.js namespace
           spec: (root) => {
             const spec = buildSpec(root, def);
             root.userData.vegSpec = spec;
@@ -10038,11 +10040,12 @@ gl_Position = projectionMatrix * mvPosition;
     };
     const crownsOf = (so) => specOf(so).parts.filter((p) => /^(s\d+_)?crown\d*$/.test(p.id)).map((p) => p.id);
     const jointPos = (so, jid) => {
-      const j = specOf(so).joints.filter((x) => x.id === jid)[0];
+      const j = (specOf(so).joints ?? []).filter((x) => x.id === jid)[0];
       const a = partSpec(so, j.a);
       const b = partSpec(so, j.b);
       const box2 = (p) => {
-        const h = p.shape.kind === "box" ? p.shape.size.map((s) => s / 2) : [p.shape.radius, p.shape.height / 2, p.shape.radius];
+        const sh = p.shape;
+        const h = sh.kind === "box" ? [sh.size[0] / 2, sh.size[1] / 2, sh.size[2] / 2] : [sh.radius, (sh.kind === "cylinder" ? sh.height : sh.radius * 2) / 2, sh.radius];
         const r = p.rotation || [0, 0, 0];
         const cx = Math.cos(r[0]), sx = Math.sin(r[0]), cz = Math.cos(r[2]), sz = Math.sin(r[2]);
         const mn = [Infinity, Infinity, Infinity];
@@ -10069,6 +10072,16 @@ gl_Position = projectionMatrix * mvPosition;
       if (!p) return null;
       return { status: p.status, hp: p.hp, maxHp: p.maxHp, temperature: p.temperature, burning: p.burning, char: p.char || 0, fuel: p.fuel, holes: (p.holes || []).length, material: p.material };
     };
+    const snapAt = (room, so, pid) => {
+      const p = snap(room, so, pid);
+      if (!p) throw new Error(`game-vegetation-three: no part "${pid}" in ${so.objectId}`);
+      return p;
+    };
+    const stateAt = (room, id) => {
+      const st = room.world.state(id);
+      if (!st) throw new Error(`game-vegetation-three: no object ${id} in the world`);
+      return st;
+    };
     const logCount = (room, so, type) => room.log.entries({ type, objectId: so.objectId }).length;
     const jointsOpened = (room, so) => {
       let n = 0;
@@ -10080,7 +10093,11 @@ gl_Position = projectionMatrix * mvPosition;
     const spawn = (room, id, x, z) => room.spawn(id, [x, 0, z], 0);
     const split = (room, so) => {
       const home = room.world.snapshot(so.objectId);
-      const loose = room.world.ids().filter((i) => /^obj_/.test(i)).map((i) => ({ id: i, st: room.world.snapshot(i) }));
+      if (!home) throw new Error(`game-vegetation-three: no object ${so.objectId} in the world`);
+      const loose = room.world.ids().filter((i) => /^obj_/.test(i)).flatMap((i) => {
+        const st = room.world.snapshot(i);
+        return st ? [{ id: i, st }] : [];
+      });
       const anchored = {};
       for (const p of specOf(so).parts) if (p.anchored) anchored[p.id] = true;
       const rooted = [];
@@ -10092,7 +10109,8 @@ gl_Position = projectionMatrix * mvPosition;
     const fell = (room, ctx, so, max) => {
       take(room, "axe");
       let swings = 0;
-      const h = partSpec(so, "trunk").shape.height;
+      const trunkShape = partSpec(so, "trunk").shape;
+      const h = trunkShape.kind === "cylinder" ? trunkShape.height : trunkShape.kind === "box" ? trunkShape.size[1] : trunkShape.radius * 2;
       for (let i = 0; i < max; i++) {
         aimPart(room, so, "trunk", 0.5, [0, Math.min(0.9, h / 3), 0]);
         room.use();
@@ -10101,7 +10119,7 @@ gl_Position = projectionMatrix * mvPosition;
         if (lost(room.world.part(so.objectId, "trunk"))) break;
       }
       ctx.step(5);
-      return { swings, trunk: snap(room, so, "trunk") };
+      return { swings, trunk: snapAt(room, so, "trunk") };
     };
     const sc = (id, ptName, enName, run) => ({ id: `veg_${id}`, name: L(ptName, enName), run });
     const pct = (x) => `${Math.round((x || 0) * 100)}%`;
@@ -10117,7 +10135,7 @@ gl_Position = projectionMatrix * mvPosition;
         const r = fell(room, ctx, so, 60);
         const sp = split(room, so);
         const crownGone = lost(room.world.part(so.objectId, "crown")) || !sp.inHome("crown") || sp.rooted.indexOf("crown") < 0;
-        const branches = specOf(so).parts.filter((p) => p.tags.indexOf("branch") >= 0).map((p) => p.id);
+        const branches = specOf(so).parts.filter((p) => (p.tags ?? []).indexOf("branch") >= 0).map((p) => p.id);
         const branchesFree = branches.every((b) => sp.rooted.indexOf(b) < 0);
         const detach = jointsOpened(room, so);
         ctx.expect(r.trunk.status === "broken" && r.swings >= 8 && r.swings <= 15, L(`Machado no tronco de 15 cm (hp ${Math.round(r.trunk.maxHp)}): tronco ${r.trunk.status} depois de ${r.swings} golpes (esperado: broken em 8 a 15 golpes)`, `Axe on a 15 cm trunk (hp ${Math.round(r.trunk.maxHp)}): trunk ${r.trunk.status} after ${r.swings} swings (expected: broken in 8 to 15 swings)`), { swings: r.swings, status: r.trunk.status, maxHp: r.trunk.maxHp });
@@ -10147,7 +10165,7 @@ gl_Position = projectionMatrix * mvPosition;
           detached = detachedJoint(room, so, jid);
         }
         ctx.step(3);
-        const trunk = snap(room, so, "trunk");
+        const trunk = snapAt(room, so, "trunk");
         const sp = split(room, so);
         const branchOff = sp.inLoose("branch1") && !sp.inHome("branch1");
         const restStays = sp.inHome("trunk") && sp.rooted.indexOf("trunk") >= 0;
@@ -10165,7 +10183,7 @@ gl_Position = projectionMatrix * mvPosition;
           ctx.step(0.4);
           shots++;
         }
-        const trunk = snap(room, so, "trunk");
+        const trunk = snapAt(room, so, "trunk");
         const sp = split(room, so);
         ctx.expect(trunk.status !== "broken" && trunk.hp > 0, L(`${shots} tiros de 9 mm no tronco de 15 cm: tronco ${trunk.status}, hp ${Math.round(trunk.hp)}/${Math.round(trunk.maxHp)} (esperado: n\xE3o quebrado)`, `${shots} 9 mm shots on the 15 cm trunk: trunk ${trunk.status}, hp ${Math.round(trunk.hp)}/${Math.round(trunk.maxHp)} (expected: not broken)`), { shots, hp: trunk.hp });
         ctx.expect(sp.loose.length === 0 && sp.inHome("trunk") && sp.rooted.indexOf("crown") >= 0, L(`A \xE1rvore continua de p\xE9: peda\xE7os soltos ${sp.loose.length}, copa presa ao ch\xE3o ${yn(sp.rooted.indexOf("crown") >= 0)} (esperado: 0, sim)`, `The tree still stands: loose pieces ${sp.loose.length}, crown rooted ${yn(sp.rooted.indexOf("crown") >= 0)} (expected: 0, yes)`), {});
@@ -10195,21 +10213,21 @@ gl_Position = projectionMatrix * mvPosition;
         take(room, "lighter");
         const a = aimPart(room, so, crownsOf(so), 0.08);
         room.use(6);
-        const crown = snap(room, so, a.pid);
+        const crown = snapAt(room, so, a.pid);
         const lit = crown.burning || crown.temperature > 300;
         let peak = 0;
         let charMax = 0;
         for (let t = 0; t < 18; t++) {
           ctx.step(5);
-          for (const p of room.world.state(so.objectId).parts) {
+          for (const p of stateAt(room, so.objectId).parts) {
             if (p.material === "green_wood") {
               peak = Math.max(peak, p.temperature);
               charMax = Math.max(charMax, p.char || 0);
             }
           }
         }
-        const st = room.world.state(so.objectId);
-        const burnt = st.parts.filter((p) => p.material === "foliage" && (p.burning || p.char > 0 || p.status === "ashes")).length;
+        const st = stateAt(room, so.objectId);
+        const burnt = st.parts.filter((p) => p.material === "foliage" && (p.burning || (p.char ?? 0) > 0 || p.status === "ashes")).length;
         ctx.expect(lit, L(`Isqueiro na copa: folhagem acesa ou acima de 300 \xB0C = ${yn(lit)} (${Math.round(crown.temperature)} \xB0C; esperado: sim)`, `Lighter on the crown: foliage lit or above 300 C = ${yn(lit)} (${Math.round(crown.temperature)} C; expected: yes)`), { temperature: crown.temperature });
         ctx.expect(burnt > 0, L(`Depois de 90 s: ${burnt} pe\xE7a(s) de folhagem queimando, carbonizada(s) ou em cinza (esperado: 1 ou mais)`, `After 90 s: ${burnt} foliage piece(s) burning, charred or ash (expected: 1+)`), { burnt });
         ctx.expect(peak > 150 || charMax > 0, L(`O fogo da folhagem passa para a madeira verde (tronco e galhos): pico de ${Math.round(peak)} \xB0C, carboniza\xE7\xE3o m\xE1xima ${pct(charMax)} (esperado: pico acima de 150 \xB0C ou carboniza\xE7\xE3o acima de 0; a madeira verde s\xF3 pega fogo acima de 400 \xB0C)`, `Foliage fire reaches the green wood (trunk and branches): peak ${Math.round(peak)} C, max char ${pct(charMax)} (expected: peak above 150 C or char above 0; green wood only ignites above 400 C)`), { peak, charMax });
@@ -10220,13 +10238,13 @@ gl_Position = projectionMatrix * mvPosition;
         const so = spawn(room, "mango_tree", 0, -6);
         take(room, "pistol_9mm");
         const tgt = aimPart(room, so, crownsOf(so), 2.5).pid;
-        const before = snap(room, so, tgt);
+        const before = snapAt(room, so, tgt);
         for (let i = 0; i < 3; i++) {
           aimPart(room, so, tgt, 2.5);
           room.use();
           ctx.step(0.6);
         }
-        const crown = snap(room, so, tgt);
+        const crown = snapAt(room, so, tgt);
         const leaves = room.log.entries({ type: "debris", objectId: so.objectId }).filter((e) => e.data && e.data.kind === "leaves").length;
         const hurt = crown.hp < before.hp || crown.status === "broken";
         ctx.expect(hurt && crown.status !== "intact", L(`Tr\xEAs tiros na copa: hp ${Math.round(before.hp)} para ${Math.round(crown.hp)}, estado ${crown.status} (esperado: hp menor, n\xE3o intacta)`, `Three shots into the crown: hp ${Math.round(before.hp)} to ${Math.round(crown.hp)}, status ${crown.status} (expected: lower hp, not intact)`), { hp: crown.hp });
@@ -10283,8 +10301,8 @@ gl_Position = projectionMatrix * mvPosition;
         const a = snap(room, so, arm);
         const sp = split(room, so);
         const armOff = !a || a.status === "broken" || sp.inLoose(arm) && !sp.inHome(arm);
-        const stemOk = sp.inHome("stem") && sp.rooted.indexOf("stem") >= 0 && room.world.part(so.objectId, "stem").status !== "broken";
-        const spines = specOf(so).parts.filter((p) => p.tags.indexOf("thorns") >= 0);
+        const stemOk = sp.inHome("stem") && sp.rooted.indexOf("stem") >= 0 && room.world.part(so.objectId, "stem")?.status !== "broken";
+        const spines = specOf(so).parts.filter((p) => (p.tags ?? []).indexOf("thorns") >= 0);
         const thorny = so.root.userData.thorny === true && spines.length > 0;
         const spinesOff = !sp.rooted.some((pid) => pid.indexOf(`${arm}_spines`) === 0);
         ctx.expect(armOff, L(`Machete na junta ${jid}: bra\xE7o ${a ? a.status : "solto como objeto pr\xF3prio"} depois de ${swings} golpe(s) (esperado: solto do caule pela junta)`, `Machete on joint ${jid}: arm ${a ? a.status : "loose as its own object"} after ${swings} swing(s) (expected: off the stem through the joint)`), { swings });
@@ -10319,11 +10337,11 @@ gl_Position = projectionMatrix * mvPosition;
           aimPart(room, so, "trunk", 0.08, [0, 0.8, 0]);
           room.use(8);
         }
-        const d0 = snap(room, dead, "trunk");
-        const l0 = snap(room, live, "trunk");
+        const d0 = snapAt(room, dead, "trunk");
+        const l0 = snapAt(room, live, "trunk");
         ctx.step(120);
-        const d = snap(room, dead, "trunk");
-        const l = snap(room, live, "trunk");
+        const d = snapAt(room, dead, "trunk");
+        const l = snapAt(room, live, "trunk");
         const score = (p) => p ? Math.max(p.char, p.burning ? 0.01 : 0, (p.temperature - 20) / 2e3) : 0;
         ctx.expect(d0.material === "wood_soft" && l0.material === "green_wood", L(`Materiais do tronco: \xE1rvore morta ${d0.material}, viva ${l0.material} (esperado: wood_soft, green_wood)`, `Trunk materials: dead tree ${d0.material}, living ${l0.material} (expected: wood_soft, green_wood)`), { dead: d0.material, live: l0.material });
         ctx.expect(score(d) > score(l), L(`Depois de 8 s de isqueiro e 120 s de espera: morta queimando ${yn(d.burning)}, ${Math.round(d.temperature)} \xB0C, carboniza\xE7\xE3o ${pct(d.char)}; viva queimando ${yn(l.burning)}, ${Math.round(l.temperature)} \xB0C, carboniza\xE7\xE3o ${pct(l.char)} (esperado: a morta mais queimada)`, `After 8 s of lighter and 120 s of waiting: dead burning ${yn(d.burning)}, ${Math.round(d.temperature)} C, char ${pct(d.char)}; living burning ${yn(l.burning)}, ${Math.round(l.temperature)} C, char ${pct(l.char)} (expected: dead burns more)`), { dead: score(d), live: score(l) });
@@ -10353,7 +10371,7 @@ gl_Position = projectionMatrix * mvPosition;
         const tuft = spawn(room, "lawn_tuft", 0, -3);
         const tree = spawn(room, "mango_tree", 4, -3);
         const noBlock = !tuft.root.userData.collider;
-        const treeBlock = !!(tree.root.userData.collider && tree.root.userData.collider.kind);
+        const treeBlock = !!tree.root.userData.collider?.kind;
         ctx.expect(noBlock && treeBlock, L(`Colisor do SDK: touceira ${noBlock ? "nenhum" : "tem"}, tronco da mangueira ${treeBlock ? "tem" : "nenhum"} (esperado: nenhum, tem)`, `SDK collider: tuft ${noBlock ? "none" : "has one"}, mango trunk ${treeBlock ? "has one" : "none"} (expected: none, has one)`), {});
         room.look([0, 1.7, -0.5], [0, 1.7, -6]);
         const before = room.camera.position.z;
@@ -10437,6 +10455,7 @@ gl_Position = projectionMatrix * mvPosition;
     "veg_hedge_cut_pieces",
     "veg_walk_on_grass"
   ];
+  var isMesh2 = (o) => o.isMesh === true;
   var defaultSdk = () => ({ ...dist_exports, ...three_exports });
   var AXIS_COLOURS = { trunk: 14254635, branch: 15057019, arm: 7327599, stem: 7327639, pad: 7321551 };
   function createVegetationTestModule(options = {}) {
@@ -10494,7 +10513,7 @@ gl_Position = projectionMatrix * mvPosition;
         }
         for (const mesh2 of root.children) {
           const v = mesh2.userData?.veg;
-          if (!v || !mesh2.geometry) continue;
+          if (!v || !isMesh2(mesh2) || !mesh2.geometry) continue;
           if (host.bench.layer("piece_boxes")) {
             mesh2.geometry.computeBoundingBox();
             const box2 = mesh2.geometry.boundingBox.clone().translate(mesh2.position);
@@ -10598,7 +10617,7 @@ gl_Position = projectionMatrix * mvPosition;
       let pieces = 0;
       for (const entry of placed.values()) {
         entry.root.traverse((mesh2) => {
-          if (!mesh2.isMesh || mesh2.userData.helper) return;
+          if (!isMesh2(mesh2) || mesh2.userData.helper) return;
           for (let p = mesh2; p; p = p.parent) if (p.visible === false) return;
           drawCalls += 1;
           if (mesh2.userData.veg) pieces += 1;
@@ -10611,7 +10630,7 @@ gl_Position = projectionMatrix * mvPosition;
     const lotCalls = () => {
       let calls = 0;
       nursery?.group.traverse((o) => {
-        if (o.isMesh && o.visible) calls += 1;
+        if (isMesh2(o) && o.visible) calls += 1;
       });
       return calls;
     };