@fabi-play/motion 0.2.0 → 0.4.0

package/dist/index.d.ts

@@ -241,22 +241,27 @@ export declare function armsCrossed(body: Body$1): boolean;
 export declare const CROSS: {
 	/** Each wrist at least this far past the midline (between the shoulders)… */
 	readonly past: 0.12;
-	/** …and no farther than the opposite shoulder plus this. */
-	readonly pastShoulder: 0.1;
-	/** Each elbow at least this far from the midline, on its own side. */
-	readonly elbowOut: 0.35;
-	/** Wrists between this far above the shoulder line… */
-	readonly above: 0.35;
+	/** …and no farther than the opposite shoulder plus this (a wide X; self-hugs are told apart by the elbows). */
+	readonly pastShoulder: 0.5;
+	/** Each elbow at least this far from the midline, on its own side (in a self-hug they come in front of the chest). */
+	readonly elbowOut: 0.38;
+	/**
+	 * Wrists between this far above the shoulder line (an X up to the chin and mouth; not higher: hands on the head and
+	 * forearms over the eyes, a child hiding the face, are not it)…
+	 */
+	readonly above: 0.6;
 	/** …and this far below it (mid-chest). */
-	readonly below: 0.6;
+	readonly below: 0.7;
 	/** Each wrist at least this far above its own elbow (the forearm rises)… */
-	readonly rise: 0.2;
+	readonly rise: 0.15;
 	/** …and this far above the other arm's elbow. */
-	readonly overElbow: 0.15;
+	readonly overElbow: 0.1;
 	/** Elbows no higher than this above the shoulder line (arms crossed over the head are not it)… */
-	readonly elbowAbove: 0.1;
+	readonly elbowAbove: 0.15;
 	/** …and no lower than this below the hip line. */
 	readonly elbowBelowHips: 0.3;
+	/** The visibility the wrist hidden behind the other needs; the other wrist, elbows and shoulders need the usual 0.5. */
+	readonly hiddenWristVisible: 0.25;
 	/** Shoulders at least this wide: facing the camera. */
 	readonly minShoulderWidth: 0.3;
 	/** Shoulder width over torso, to estimate the torso when the hips are out of view. */
@@ -264,13 +269,19 @@ export declare const CROSS: {
 };
 /**
  * Something held for a while: progress 0–1 while active, fires once when full. Brief drop-outs (under graceMs, e.g.
- * a frame where the pose model loses a wrist) don't reset it. After firing it is spent (progress 0, never fires) until
- * `active` has been false for longer than graceMs, so holding on doesn't fire again.
+ * a frame where the pose model loses a wrist) don't reset it, but only active time fills it (the time between two
+ * active frames) and a drop-out drains it at half that rate: a real hold with a few lost frames still fills, while scattered
+ * active frames (a false reading now and then, an arm swinging across) never add up to one. After firing it is spent (progress 0, never fires) until `active` has been false for longer than
+ * graceMs, so holding on doesn't fire again.
  */
 export declare class Hold {
 	readonly ms: number;
 	readonly graceMs: number;
-	private start;
+	/** Active time so far, ms. */
+	private held;
+	/** The time of the last update, and whether it was active: only active-to-active time counts. */
+	private last;
+	private lastWasActive;
 	private lastActive;
 	private progress;
 	private spent;

package/dist/index.js

@@ -342,7 +342,9 @@ function armsCrossed(body) {
   return crossedIn(skeleton(body));
 }
 function crossedIn(s) {
-  if (!seen(s.leftShoulder, s.rightShoulder, s.leftElbow, s.rightElbow, s.leftWrist, s.rightWrist)) return false;
+  if (!seen(s.leftShoulder, s.rightShoulder, s.leftElbow, s.rightElbow)) return false;
+  const wv = [s.leftWrist.visibility, s.rightWrist.visibility];
+  if (Math.min(...wv) < CROSS.hiddenWristVisible || Math.max(...wv) < VISIBLE) return false;
   const hipsSeen = seen(s.leftHip, s.rightHip);
   const t = hipsSeen ? s.torso : s.shoulderWidth / CROSS.shoulderPerTorso;
   if (s.shoulderWidth < CROSS.minShoulderWidth * t) return false;
@@ -366,56 +368,76 @@ function crossedIn(s) {
 var CROSS = {
   /** Each wrist at least this far past the midline (between the shoulders)… */
   past: 0.12,
-  /** …and no farther than the opposite shoulder plus this. */
-  pastShoulder: 0.1,
-  /** Each elbow at least this far from the midline, on its own side. */
-  elbowOut: 0.35,
-  /** Wrists between this far above the shoulder line… */
-  above: 0.35,
+  /** …and no farther than the opposite shoulder plus this (a wide X; self-hugs are told apart by the elbows). */
+  pastShoulder: 0.5,
+  /** Each elbow at least this far from the midline, on its own side (in a self-hug they come in front of the chest). */
+  elbowOut: 0.38,
+  /**
+   * Wrists between this far above the shoulder line (an X up to the chin and mouth; not higher: hands on the head and
+   * forearms over the eyes, a child hiding the face, are not it)…
+   */
+  above: 0.6,
   /** …and this far below it (mid-chest). */
-  below: 0.6,
+  below: 0.7,
   /** Each wrist at least this far above its own elbow (the forearm rises)… */
-  rise: 0.2,
+  rise: 0.15,
   /** …and this far above the other arm's elbow. */
-  overElbow: 0.15,
+  overElbow: 0.1,
   /** Elbows no higher than this above the shoulder line (arms crossed over the head are not it)… */
-  elbowAbove: 0.1,
+  elbowAbove: 0.15,
   /** …and no lower than this below the hip line. */
   elbowBelowHips: 0.3,
+  /** The visibility the wrist hidden behind the other needs; the other wrist, elbows and shoulders need the usual 0.5. */
+  hiddenWristVisible: 0.25,
   /** Shoulders at least this wide: facing the camera. */
   minShoulderWidth: 0.3,
   /** Shoulder width over torso, to estimate the torso when the hips are out of view. */
   shoulderPerTorso: 0.8
 };
+var HOLD_DRAIN = 0.5;
 var Hold = class {
   constructor(ms = 1500, graceMs = 200) {
     __publicField(this, "ms", ms);
     __publicField(this, "graceMs", graceMs);
-    __publicField(this, "start", null);
+    /** Active time so far, ms. */
+    __publicField(this, "held", 0);
+    /** The time of the last update, and whether it was active: only active-to-active time counts. */
+    __publicField(this, "last", null);
+    __publicField(this, "lastWasActive", false);
     __publicField(this, "lastActive", -Infinity);
     __publicField(this, "progress", 0);
     __publicField(this, "spent", false);
   }
   update(active, now) {
+    const dt = this.last !== null ? Math.max(now - this.last, 0) : 0;
+    const step = active && this.lastWasActive ? dt : 0;
+    this.last = now;
+    this.lastWasActive = active;
     if (active) this.lastActive = now;
     const released = !active && now - this.lastActive > this.graceMs;
     if (released) {
-      this.start = null;
+      this.held = 0;
       this.progress = 0;
       this.spent = false;
       return { progress: 0, fired: false };
     }
     if (this.spent) return { progress: 0, fired: false };
-    if (!active) return { progress: this.progress, fired: false };
-    this.start ?? (this.start = now);
-    this.progress = Math.min(Math.max((now - this.start) / this.ms, 0), 1);
+    if (!active) {
+      this.held = Math.max(this.held - dt * HOLD_DRAIN, 0);
+      this.progress = this.held / this.ms;
+      return { progress: this.progress, fired: false };
+    }
+    this.held += step;
+    this.progress = Math.min(this.held / this.ms, 1);
     if (this.progress < 1) return { progress: this.progress, fired: false };
     this.spent = true;
     this.progress = 0;
     return { progress: 1, fired: true };
   }
   reset() {
-    this.start = null;
+    this.held = 0;
+    this.last = null;
+    this.lastWasActive = false;
     this.lastActive = -Infinity;
     this.progress = 0;
     this.spent = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabi-play/motion",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "description": "Body movements from pose landmarks: jumps, squats, shapes, lanes, freezing, hands as pointers.",
   "keywords": [
     "fabi-play",
@@ -32,7 +32,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@fabi-play/protocol": "^0.2.0"
+    "@fabi-play/protocol": "^0.4.0"
   },
   "devDependencies": {
     "dts-bundle-generator": "9.5.1",