cubing 0.29.2 → 0.31.0

package/dist/esm/{twisty-dynamic-3d-PU74EKRA.js → twisty-dynamic-3d-OAYMJ6OD.js}

@@ -4,21 +4,18 @@ import {
   haveStartedSharingRenderers,
   hintFaceletStyles,
   twistyDebugGlobals
-} from "./chunk-J5KJ2WWA.js";
+} from "./chunk-JQLCWEVU.js";
 import "./chunk-QHWK5RXN.js";
 import {
-  cube3x3x3,
-  puzzles
-} from "./chunk-EOEJDDXN.js";
+  cube3x3x3
+} from "./chunk-SNLVO6OQ.js";
 import {
-  experimentalStickerings,
-  getFaceletAppearance
-} from "./chunk-YD2TMJI2.js";
-import "./chunk-POCUG6QW.js";
+  getFaceletStickeringMask
+} from "./chunk-SYSXHJ4V.js";
+import "./chunk-UAHLC2BK.js";
 import {
   Move
-} from "./chunk-7OIUETFU.js";
-import "./chunk-SBZRVSPK.js";
+} from "./chunk-RBZINRTT.js";
 
 // src/cubing/twisty/views/3D/puzzles/Cube3D.ts
 import {
@@ -115,31 +112,46 @@ var axesInfo = [
     14540253,
     1.25
   ),
-  new AxisInfo(new Vector3(-1, 0, 0), new Euler(
-    0,
-    -TAU / 4,
-    0
-  ), 16746496, 8930304, 1, { hintDimColor: 10053120 }),
-  new AxisInfo(new Vector3(0, 0, 1), new Euler(
-    0,
-    0,
-    0
-  ), 65280, 34816, 1, { hintDimColor: 39168 }),
-  new AxisInfo(new Vector3(1, 0, 0), new Euler(
-    0,
-    TAU / 4,
-    0
-  ), 16711680, 6684672, 1, { hintDimColor: 10027008 }),
-  new AxisInfo(new Vector3(0, 0, -1), new Euler(
-    0,
-    TAU / 2,
-    0
-  ), 255, 136, 0.75, { hintColor: 17663, hintDimColor: 6246 }),
-  new AxisInfo(new Vector3(0, -1, 0), new Euler(
-    TAU / 4,
-    0,
-    0
-  ), 16776960, 8947712, 1.25, { hintDimColor: 12303104 })
+  new AxisInfo(
+    new Vector3(-1, 0, 0),
+    new Euler(0, -TAU / 4, 0),
+    16746496,
+    8930304,
+    1,
+    { hintDimColor: 10053120 }
+  ),
+  new AxisInfo(
+    new Vector3(0, 0, 1),
+    new Euler(0, 0, 0),
+    65280,
+    34816,
+    1,
+    { hintDimColor: 39168 }
+  ),
+  new AxisInfo(
+    new Vector3(1, 0, 0),
+    new Euler(0, TAU / 4, 0),
+    16711680,
+    6684672,
+    1,
+    { hintDimColor: 10027008 }
+  ),
+  new AxisInfo(
+    new Vector3(0, 0, -1),
+    new Euler(0, TAU / 2, 0),
+    255,
+    136,
+    0.75,
+    { hintColor: 17663, hintDimColor: 6246 }
+  ),
+  new AxisInfo(
+    new Vector3(0, -1, 0),
+    new Euler(TAU / 4, 0, 0),
+    16776960,
+    8947712,
+    1.25,
+    { hintDimColor: 12303104 }
+  )
 ];
 var face = {
   U: 0,
@@ -192,7 +204,7 @@ var cube3DOptionsDefaults = {
   showMainStickers: true,
   hintFacelets: "floating",
   showFoundation: true,
-  experimentalStickering: "full",
+  experimentalStickeringMask: void 0,
   foundationSprite: null,
   hintSprite: null
 };
@@ -507,8 +519,8 @@ var Cube3D = class extends Object3D {
       );
     }
     this.scale.set(CUBE_SCALE, CUBE_SCALE, CUBE_SCALE);
-    if (this.options.experimentalStickering) {
-      this.setStickering(this.options.experimentalStickering);
+    if (this.options.experimentalStickeringMask) {
+      this.setStickeringMask(this.options.experimentalStickeringMask);
     }
     this.#animateRaiseHintFacelets();
   }
