@adatechnology/game-weapons-three 0.9.0 → 0.10.1

package/dist/index.js

@@ -1536,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`. */
@@ -5501,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)]);
 
@@ -6744,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
@@ -6773,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));