@wodzik/cubecore 0.1.5 → 0.1.6

package/bluetooth/rotations.js

@@ -42,15 +42,18 @@ export function heldTokens(moves, startRotation, rotations) {
     let r = 0;
     for (let i = 0; i <= moves.length; i++) {
         let target = grip;
-        let t = 0;
+        // Several at one place (a peek at the back and back: x x' x) are one net
+        // rotation — timed by the first: that's when it began (a slice's rotation
+        // then still sits with its face moves).
+        let t = null;
         while (r < rots.length && rots[r].after <= i) {
             target = rotateGrip(target, rots[r].move);
-            t = rots[r].t;
+            t ??= rots[r].t;
             r++;
         }
         const net = rotationBetween(grip, target);
         if (net)
-            tokens.push({ kind: "rotation", move: net, t, after: i });
+            tokens.push({ kind: "rotation", move: net, t: t ?? 0, after: i });
         grip = target;
         if (i < moves.length)
             tokens.push({ kind: "move", move: heldMove(moves[i].move, grip), t: moves[i].t, index: i });

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "A 3×3×3 cube library for the web, built around smart (Bluetooth) cubes: state, notation, methods, solvers and scrambles, a three.js renderer with skins, pictures, web components, React bindings.",
   "license": "MPL-2.0",
   "author": "Tomasz Wodzikowski <wodziszczakow@gmail.com>",

package/render/layers.js

@@ -7,11 +7,12 @@
  * switches to S·m with nothing rotated. The two pictures coincide, so there is
  * no pop — and the scene never has to track which physical cubie is where.
  */
-import { FAMILY, amountQuarters } from "../core/index.js";
+import { FAMILY, writtenQuarters } from "../core/index.js";
 export function layerTurn(move) {
     const def = FAMILY[move.family];
-    // A family's clockwise turn is `def.q` CCW quarters about +axis; the amount multiplies it.
-    const quarters = def.q * (move.amount === -1 ? -1 : move.amount === 2 ? 2 : 1);
+    // A family's clockwise turn is `def.q` CCW quarters about +axis; the turn as written multiplies it
+    // (U2' goes the other way than U2 — the state is the same, the hands aren't).
+    const quarters = def.q * writtenQuarters(move);
     return {
         axis: def.axis,
         angle: (quarters * Math.PI) / 2,
@@ -20,5 +21,6 @@ export function layerTurn(move) {
 }
 /** Default animation length for a move, scaled by how far it turns (half turns take longer). */
 export function defaultDuration(move, quarterMs = 120) {
-    return amountQuarters(move.amount) === 2 ? quarterMs * 1.5 : quarterMs;
+    const q = Math.abs(writtenQuarters(move));
+    return q === 1 ? quarterMs : quarterMs * (1 + 0.5 * (q - 1));
 }