@@ -558,33 +570,38 @@ var Cube3D = class extends Object3D {
   experimentalSetHintStickerSpriteURL(hintStickerSpriteURL) {
     this.setHintSpriteURL(hintStickerSpriteURL);
   }
-  setStickering(stickering) {
-    (async () => {
-      const appearance = await puzzles["3x3x3"].appearance(
-        stickering ?? "full"
-      );
-      this.setAppearance(
-        appearance ?? await puzzles["3x3x3"].appearance("full")
-      );
-    })();
-  }
-  setAppearance(appearance) {
-    for (const [orbitName, orbitAppearance] of Object.entries(
-      appearance.orbits
+  setStickeringMask(stickeringMask) {
+    if (stickeringMask.specialBehaviour === "picture") {
+      for (const pieceInfos of Object.values(this.kpuzzleFaceletInfo)) {
+        for (const faceletInfos of pieceInfos) {
+          for (const faceletInfo of faceletInfos) {
+            faceletInfo.facelet.material = invisibleMaterial;
+            const { hintFacelet } = faceletInfo;
+            if (hintFacelet) {
+              hintFacelet.material = invisibleMaterial;
+            }
+          }
+        }
+      }
+      return;
+    }
+    this.options.experimentalStickeringMask = stickeringMask;
+    for (const [orbitName, orbitStickeringMask] of Object.entries(
+      stickeringMask.orbits
     )) {
-      for (let pieceIdx = 0; pieceIdx < orbitAppearance.pieces.length; pieceIdx++) {
-        const pieceAppearance = orbitAppearance.pieces[pieceIdx];
-        if (pieceAppearance) {
+      for (let pieceIdx = 0; pieceIdx < orbitStickeringMask.pieces.length; pieceIdx++) {
+        const pieceStickeringMask = orbitStickeringMask.pieces[pieceIdx];
+        if (pieceStickeringMask) {
           const pieceInfo = this.kpuzzleFaceletInfo[orbitName][pieceIdx];
           for (let faceletIdx = 0; faceletIdx < pieceInfo.length; faceletIdx++) {
-            const faceletAppearance = pieceAppearance.facelets[faceletIdx];
-            if (faceletAppearance) {
+            const faceletStickeringMask = pieceStickeringMask.facelets[faceletIdx];
+            if (faceletStickeringMask) {
               const faceletInfo = pieceInfo[faceletIdx];
-              const appearance2 = typeof faceletAppearance === "string" ? faceletAppearance : faceletAppearance?.appearance;
-              faceletInfo.facelet.material = axesInfo[faceletInfo.faceIdx].stickerMaterial[appearance2];
-              const hintAppearance = typeof faceletAppearance === "string" ? appearance2 : faceletAppearance.hintAppearance ?? appearance2;
+              const stickeringMask2 = typeof faceletStickeringMask === "string" ? faceletStickeringMask : faceletStickeringMask?.mask;
+              faceletInfo.facelet.material = axesInfo[faceletInfo.faceIdx].stickerMaterial[stickeringMask2];
+              const hintStickeringMask = typeof faceletStickeringMask === "string" ? stickeringMask2 : faceletStickeringMask.hintMask ?? stickeringMask2;
               if (faceletInfo.hintFacelet) {
-                faceletInfo.hintFacelet.material = axesInfo[faceletInfo.faceIdx].hintStickerMaterial[hintAppearance];
+                faceletInfo.hintFacelet.material = axesInfo[faceletInfo.faceIdx].hintStickerMaterial[hintStickeringMask];
               }
             }
           }
@@ -614,10 +631,10 @@ var Cube3D = class extends Object3D {
       }
       this.scheduleRenderCallback();
     }
-    const experimentalStickering = options.experimentalStickering;
-    if (typeof experimentalStickering !== "undefined" && this.options.experimentalStickering !== experimentalStickering && experimentalStickerings[experimentalStickering]) {
-      this.options.experimentalStickering = experimentalStickering;
-      this.setStickering(experimentalStickering);
+    const { experimentalStickeringMask } = options;
+    if (typeof experimentalStickeringMask !== "undefined") {
+      this.options.experimentalStickeringMask = experimentalStickeringMask;
+      this.setStickeringMask(experimentalStickeringMask);
       this.scheduleRenderCallback();
     }
   }
@@ -640,8 +657,11 @@ var Cube3D = class extends Object3D {
           -this.ease(moveProgress.fraction) * moveProgress.direction * move.amount * TAU / 4
         );
         for (let i = 0; i < pieces.length; i++) {
-          const k = this.kpuzzle.definition.moves[move.family][orbit].permutation[i];
-          if (i !== k || this.kpuzzle.definition.moves[move.family][orbit].orientation[i] !== 0) {
+          const quantumTransformation = this.kpuzzle.moveToTransformation(
+            move.modified({ amount: 1 })
+          );
+          const k = quantumTransformation.transformationData[orbit].permutation[i];
+          if (i !== k || quantumTransformation.transformationData[orbit].orientation[i] !== 0) {
             const j = reid333.stateData[orbit].pieces[i];
             this.pieces[orbit][j].matrix.premultiply(moveMatrix);
           }
@@ -680,7 +700,7 @@ var Cube3D = class extends Object3D {
         faceletInfo.hintFacelet = hintSticker;
         this.experimentalHintStickerMeshes.push(hintSticker);
       }
-      if (this.options.experimentalStickering === "picture" && pictureStickerCoords[orbit] && pictureStickerCoords[orbit][orbitPieceIdx] && pictureStickerCoords[orbit][orbitPieceIdx][i]) {
+      if (this.options.experimentalStickeringMask?.specialBehaviour === "picture" && pictureStickerCoords[orbit] && pictureStickerCoords[orbit][orbitPieceIdx] && pictureStickerCoords[orbit][orbitPieceIdx][i]) {
         const [rotate, offsetX, offsetY] = pictureStickerCoords[orbit][orbitPieceIdx][i];
         (async () => {
           const addImageSticker = async (hint) => {
@@ -754,11 +774,11 @@ var Cube3D = class extends Object3D {
     const box = sharedCubieFoundationGeometry();
     return new Mesh(
       box,
-      this.options.experimentalStickering === "picture" ? blackMesh : blackTranslucentMesh
+      this.options.experimentalStickeringMask?.specialBehaviour === "picture" ? blackMesh : blackTranslucentMesh
     );
   }
   createSticker(posAxisInfo, materialAxisInfo, isHint) {
-    const geo = this.options.experimentalStickering === "picture" ? newStickerGeometry() : isHint ? this.#sharedHintStickerGeometry() : sharedStickerGeometry();
+    const geo = this.options.experimentalStickeringMask?.specialBehaviour === "picture" ? newStickerGeometry() : isHint ? this.#sharedHintStickerGeometry() : sharedStickerGeometry();
     const stickerMesh = new Mesh(
       geo,
       isHint ? materialAxisInfo.hintStickerMaterial.regular : materialAxisInfo.stickerMaterial.regular
@@ -766,7 +786,7 @@ var Cube3D = class extends Object3D {
     stickerMesh.setRotationFromEuler(posAxisInfo.fromZ);
     stickerMesh.position.copy(posAxisInfo.vector);
     stickerMesh.position.multiplyScalar(
-      isHint ? this.options.experimentalStickering === "picture" ? EXPERIMENTAL_PICTURE_CUBE_HINT_ELEVATION : cubieDimensions.hintStickerElevation : cubieDimensions.stickerElevation
+      isHint ? this.options.experimentalStickeringMask?.specialBehaviour === "picture" ? EXPERIMENTAL_PICTURE_CUBE_HINT_ELEVATION : cubieDimensions.hintStickerElevation : cubieDimensions.stickerElevation
     );
     return stickerMesh;
   }
@@ -976,9 +996,9 @@ var StickerDef = class {
     this.stickerStart = filler.ipos;
     const sdColor = new Color(stickerDat.color).getHex();
     this.origColor = sdColor;
-    this.origColorAppearance = sdColor;
-    if (options?.appearance) {
-      this.setAppearance(filler, options.appearance);
+    this.origColorStickeringMask = sdColor;
+    if (options?.stickeringMask) {
+      this.setStickeringMask(filler, options.stickeringMask);
     }
     this.faceColor = sdColor;
     const coords = this.stickerCoords(stickerDat.coords, trim);
@@ -1037,9 +1057,9 @@ var StickerDef = class {
       filler.ind[i] = indv | filler.ind[i] & 1;
     }
   }
-  setAppearance(filler, faceletMeshAppearance) {
+  setStickeringMask(filler, faceletMeshStickeringMask) {
     let c = 0;
-    switch (faceletMeshAppearance) {
+    switch (faceletMeshStickeringMask) {
       case "regular": {
         c = this.origColor;
         break;
@@ -1063,7 +1083,7 @@ var StickerDef = class {
       case "invisible":
         c = this.origColor;
     }
-    this.origColorAppearance = c;
+    this.origColorStickeringMask = c;
     for (let i = 9 * this.stickerStart; i < 9 * this.stickerEnd; i += 3) {
       filler.colors[filler.pos + i] = c >> 16;
       filler.colors[filler.pos + i + 1] = c >> 8 & 255;
@@ -1076,7 +1096,7 @@ var StickerDef = class {
     }
     this.setHintStickers(
       filler,
-      faceletMeshAppearance !== "invisible" && !this.isDup
+      faceletMeshStickeringMask !== "invisible" && !this.isDup
     );
   }
   addUVs(filler) {
@@ -1119,7 +1139,7 @@ var StickerDef = class {
     return 1;
   }
   setColor(filler, sd) {
-    const c = sd.origColorAppearance;
+    const c = sd.origColorStickeringMask;
     if (this.faceColor !== c) {
       this.faceColor = c;
       const sz = filler.pos;
@@ -1236,9 +1256,9 @@ var PG3D = class extends Object3D2 {
         this.stickers[orbit][ori] = [];
       }
       const options = {};
-      if (params.appearance) {
-        options.appearance = getFaceletAppearance(
-          params.appearance,
+      if (params.stickeringMask) {
+        options.stickeringMask = getFaceletStickeringMask(
+          params.stickeringMask,
           orbit,
           ord,
           ori,
@@ -1364,28 +1384,28 @@ var PG3D = class extends Object3D2 {
     if (transformations.invert) {
       closestMove = closestMove.invert();
     }
-    const order = this.kpuzzle.moveToTransformation(
-      closestMove
-    ).repetitionOrder();
+    const order = this.kpuzzle.moveToTransformation(closestMove).repetitionOrder();
     return { move: closestMove, order };
   }
-  experimentalSetAppearance(appearance) {
-    this.params.appearance = appearance;
-    for (const orbitName in this.kpuzzle.definition.orbits) {
-      const { numPieces, numOrientations: orientations } = this.kpuzzle.definition.orbits[orbitName];
-      for (let pieceIdx = 0; pieceIdx < numPieces; pieceIdx++) {
-        for (let faceletIdx = 0; faceletIdx < orientations; faceletIdx++) {
-          const faceletAppearance = getFaceletAppearance(
-            appearance,
-            orbitName,
-            pieceIdx,
-            faceletIdx,
-            false
-          );
-          const stickerDef = this.stickers[orbitName][faceletIdx][pieceIdx];
-          if (this.textured && this.hintMaterialDisposable && faceletAppearance === "invisible") {
-          } else {
-            stickerDef.setAppearance(this.filler, faceletAppearance);
+  setStickeringMask(stickeringMask) {
+    this.params.stickeringMask = stickeringMask;
+    if (stickeringMask.specialBehaviour !== "picture") {
+      for (const orbitName in this.kpuzzle.definition.orbits) {
+        const { numPieces, numOrientations: orientations } = this.kpuzzle.definition.orbits[orbitName];
+        for (let pieceIdx = 0; pieceIdx < numPieces; pieceIdx++) {
+          for (let faceletIdx = 0; faceletIdx < orientations; faceletIdx++) {
+            const faceletStickeringMask = getFaceletStickeringMask(
+              stickeringMask,
+              orbitName,
+              pieceIdx,
+              faceletIdx,
+              false
+            );
+            const stickerDef = this.stickers[orbitName][faceletIdx][pieceIdx];
+            if (this.textured && this.hintMaterialDisposable && faceletStickeringMask === "invisible") {
+            } else {
+              stickerDef.setStickeringMask(this.filler, faceletStickeringMask);
+            }
           }
         }
       }
@@ -1405,9 +1425,7 @@ var PG3D = class extends Object3D2 {
     let colormods = 0;
     const filler = this.filler;
     const ind = filler.ind;
-    if (!this.lastPos || this.#pendingStickeringUpdate || !this.lastPos.state.experimentalToTransformation().isIdentical(
-      transformation
-    )) {
+    if (!this.lastPos || this.#pendingStickeringUpdate || !this.lastPos.state.experimentalToTransformation().isIdentical(transformation)) {
       for (const orbit in this.stickers) {
         const pieces = this.stickers[orbit];
         const pos2 = transformation.transformationData[orbit];
@@ -1582,7 +1600,7 @@ var PG3D = class extends Object3D2 {
       this.hintMaterial = new MeshBasicMaterial2({
         vertexColors: true,
         transparent: true,
-        opacity: 0.5
+        opacity: v
       });
       this.hintMaterialDisposable = true;
     }
@@ -1654,7 +1672,7 @@ var PG3D = class extends Object3D2 {
       this.hintMaterial = new MeshBasicMaterial2({
         map: hintTexture,
         side: FrontSide,
-        transparent: false
+        transparent: true
       });
       this.hintMaterialDisposable = true;
     } else {
@@ -1727,4 +1745,4 @@ export {
   cube3DShim,
   pg3dShim
 };
-//# sourceMappingURL=twisty-dynamic-3d-PU74EKRA.js.map
+//# sourceMappingURL=twisty-dynamic-3d-OAYMJ6OD.js.map