@adatechnology/game-weapons-three 0.8.0 → 0.10.0

package/dist/index.js

@@ -1,5 +1,7 @@
 // src/area.ts
+import { markKitOrigin as markKitOrigin4 } from "@adatechnology/game-contracts";
 import { createArsenal } from "@adatechnology/game-weapons";
+import { furnitureSpec } from "@adatechnology/game-floorplan-three";
 
 // src/attachments-key.ts
 var attachmentsKey = (parts) => {
@@ -1534,6 +1536,8 @@ var HAND_HOLD = {
   /** Closure of the fingers on a grip and on a forend (0 open, 1 closed). */
   closed: 0.9,
   forend: 0.6,
+  /** How far the shooting hand slides on its grip so the thumb reaches the safety lever. */
+  thumbReach: 0.02,
   /** How fast the supporting hand goes to the magazine and back, per second. */
   magRate: 7,
   /** The hands shrink with the tool: a tool drawn at scale `s` takes hands at `s ** handScaleExponent`. */
@@ -1646,9 +1650,12 @@ function holdOfProp(THREE, group, category, scale) {
 }
 
 // src/props.ts
+import { markKitOrigin as markKitOrigin2 } from "@adatechnology/game-contracts";
+import { buildItem, hasItemModel } from "@adatechnology/game-items-three";
 import { mergeByMaterial, shapeGeometries as shapeGeometries2 } from "@adatechnology/game-shapes-three";
 
 // src/models/index.ts
+import { markKitOrigin } from "@adatechnology/game-contracts";
 import { WEAPONS } from "@adatechnology/game-weapons";
 
 // src/data/models.json
@@ -4727,6 +4734,7 @@ function buildWeaponModelById(THREE, id) {
     built.group.position.x = -new THREE.Box3().setFromObject(built.group).min.x;
   } else root = fitLength(kit, built.group, entry.length / 1e3);
   root.name = id;
+  markKitOrigin(root, { owner: "game-weapons-three", kind: "weapon", id });
   const model = { id, root, inner: built.group, parts: built.parts };
   if (!built.parts.frames) built.parts.frames = deriveFrames(THREE, model);
   return model;
@@ -4815,15 +4823,90 @@ function buildProp(THREE, prop) {
   }
   return group;
 }
+var WEAPON_ITEM_MODELS = /* @__PURE__ */ new Map([
+  ["wrench", { item: "adjustable_wrench" }],
+  ["extinguisher", { item: "fire_extinguisher", flip: true }],
+  ["blowtorch", { item: "gas_torch", flip: true }],
+  ["crossbow", { turn: 1 }],
+  ["knife", { flip: true }],
+  ["meat_cleaver", { flip: true }],
+  ["screwdriver", { flip: true }]
+]);
+function registerWeaponItemModel(weaponId, model) {
+  WEAPON_ITEM_MODELS.set(weaponId, model ?? { item: "" });
+}
+function itemModelOfWeapon(weaponId) {
+  const id = WEAPON_ITEM_MODELS.get(weaponId)?.item ?? weaponId;
+  return id && hasItemModel(id) ? id : void 0;
+}
+function buildItemWeaponModel(THREE, def) {
+  const itemId = itemModelOfWeapon(def.id);
+  if (!itemId) return void 0;
+  const { root } = buildItem(THREE, { id: itemId, category: "weapon", size: [0, 0, 0], model: itemId });
+  const group = markKitOrigin2(new THREE.Group(), { owner: "game-weapons-three", kind: "weapon", id: def.id });
+  group.name = def.id;
+  group.add(root);
+  const sizeOf = () => {
+    group.updateMatrixWorld(true);
+    return new THREE.Box3().setFromObject(root).getSize(new THREE.Vector3());
+  };
+  let size = sizeOf();
+  if (size.y > size.x && size.y >= size.z) root.rotateOnWorldAxis(new THREE.Vector3(0, 0, 1), -Math.PI / 2);
+  else if (size.z > size.x && size.z > size.y) root.rotateOnWorldAxis(new THREE.Vector3(0, 1, 0), Math.PI / 2);
+  size = sizeOf();
+  if (size.z < size.y) root.rotateOnWorldAxis(new THREE.Vector3(1, 0, 0), Math.PI / 2);
+  const turn2 = WEAPON_ITEM_MODELS.get(def.id)?.turn ?? 0;
+  if (turn2) root.rotateOnWorldAxis(new THREE.Vector3(0, 1, 0), turn2 * Math.PI / 2);
+  const box2 = new THREE.Box3().setFromObject(root);
+  const middle = (box2.min.x + box2.max.x) / 2;
+  const span = [
+    [Infinity, -Infinity],
+    [Infinity, -Infinity]
+  ];
+  const point = new THREE.Vector3();
+  root.traverse((node) => {
+    const mesh = node;
+    const position = mesh.isMesh ? mesh.geometry.getAttribute("position") : void 0;
+    if (!position) return;
+    for (let i = 0; i < position.count; i++) {
+      point.fromBufferAttribute(position, i).applyMatrix4(mesh.matrixWorld);
+      const half = span[point.x > middle ? 1 : 0];
+      half[0] = Math.min(half[0], point.z);
+      half[1] = Math.max(half[1], point.z);
+    }
+  });
+  const reach = span.map(([low, high]) => high - low);
+  const flip = WEAPON_ITEM_MODELS.get(def.id)?.flip === true;
+  if (reach[0] > reach[1] !== flip) root.rotateOnWorldAxis(new THREE.Vector3(0, 1, 0), Math.PI);
+  group.updateMatrixWorld(true);
+  const laid = new THREE.Box3().setFromObject(root);
+  const centre = laid.getCenter(new THREE.Vector3());
+  root.position.sub(new THREE.Vector3(centre.x, laid.min.y, centre.z));
+  const length = laid.max.x - laid.min.x;
+  const handle = new THREE.Object3D();
+  handle.name = "handle";
+  handle.position.set(-length * 0.35, 0, 0);
+  group.add(handle);
+  root.traverse((node) => {
+    const mesh = node;
+    if (!mesh.isMesh) return;
+    mesh.castShadow = true;
+    mesh.receiveShadow = true;
+  });
+  return group;
+}
 function buildWeaponModel(THREE, def) {
-  return buildProp(THREE, weaponProp(def));
+  return buildItemWeaponModel(THREE, def) ?? buildProp(THREE, weaponProp(def));
 }
 var MODEL_BODY = "body";
 function buildModeledProp(THREE, def, name, decorate) {
-  const model = buildWeaponModelById(THREE, def.id);
+  const model = buildWeaponModelById(THREE, def.id) ?? (() => {
+    const root = buildItemWeaponModel(THREE, def);
+    return root ? { root } : void 0;
+  })();
   if (!model) return void 0;
   decorate?.(model.root);
-  const group = new THREE.Group();
+  const group = markKitOrigin2(new THREE.Group(), { owner: "game-weapons-three", kind: "weapon", id: def.id });
   group.name = name;
   const box2 = new THREE.Box3().setFromObject(model.root);
   const center = box2.getCenter(new THREE.Vector3());
@@ -5420,9 +5503,14 @@ function faultClips(context) {
   );
   return [misfire, ...stopped];
 }
+var SAFETY_MOTION = { cant: 0.22, lift: 0.012, in: 0.14, flickAt: 0.16, flick: 0.1, outAt: 0.32, out: 0.16, lever: 0.6 };
 function safetyClips(context) {
-  if (!context.parts.safety) return [];
-  return [composeClip("safety_on", [turn("safety", "z", 0, 0.12, 0, -0.6)]), composeClip("safety_off", [turn("safety", "z", 0, 0.12, -0.6, 0)]), composeClip("mode", [turn("safety", "z", 0, 0.07, 0, 0.4), turn("safety", "z", 0.07, 0.07, 0.4, 0)])];
+  const { cant, lift, in: rise, flickAt, flick, outAt, out, lever } = SAFETY_MOTION;
+  const carry = () => [turn(ROOT, "x", 0, rise, 0, cant), move(ROOT, "y", 0, rise, 0, lift), turn(ROOT, "x", outAt, out, cant, 0), move(ROOT, "y", outAt, out, lift, 0)];
+  const flickTo = (from, to) => context.parts.safety ? [turn("safety", "z", flickAt, flick, from, to)] : [];
+  const clips = [composeClip("safety_on", [...carry(), ...flickTo(0, -lever)]), composeClip("safety_off", [...carry(), ...flickTo(-lever, 0)])];
+  if (context.parts.safety) clips.push(composeClip("mode", [turn("safety", "z", 0, 0.07, 0, 0.4), turn("safety", "z", 0.07, 0.07, 0.4, 0)]));
+  return clips;
 }
 var drawClip = () => composeClip("draw", [move(ROOT, "y", 0, 0.35, -0.1, 0), turn(ROOT, "z", 0, 0.35, -0.6, 0)]);
 
@@ -5994,6 +6082,7 @@ function applyCondition(kit, model, condition) {
 }
 
 // src/models/cartridge.ts
+import { markKitOrigin as markKitOrigin3 } from "@adatechnology/game-contracts";
 var BOTTLENECK_RATIO = 0.8;
 function cartridgeShape(caliber, dims) {
   if (caliber.caseType === "shell" || caliber.rim === "shell") return "shell";
@@ -6005,7 +6094,7 @@ function cartridgeShape(caliber, dims) {
 }
 function buildCartridge(kit, dims, shape) {
   const { M, cylinderY } = kit;
-  const group = kit.group();
+  const group = markKitOrigin3(kit.group(), { owner: "game-weapons-three", kind: "ammunition", id: shape });
   const radius = dims.caseDiameter / 2;
   const bulletRadius = dims.projectileDiameter / 2;
   const caseLength = dims.caseLength;
@@ -6037,7 +6126,7 @@ function buildCartridge(kit, dims, shape) {
 }
 function buildCasing(kit, dims, shape) {
   const { M, cylinderX } = kit;
-  const group = kit.group();
+  const group = markKitOrigin3(kit.group(), { owner: "game-weapons-three", kind: "ammunition", id: shape });
   const radius = dims.caseDiameter / 2e3;
   const length = dims.caseLength / 1e3;
   if (shape === "shell") {
@@ -6053,7 +6142,7 @@ function buildCasing(kit, dims, shape) {
   return { group, radius, length };
 }
 function buildRound(kit, dims, shape) {
-  const group = kit.group();
+  const group = markKitOrigin3(kit.group(), { owner: "game-weapons-three", kind: "ammunition", id: shape });
   const cartridge = buildCartridge(kit, dims, shape);
   cartridge.scale.setScalar(1e-3);
   cartridge.rotation.z = -Math.PI / 2;
@@ -6662,8 +6751,169 @@ var hand_work_default = {
       hand: "L",
       anchor: "cylinder_side",
       merge: 1
+    },
+    {
+      family: "pistol",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "revolver",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "rifle",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3,
+      style: "ar"
+    },
+    {
+      family: "p90",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "pump",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "semi12",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "semiint",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "break",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "bolt",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "boltmag",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "lever",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "belt",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "R",
+      anchor: "thumb_safety",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
+    },
+    {
+      family: "rifle",
+      clips: [
+        "safety_on",
+        "safety_off"
+      ],
+      hand: "L",
+      anchor: "lever_right",
+      style: "ak",
+      whole: true,
+      lead: 0.3,
+      tail: 0.3
     }
-  ]
+  ],
+  safety: {
+    comment: "Safety on and off (B): the shooting hand slides up its grip so the thumb flicks the lever while the clip cants the weapon; an AK-style rifle (akCharge) has its big lever on the right, pushed by the support hand over the top."
+  }
 };
 
 // src/fx/hand-work.ts
@@ -6691,6 +6941,18 @@ var anchorsOf = (THREE, model, right) => {
       if (!right || !parts.slide) return null;
       return { part: right.part, offset: right.offset.clone().add(V2(THREE, 0, 0.012, 0)), quaternion: right.quaternion };
     }
+    if (kind === "thumb_safety") {
+      if (!right) return null;
+      const toward = parts.safety ? right.part.worldToLocal(parts.safety.getWorldPosition(V2(THREE, 0, 0, 0))).sub(right.offset) : V2(THREE, 0, HAND_HOLD.thumbReach, 0);
+      return { part: right.part, offset: right.offset.clone().add(toward.clampLength(0, HAND_HOLD.thumbReach)), quaternion: right.quaternion };
+    }
+    if (kind === "lever_right") {
+      const receiver = parts.bolt ?? parts.boltHandle;
+      if (!receiver) return null;
+      const b2 = boxIn(THREE, root, receiver);
+      const x = parts.trigger ? root.worldToLocal(parts.trigger.getWorldPosition(V2(THREE, 0, 0, 0))).x : b2.min.x;
+      return anchorAt(receiver, V2(THREE, x, b2.getCenter(V2(THREE, 0, 0, 0)).y, b2.max.z + palm), handFrame(THREE, V2(THREE, 1, 0, 0), V2(THREE, 0, 0, 1)));
+    }
     if (!part) return null;
     const b = boxIn(THREE, root, part);
     const c = b.getCenter(V2(THREE, 0, 0, 0));
@@ -7914,7 +8176,7 @@ function weaponThumbnailUrl(id, base = DEFAULT_THUMBNAIL_BASE) {
 }
 
 // src/world-explosives.ts
-import { buildItem } from "@adatechnology/game-items-three";
+import { buildItem as buildItem2 } from "@adatechnology/game-items-three";
 var WORLD_EXPLOSIVE_PREFIX = "world_";
 var P13_VALVE_MESH = "valve";
 var P13_VALVE_COLOR = 12095802;
@@ -7955,7 +8217,7 @@ var meshOf = (THREE, shape) => {
 };
 var modelOf = (THREE, shape, wear = 0) => {
   if (!shape.model) return void 0;
-  const { root, kind } = buildItem(THREE, shape.model, { wear });
+  const { root, kind } = buildItem2(THREE, shape.model, { wear });
   if (kind !== "model") return void 0;
   root.traverse((node) => {
     const mesh = node;
@@ -8231,23 +8493,20 @@ var TEXT = {
 };
 var textOf = (locale) => TEXT[locale] ?? TEXT.en;
 var fill = (template, vars) => template.replace(/\{(\w+)\}/g, (_, key) => String(vars[key] ?? ""));
-var counterProp = (name) => {
-  const { length, depth, height } = COUNTER;
+var COUNTER_FURNITURE = "buffet";
+var counterItem = (name) => {
+  const counter = (THREE) => furnitureSpec(THREE, COUNTER_FURNITURE, { w: COUNTER.depth, d: COUNTER.length, h: COUNTER.height });
   return {
-    spec: {
-      name,
-      parts: [
-        { id: "top", material: "wood_soft", shape: { kind: "box", size: [depth, 0.05, length] }, position: [0, height - 0.025, 0] },
-        { id: "side_a", material: "plywood", shape: { kind: "box", size: [depth - 0.1, height - 0.05, 0.05] }, position: [0, (height - 0.05) / 2, -length / 2 + 0.05], anchored: true },
-        { id: "side_b", material: "plywood", shape: { kind: "box", size: [depth - 0.1, height - 0.05, 0.05] }, position: [0, (height - 0.05) / 2, length / 2 - 0.05], anchored: true }
-      ],
-      joints: [
-        { a: "top", b: "side_a", kind: "screw" },
-        { a: "top", b: "side_b", kind: "screw" }
-      ],
-      tags: ["furniture"]
+    id: COUNTER_ITEM_ID,
+    name,
+    build: (THREE) => {
+      const piece = counter(THREE);
+      const root = piece.build(THREE);
+      root.userData.counterSpec = { ...piece.spec, name, tags: [...piece.spec.tags ?? [], "furniture"] };
+      return root;
     },
-    colors: { top: 9067056, side_a: 7029798, side_b: 7029798 }
+    spec: (root) => root.userData.counterSpec,
+    movable: false
   };
 };
 var targetProp = (id, name) => {
@@ -8270,7 +8529,7 @@ var targetProp = (id, name) => {
 };
 var weaponItem = (def, name) => {
   const id = `${WEAPON_ITEM_PREFIX}${def.id}`;
-  if (!hasWeaponModel(def.id)) return asItem(id, name, weaponProp(def, name), { weapon: def.id, movable: true });
+  if (!hasWeaponModel(def.id) && !itemModelOfWeapon(def.id)) return asItem(id, name, weaponProp(def, name), { weapon: def.id, movable: true });
   return {
     id,
     name,
@@ -8288,6 +8547,10 @@ var mountedM134Item = (def, name) => ({
   weapon: def.id,
   movable: false
 });
+var targetItem = (id, name) => {
+  const prop = targetProp(id, name);
+  return { id, name, build: (THREE) => markKitOrigin4(buildProp(THREE, prop), { owner: "game-weapons-three", kind: "target", id }), spec: prop.spec, movable: false };
+};
 var asItem = (id, name, prop, extra = {}) => ({
   id,
   name,
@@ -8359,8 +8622,8 @@ function createWeaponsTestModule(options = {}) {
     },
     items: () => [
       ...weaponDefs.map((def) => withThumbnail(weaponItem(def, arsenal.name(def.id)), def.id)),
-      asItem(COUNTER_ITEM_ID, text.counter, counterProp(text.counter), { movable: false }),
-      ...TARGETS.map((target) => asItem(target.id, text.targets[target.id] ?? target.id, targetProp(target.id, text.targets[target.id] ?? target.id), { movable: false })),
+      counterItem(text.counter),
+      ...TARGETS.map((target) => targetItem(target.id, text.targets[target.id] ?? target.id)),
       ...worldExplosives.map((item) => withThumbnail(item, item.id.slice(WORLD_EXPLOSIVE_PREFIX.length))),
       ...mountedM134.map((item) => withThumbnail(item, MOUNTED_M134.weaponId))
     ],
@@ -8489,6 +8752,9 @@ function createWeaponsTestModule(options = {}) {
 import { EXPLOSIONS } from "@adatechnology/game-vfx";
 import { createArsenal as createArsenal2 } from "@adatechnology/game-weapons";
 
+// src/explosives-bench.ts
+import { markKitOrigin as markKitOrigin5 } from "@adatechnology/game-contracts";
+
 // src/explosives-text.ts
 var EXPLOSIVES_TEXT = {
   en: {
@@ -8748,7 +9014,7 @@ function createExplosivesBench(options) {
     return new (T()).LineLoop(geometry, new (T()).LineBasicMaterial({ color: colour }));
   };
   const drawRings = (vessel) => {
-    const group = new (T()).Group();
+    const group = markKitOrigin5(new (T()).Group(), { owner: "game-weapons-three", kind: "aid" });
     group.name = "blast_rings";
     const lethal = lethalOf(vessel);
     const injury = injuryOf(vessel);
@@ -9476,6 +9742,7 @@ export {
   applyCondition,
   buildCartridge,
   buildCasing,
+  buildItemWeaponModel,
   buildProp,
   buildRound,
   buildToolClips,
@@ -9492,11 +9759,13 @@ export {
   explosivesTextOf,
   fitAttachmentModels,
   hasWeaponModel,
+  itemModelOfWeapon,
   mechanicalSoundOf,
   modelKit,
   mountFrame,
   partRegistry,
   projectileModel,
+  registerWeaponItemModel,
   rigStock,
   rigUnderbarrel,
   weaponProp,