@rednaxela101/cubing 0.63.7 → 0.63.9

package/dist/lib/cubing/chunks/{twisty-dynamic-3d-XQOH6E2O.js → twisty-dynamic-3d-MF76FSDA.js}

@@ -3,7 +3,7 @@ import {
   bulk3DCode,
   haveStartedSharingRenderers,
   hintFaceletStyles
-} from "./chunk-GP66KY36.js";
+} from "./chunk-F765ZFNM.js";
 import "./chunk-3ODTF4HE.js";
 import {
   cube3x3x3,
@@ -16,18 +16,17 @@ import {
 
 // src/cubing/twisty/views/3D/puzzles/Cube3D.ts
 import { BackSide, DoubleSide, FrontSide } from "three/src/constants.js";
-import { BufferAttribute } from "three/src/core/BufferAttribute.js";
-import { BufferGeometry } from "three/src/core/BufferGeometry.js";
+import { BufferAttribute as BufferAttribute2 } from "three/src/core/BufferAttribute.js";
+import { BufferGeometry as BufferGeometry2 } from "three/src/core/BufferGeometry.js";
 import { Object3D } from "three/src/core/Object3D.js";
 import { BoxGeometry } from "three/src/geometries/BoxGeometry.js";
 import { TextureLoader } from "three/src/loaders/TextureLoader.js";
-import { MeshBasicMaterial } from "three/src/materials/MeshBasicMaterial.js";
-import { Color } from "three/src/math/Color.js";
-import { Euler } from "three/src/math/Euler.js";
+import { MeshBasicMaterial as MeshBasicMaterial2 } from "three/src/materials/MeshBasicMaterial.js";
+import { Color as Color2 } from "three/src/math/Color.js";
 import { Matrix4 } from "three/src/math/Matrix4.js";
 import { Quaternion } from "three/src/math/Quaternion.js";
 import { Vector2 } from "three/src/math/Vector2.js";
-import { Vector3 } from "three/src/math/Vector3.js";
+import { Vector3 as Vector33 } from "three/src/math/Vector3.js";
 import { Group } from "three/src/objects/Group.js";
 import { Mesh } from "three/src/objects/Mesh.js";
 
@@ -36,63 +35,316 @@ function smootherStep(x) {
   return x * x * x * (10 - x * (15 - 6 * x));
 }
 
+// src/cubing/twisty/views/3D/puzzles/BeveledCubieGeometry.ts
+import { BufferAttribute } from "three/src/core/BufferAttribute.js";
+import { BufferGeometry } from "three/src/core/BufferGeometry.js";
+import { Vector3 } from "three/src/math/Vector3.js";
+function clamp(value, bound) {
+  return Math.min(Math.max(value, -bound), bound);
+}
+function component(vector, axis) {
+  return axis === 0 ? vector.x : axis === 1 ? vector.y : vector.z;
+}
+function setComponent(vector, axis, value) {
+  if (axis === 0) {
+    vector.x = value;
+  } else if (axis === 1) {
+    vector.y = value;
+  } else {
+    vector.z = value;
+  }
+}
+function beveledCubieGeometry(faceNormals, outerFaceIndices, halfSize, outerAxisRadius, innerEdgeRadius, innerCornerRadius, cornerSharpness, segments) {
+  const allRadii = [outerAxisRadius, innerEdgeRadius, innerCornerRadius];
+  const maxRadius = Math.max(...allRadii);
+  if (!(Math.min(...allRadii) > 0 && maxRadius < halfSize)) {
+    throw new Error(
+      "Every radius must be positive and smaller than the half-size."
+    );
+  }
+  if (cornerSharpness <= 0 || segments < 1) {
+    throw new Error(
+      "The corner sharpness must be positive, with at least one segment."
+    );
+  }
+  const outward = [
+    [0, 0],
+    [0, 0],
+    [0, 0]
+  ];
+  for (let faceIdx = 0; faceIdx < faceNormals.length; faceIdx++) {
+    const normal2 = faceNormals[faceIdx];
+    const axis = Math.abs(normal2.x) > 0.5 ? 0 : Math.abs(normal2.y) > 0.5 ? 1 : 2;
+    outward[axis][component(normal2, axis) > 0 ? 1 : 0] = outerFaceIndices.includes(faceIdx) ? 1 : 0;
+  }
+  const inner = halfSize - maxRadius;
+  const samples = [];
+  for (let i = 0; i <= segments; i++) {
+    samples.push(-halfSize + maxRadius * i / segments);
+  }
+  for (let i = 0; i <= segments; i++) {
+    samples.push(inner + maxRadius * i / segments);
+  }
+  const gridSize = samples.length;
+  const positions = [];
+  const indices = [];
+  const geometry = new BufferGeometry();
+  const point = new Vector3();
+  const core = new Vector3();
+  const offset = new Vector3();
+  const u = new Vector3();
+  const v = new Vector3();
+  const radii = new Vector3();
+  const outerness = [0, 0, 0];
+  const radiiAt = (p, out) => {
+    const towardCorner = (Math.abs(p.x) * Math.abs(p.y) * Math.abs(p.z) / (halfSize * halfSize * halfSize)) ** cornerSharpness;
+    let outwardFaceCount = 0;
+    for (let axis = 0; axis < 3; axis++) {
+      const towardPositive = (component(p, axis) / halfSize + 1) / 2;
+      outerness[axis] = towardPositive * outward[axis][1] + (1 - towardPositive) * outward[axis][0];
+      outwardFaceCount += outerness[axis];
+    }
+    const interiorCorner = Math.min(Math.max(2 - outwardFaceCount, 0), 1);
+    for (let axis = 0; axis < 3; axis++) {
+      const alongEdge = innerEdgeRadius + (outerAxisRadius - innerEdgeRadius) * outerness[axis];
+      const atCorner = innerCornerRadius + (outerAxisRadius - innerCornerRadius) * outerness[axis];
+      setComponent(
+        out,
+        axis,
+        alongEdge + (atCorner - alongEdge) * towardCorner * interiorCorner
+      );
+    }
+  };
+  for (let faceIdx = 0; faceIdx < faceNormals.length; faceIdx++) {
+    const normal2 = faceNormals[faceIdx];
+    u.set(normal2.y, normal2.z, normal2.x);
+    v.crossVectors(normal2, u);
+    const vertexStart = positions.length / 3;
+    for (let i = 0; i < gridSize; i++) {
+      for (let j = 0; j < gridSize; j++) {
+        point.copy(u).multiplyScalar(samples[i]).addScaledVector(v, samples[j]).addScaledVector(normal2, halfSize);
+        radiiAt(point, radii);
+        core.set(
+          clamp(point.x, halfSize - radii.x),
+          clamp(point.y, halfSize - radii.y),
+          clamp(point.z, halfSize - radii.z)
+        );
+        offset.set(
+          (point.x - core.x) / radii.x,
+          (point.y - core.y) / radii.y,
+          (point.z - core.z) / radii.z
+        ).normalize();
+        positions.push(
+          core.x + offset.x * radii.x,
+          core.y + offset.y * radii.y,
+          core.z + offset.z * radii.z
+        );
+      }
+    }
+    const indexStart = indices.length;
+    for (let i = 0; i < gridSize - 1; i++) {
+      for (let j = 0; j < gridSize - 1; j++) {
+        const a = vertexStart + i * gridSize + j;
+        const b = a + gridSize;
+        indices.push(a, b, b + 1, a, b + 1, a + 1);
+      }
+    }
+    geometry.addGroup(indexStart, indices.length - indexStart, faceIdx);
+  }
+  geometry.setAttribute(
+    "position",
+    new BufferAttribute(new Float32Array(positions), 3)
+  );
+  geometry.setIndex(indices);
+  return geometry;
+}
+
+// src/cubing/twisty/views/3D/puzzles/CubieStyle.ts
+import { MeshBasicMaterial } from "three/src/materials/MeshBasicMaterial.js";
+import { Color } from "three/src/math/Color.js";
+import { Euler } from "three/src/math/Euler.js";
+import { Vector3 as Vector32 } from "three/src/math/Vector3.js";
+var cubeFaceStyles = [
+  {
+    vector: new Vector32(0, 1, 0),
+    fromZ: new Euler(-TAU / 4, 0, 0),
+    color: 16777215,
+    dimColor: 14540253,
+    hintColor: 16777215,
+    hintDimColor: 14540253,
+    hintOpacityScale: 1.25
+  },
+  {
+    vector: new Vector32(-1, 0, 0),
+    fromZ: new Euler(0, -TAU / 4, 0),
+    color: 16750848,
+    dimColor: 8934656,
+    hintColor: 16750848,
+    hintDimColor: 8930304,
+    hintOpacityScale: 1
+  },
+  {
+    vector: new Vector32(0, 0, 1),
+    fromZ: new Euler(0, 0, 0),
+    color: 65280,
+    dimColor: 34816,
+    hintColor: 65280,
+    hintDimColor: 39168,
+    hintOpacityScale: 1
+  },
+  {
+    vector: new Vector32(1, 0, 0),
+    fromZ: new Euler(0, TAU / 4, 0),
+    color: 16711680,
+    dimColor: 6684672,
+    hintColor: 16711680,
+    hintDimColor: 6684672,
+    hintOpacityScale: 1
+  },
+  {
+    vector: new Vector32(0, 0, -1),
+    fromZ: new Euler(0, TAU / 2, 0),
+    color: 2254591,
+    dimColor: 1127304,
+    hintColor: 2254591,
+    hintDimColor: 6246,
+    hintOpacityScale: 0.75
+  },
+  {
+    vector: new Vector32(0, -1, 0),
+    fromZ: new Euler(TAU / 4, 0, 0),
+    color: 16776960,
+    dimColor: 8947712,
+    hintColor: 16776960,
+    hintDimColor: 14540032,
+    hintOpacityScale: 1.25
+  }
+];
+var cubieBodyDimensions = {
+  /**
+   * Half-width of a `stickerless` cubie body. Deliberately more than the 0.5
+   * that would make pieces exactly fill their slot: oversized pieces press into
+   * each other, which buries most of each rounded edge inside its neighbor and
+   * keeps the dividing lines thin.
+   */
+  halfWidth: 0.54,
+  /**
+   * Roll at the rim of a facelet, along the axis the facelet faces — so also
+   * the rounding of the puzzle's own outer edges and corners. Effectively zero,
+   * which leaves those edges sharp and the plates dead flat.
+   *
+   * Not exactly zero: the construction lifts each face off the core box along
+   * this axis, so a true zero leaves nothing to normalize in the middle of a
+   * face. A few thousandths is below a pixel at any sane size.
+   */
+  outerAxisRadius: 4e-3,
+  /**
+   * Rounding along an axis pointing at a neighboring piece, in the middle of an
+   * edge. Sets how wide the dividing line between two pieces reads.
+   */
+  innerEdgeRadius: 0.07,
+  /**
+   * The same axis at a corner. This one rounds a facelet's corners within its
+   * own plane, so it is what turns a center into a disc, and it costs no
+   * thickness because the roll stays `outerAxisRadius` deep.
+   */
+  innerCornerRadius: 0.34,
+  /** How tightly the corner rounding is pulled in toward the corners. */
+  cornerSharpness: 1.3,
+  /**
+   * Everything above, shrunk about each piece's own center. Scaling rather than
+   * trimming the half-width leaves every proportion of the piece untouched and
+   * only opens a gap against its neighbors, so the pieces read as separate with
+   * a thin line of the puzzle's interior showing between them.
+   */
+  pieceScale: 0.95,
+  roundingSegments: 3
+};
+function cubieBodyHalfExtent(layers) {
+  return layers / 2 - 0.5 + cubieBodyDimensions.halfWidth * cubieBodyDimensions.pieceScale;
+}
+function newBodyMaterial(color) {
+  return new MeshBasicMaterial({
+    color: typeof color === "number" ? new Color(color).convertLinearToSRGB() : color
+  });
+}
+function newVertexColorBodyMaterial() {
+  const material = newBodyMaterial(16777215);
+  material.vertexColors = true;
+  return material;
+}
+var bodyMaskColors = {
+  /** The plastic that shows through the grooves between pieces. */
+  internal: 921102,
+  ignored: 6710886,
+  oriented: 4513228,
+  experimentalOriented2: 16776618,
+  mystery: 15911883
+};
+var hintMaskStyles = {
+  ignored: { color: 13421772, opacity: 0.75 },
+  oriented: { color: 4513228, opacity: 0.5 },
+  experimentalOriented2: { color: 16775545, opacity: 0.5 },
+  mystery: { color: 15911883, opacity: 0.5 }
+};
+
 // src/cubing/twisty/views/3D/puzzles/Cube3D.ts
 var svgLoader = new TextureLoader();
-var ignoredMaterial = new MeshBasicMaterial({
-  color: new Color(6710886).convertLinearToSRGB()
-});
-var ignoredMaterialHint = new MeshBasicMaterial({
-  color: new Color(13421772).convertLinearToSRGB(),
-  side: BackSide,
-  transparent: true,
-  opacity: 0.75
+function newHintMaterial(style) {
+  return new MeshBasicMaterial2({
+    color: new Color2(style.color).convertLinearToSRGB(),
+    side: BackSide,
+    transparent: true,
+    opacity: style.opacity
+  });
+}
+var ignoredMaterial = new MeshBasicMaterial2({
+  color: new Color2(bodyMaskColors.ignored).convertLinearToSRGB()
 });
-var invisibleMaterial = new MeshBasicMaterial({
+var ignoredMaterialHint = newHintMaterial(hintMaskStyles.ignored);
+var invisibleMaterial = new MeshBasicMaterial2({
   visible: false
 });
-var orientedMaterial = new MeshBasicMaterial({
-  color: 4513228
-});
-var orientedMaterialHint = new MeshBasicMaterial({
-  color: 4513228,
-  side: BackSide,
-  transparent: true,
-  opacity: 0.5
-});
-var experimentalOriented2Material = new MeshBasicMaterial({
-  color: 16776618
-});
-var experimentalOriented2MaterialHint = new MeshBasicMaterial({
-  color: 16775545,
-  side: BackSide,
-  transparent: true,
-  opacity: 0.5
+var orientedMaterial = new MeshBasicMaterial2({
+  color: bodyMaskColors.oriented
 });
-var mysteryMaterial = new MeshBasicMaterial({
-  color: 15911883
+var orientedMaterialHint = newHintMaterial(hintMaskStyles.oriented);
+var experimentalOriented2Material = new MeshBasicMaterial2({
+  color: bodyMaskColors.experimentalOriented2
 });
-var mysterMaterialHint = new MeshBasicMaterial({
-  color: 15911883,
-  side: BackSide,
-  transparent: true,
-  opacity: 0.5
+var experimentalOriented2MaterialHint = newHintMaterial(
+  hintMaskStyles.experimentalOriented2
+);
+var mysteryMaterial = new MeshBasicMaterial2({
+  color: bodyMaskColors.mystery
 });
+var mysterMaterialHint = newHintMaterial(hintMaskStyles.mystery);
+var internalBodyMaterial = newBodyMaterial(bodyMaskColors.internal);
+var ignoredBodyMaterial = newBodyMaterial(bodyMaskColors.ignored);
+var orientedBodyMaterial = newBodyMaterial(bodyMaskColors.oriented);
+var experimentalOriented2BodyMaterial = newBodyMaterial(
+  bodyMaskColors.experimentalOriented2
+);
+var mysteryBodyMaterial = newBodyMaterial(bodyMaskColors.mystery);
 var AxisInfo = class {
-  constructor(vector, fromZ, color, dimColor, hintOpacityScale, options) {
-    this.vector = vector;
-    this.fromZ = fromZ;
-    this.color = color;
-    this.dimColor = dimColor;
-    this.hintOpacityScale = hintOpacityScale;
-    const colorLinearSRGB = new Color(color).convertLinearToSRGB();
-    const dimColorLinearSRGB = new Color(dimColor).convertLinearToSRGB();
+  vector;
+  fromZ;
+  stickerMaterial;
+  hintStickerMaterial;
+  bodyMaterial;
+  constructor(style) {
+    const { color, dimColor, hintOpacityScale } = style;
+    this.vector = style.vector;
+    this.fromZ = style.fromZ;
+    const colorLinearSRGB = new Color2(color).convertLinearToSRGB();
+    const dimColorLinearSRGB = new Color2(dimColor).convertLinearToSRGB();
     this.stickerMaterial = {
-      regular: new MeshBasicMaterial({
+      regular: new MeshBasicMaterial2({
         color: colorLinearSRGB,
         side: FrontSide
         // TODO: set to `DoubleSide` when hint facelets are disabled.
       }),
-      dim: new MeshBasicMaterial({
+      dim: new MeshBasicMaterial2({
         color: dimColorLinearSRGB,
         side: FrontSide
         // TODO: set to `DoubleSide` when hint facelets are disabled.
@@ -104,18 +356,12 @@ var AxisInfo = class {
       mystery: mysteryMaterial
     };
     this.hintStickerMaterial = {
-      regular: new MeshBasicMaterial({
-        color: new Color(options?.hintColor ?? color).convertLinearToSRGB(),
-        side: BackSide,
-        transparent: true,
+      regular: newHintMaterial({
+        color: style.hintColor,
         opacity: 0.5 * hintOpacityScale
       }),
-      dim: new MeshBasicMaterial({
-        color: new Color(
-          options?.hintDimColor ?? dimColor
-        ).convertLinearToSRGB(),
-        side: BackSide,
-        transparent: true,
+      dim: newHintMaterial({
+        color: style.hintDimColor,
         opacity: 0.5 * hintOpacityScale
       }),
       oriented: orientedMaterialHint,
@@ -124,64 +370,20 @@ var AxisInfo = class {
       invisible: invisibleMaterial,
       mystery: mysterMaterialHint
     };
+    this.bodyMaterial = {
+      regular: newBodyMaterial(colorLinearSRGB),
+      dim: newBodyMaterial(dimColorLinearSRGB),
+      oriented: orientedBodyMaterial,
+      experimentalOriented2: experimentalOriented2BodyMaterial,
+      ignored: ignoredBodyMaterial,
+      // A solid piece of plastic can't have a hole punched in it, so an
+      // invisible facelet falls back to the internal plastic color.
+      invisible: internalBodyMaterial,
+      mystery: mysteryBodyMaterial
+    };
   }
-  vector;
-  fromZ;
-  color;
-  dimColor;
-  hintOpacityScale;
-  stickerMaterial;
-  hintStickerMaterial;
 };
-var axesInfo = [
-  new AxisInfo(
-    new Vector3(0, 1, 0),
-    new Euler(-TAU / 4, 0, 0),
-    16777215,
-    14540253,
-    1.25
-  ),
-  new AxisInfo(
-    new Vector3(-1, 0, 0),
-    new Euler(0, -TAU / 4, 0),
-    16750848,
-    8934656,
-    1,
-    { hintDimColor: 8930304 }
-  ),
-  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: 6684672 }
-  ),
-  new AxisInfo(
-    new Vector3(0, 0, -1),
-    new Euler(0, TAU / 2, 0),
-    2254591,
-    1127304,
-    0.75,
-    { hintDimColor: 6246 }
-  ),
-  new AxisInfo(
-    new Vector3(0, -1, 0),
-    new Euler(TAU / 4, 0, 0),
-    16776960,
-    8947712,
-    1.25,
-    { hintDimColor: 14540032 }
-  )
-];
+var axesInfo = cubeFaceStyles.map((style) => new AxisInfo(style));
 var face = {
   U: 0,
   L: 1,
@@ -226,11 +428,19 @@ var cubieDimensions = {
   // stickerWidth: 0.85, // Now `faceletScale` in options.
   stickerElevation: 0.503,
   foundationWidth: 1,
-  defaultHintStickerElevation: 1.45
+  defaultHintStickerElevation: 1.45,
+  /**
+   * How far back the eight corners of a `stickerless` cubie are shaved, from 0
+   * (not at all) to 1 (all the way back to the edges). This is the only knob
+   * that widens the notch where four pieces meet without also widening the
+   * straight dividing lines.
+   */
+  bodyVertexCut: 0.45
 };
 var EXPERIMENTAL_PICTURE_CUBE_HINT_ELEVATION = 2;
 var cube3DOptionsDefaults = {
   showMainStickers: true,
+  experimentalCubieStyle: "stickerless",
   hintFacelets: "floating",
   showFoundation: true,
   experimentalStickeringMask: void 0,
@@ -247,12 +457,12 @@ function getFaceletScale(options) {
   }
   return options.faceletScale;
 }
-var blackMesh = new MeshBasicMaterial({
+var blackMesh = new MeshBasicMaterial2({
   color: 0,
   opacity: 1,
   transparent: true
 });
-var blackTranslucentMesh = new MeshBasicMaterial({
+var blackTranslucentMesh = new MeshBasicMaterial2({
   color: 0,
   opacity: 0.3,
   transparent: true
@@ -275,18 +485,18 @@ function t(v, t4) {
   return new Quaternion().setFromAxisAngle(v, TAU * t4 / 4);
 }
 var r = {
-  O: new Vector3(0, 0, 0),
-  U: new Vector3(0, -1, 0),
-  L: new Vector3(1, 0, 0),
-  F: new Vector3(0, 0, -1),
-  R: new Vector3(-1, 0, 0),
-  B: new Vector3(0, 0, 1),
-  D: new Vector3(0, 1, 0)
+  O: new Vector33(0, 0, 0),
+  U: new Vector33(0, -1, 0),
+  L: new Vector33(1, 0, 0),
+  F: new Vector33(0, 0, -1),
+  R: new Vector33(-1, 0, 0),
+  B: new Vector33(0, 0, 1),
+  D: new Vector33(0, 1, 0)
 };
 var firstPiecePosition = {
-  EDGES: new Vector3(0, 1, 1),
-  CORNERS: new Vector3(1, 1, 1),
-  CENTERS: new Vector3(0, 1, 0)
+  EDGES: new Vector33(0, 1, 1),
+  CORNERS: new Vector33(1, 1, 1),
+  CENTERS: new Vector33(0, 1, 0)
 };
 var orientationRotation = {
   EDGES: [0, 1].map(
@@ -344,6 +554,9 @@ var pieceDefs = {
   ]
 };
 var CUBE_SCALE = 1 / 3;
+function cubeScale(stickerless) {
+  return stickerless ? 0.5 / cubieBodyHalfExtent(3) : CUBE_SCALE;
+}
 var pictureStickerCoords = {
   EDGES: [
     [
@@ -455,11 +668,11 @@ function sharedCubieFoundationGeometry() {
   ));
 }
 function newStickerGeometry() {
-  const r2 = new BufferGeometry();
+  const r2 = new BufferGeometry2();
   const half = 0.5;
   r2.setAttribute(
     "position",
-    new BufferAttribute(
+    new BufferAttribute2(
       new Float32Array([
         half,
         half,
@@ -485,7 +698,7 @@ function newStickerGeometry() {
   );
   r2.setAttribute(
     "uv",
-    new BufferAttribute(
+    new BufferAttribute2(
       new Float32Array([
         1,
         1,
@@ -517,6 +730,26 @@ function newStickerGeometry() {
   );
   return r2;
 }
+var cubieBodyGeometryCache = /* @__PURE__ */ new Map();
+function cubieBodyGeometry(orbit, outerAxes) {
+  const cached = cubieBodyGeometryCache.get(orbit);
+  if (cached) {
+    return cached;
+  }
+  const scale = cubieBodyDimensions.pieceScale;
+  const geometry = beveledCubieGeometry(
+    axesInfo.map((axisInfo) => axisInfo.vector),
+    outerAxes,
+    cubieBodyDimensions.halfWidth * scale,
+    cubieBodyDimensions.outerAxisRadius * scale,
+    cubieBodyDimensions.innerEdgeRadius * scale,
+    cubieBodyDimensions.innerCornerRadius * scale,
+    cubieBodyDimensions.cornerSharpness,
+    cubieBodyDimensions.roundingSegments
+  );
+  cubieBodyGeometryCache.set(orbit, geometry);
+  return geometry;
+}
 var sharedStickerGeometryCache;
 function sharedStickerGeometry() {
   return sharedStickerGeometryCache ??= newStickerGeometry();
@@ -547,7 +780,8 @@ var Cube3D = class extends Object3D {
         this.createCubie.bind(this, orbit, orbitFaceletInfo)
       );
     }
-    this.scale.set(CUBE_SCALE, CUBE_SCALE, CUBE_SCALE);
+    const scale = cubeScale(this.#stickerless());
+    this.scale.set(scale, scale, scale);
     if (this.options.experimentalStickeringMask) {
       this.setStickeringMask(this.options.experimentalStickeringMask);
     }
@@ -654,12 +888,24 @@ var Cube3D = class extends Object3D {
   experimentalSetHintStickerSpriteURL(hintStickerSpriteURL) {
     this.#setHintSpriteURL?.(hintStickerSpriteURL);
   }
+  #stickerless() {
+    return this.options.experimentalCubieStyle === "stickerless";
+  }
+  #setFaceletMaterial(faceletInfo, mask) {
+    const axisInfo = axesInfo[faceletInfo.faceIdx];
+    const { bodyMaterialIndex } = faceletInfo;
+    if (bodyMaterialIndex === void 0) {
+      faceletInfo.facelet.material = axisInfo.stickerMaterial[mask];
+    } else {
+      faceletInfo.facelet.material[bodyMaterialIndex] = axisInfo.bodyMaterial[mask];
+    }
+  }
   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;
+            this.#setFaceletMaterial(faceletInfo, "invisible");
             const { hintFacelet } = faceletInfo;
             if (hintFacelet) {
               hintFacelet.material = invisibleMaterial;
@@ -682,7 +928,7 @@ var Cube3D = class extends Object3D {
             if (faceletStickeringMask) {
               const faceletInfo = pieceInfo[faceletIdx];
               const stickeringMask2 = typeof faceletStickeringMask === "string" ? faceletStickeringMask : faceletStickeringMask?.mask;
-              faceletInfo.facelet.material = axesInfo[faceletInfo.faceIdx].stickerMaterial[stickeringMask2];
+              this.#setFaceletMaterial(faceletInfo, stickeringMask2);
               const hintStickeringMask = typeof faceletStickeringMask === "string" ? stickeringMask2 : faceletStickeringMask.hintMask ?? stickeringMask2;
               if (faceletInfo.hintFacelet) {
                 faceletInfo.hintFacelet.material = axesInfo[faceletInfo.faceIdx].hintStickerMaterial[hintStickeringMask];
@@ -769,26 +1015,39 @@ var Cube3D = class extends Object3D {
     const cubieFaceletInfo = [];
     orbitFacelets.push(cubieFaceletInfo);
     const cubie = new Group();
-    if (this.options.showFoundation) {
+    const body = this.#stickerless() ? new Mesh(
+      cubieBodyGeometry(
+        orbit,
+        cubieStickerOrder.slice(0, piece.stickerFaces.length)
+      ),
+      axesInfo.map(() => internalBodyMaterial)
+    ) : null;
+    if (body) {
+      cubie.add(body);
+    } else if (this.options.showFoundation) {
       const foundation = this.createCubieFoundation();
       cubie.add(foundation);
       this.experimentalFoundationMeshes.push(foundation);
     }
     for (let i = 0; i < piece.stickerFaces.length; i++) {
-      const sticker = this.createSticker(
-        axesInfo[cubieStickerOrder[i]],
-        axesInfo[piece.stickerFaces[i]],
-        false
-      );
-      const faceletInfo = {
-        faceIdx: piece.stickerFaces[i],
-        facelet: sticker
+      const faceIdx = piece.stickerFaces[i];
+      const faceletInfo = body ? { faceIdx, facelet: body, bodyMaterialIndex: cubieStickerOrder[i] } : {
+        faceIdx,
+        facelet: this.createSticker(
+          axesInfo[cubieStickerOrder[i]],
+          axesInfo[faceIdx],
+          false
+        )
       };
-      cubie.add(sticker);
+      if (body) {
+        body.material[cubieStickerOrder[i]] = axesInfo[faceIdx].bodyMaterial.regular;
+      } else {
+        cubie.add(faceletInfo.facelet);
+      }
       if (this.options.hintFacelets === "floating") {
         const hintSticker = this.createSticker(
           axesInfo[cubieStickerOrder[i]],
-          axesInfo[piece.stickerFaces[i]],
+          axesInfo[faceIdx],
           true
         );
         cubie.add(hintSticker);
@@ -805,7 +1064,7 @@ var Cube3D = class extends Object3D {
               axesInfo[piece.stickerFaces[i]],
               hint
             );
-            mesh.material = new MeshBasicMaterial({
+            mesh.material = new MeshBasicMaterial2({
               map: texture,
               side: hint ? BackSide : DoubleSide,
               transparent: true
@@ -834,7 +1093,7 @@ var Cube3D = class extends Object3D {
             }
             mesh.geometry.setAttribute(
               "uv",
-              new BufferAttribute(
+              new BufferAttribute2(
                 new Float32Array([
                   v3.x,
                   v3.y,
@@ -904,6 +1163,9 @@ var Cube3D = class extends Object3D {
   }
   /** @deprecated */
   experimentalSetFoundationOpacity(opacity) {
+    if (this.experimentalFoundationMeshes.length === 0) {
+      return;
+    }
     this.experimentalFoundationMeshes[0].material.opacity = opacity;
   }
   /** @deprecated */
@@ -913,8 +1175,10 @@ var Cube3D = class extends Object3D {
       for (const pieceInfo of orbitInfo) {
         for (const faceletInfo of pieceInfo) {
           const scale = getFaceletScale(this.options);
-          faceletInfo.facelet.scale.setX(scale);
-          faceletInfo.facelet.scale.setY(scale);
+          if (faceletInfo.bodyMaterialIndex === void 0) {
+            faceletInfo.facelet.scale.setX(scale);
+            faceletInfo.facelet.scale.setY(scale);
+          }
           faceletInfo.hintFacelet?.scale.setX(scale);
           faceletInfo.hintFacelet?.scale.setY(scale);
         }
@@ -940,24 +1204,361 @@ var Cube3D = class extends Object3D {
   }
 };
 
+// src/cubing/twisty/views/3D/puzzles/CubePieces.ts
+import { BufferAttribute as BufferAttribute3 } from "three/src/core/BufferAttribute.js";
+import { BufferGeometry as BufferGeometry3 } from "three/src/core/BufferGeometry.js";
+import { Matrix4 as Matrix42 } from "three/src/math/Matrix4.js";
+import { Vector3 as Vector34 } from "three/src/math/Vector3.js";
+
+// src/cubing/twisty/views/3D/puzzles/StickerlessPlan.ts
+var HINT_FACELET_ELEVATION = 0.5;
+var HINT_FACELET_SCALE = 0.85;
+var faceletMeshStickeringMasks = [
+  "regular",
+  "dim",
+  "oriented",
+  "experimentalOriented2",
+  "ignored",
+  "invisible",
+  "mystery"
+];
+function bodyColor(style, mask) {
+  switch (mask) {
+    case "regular":
+      return style.color;
+    case "dim":
+      return style.dimColor;
+    // A solid piece of plastic can't have a hole punched in it, so an invisible
+    // facelet falls back to the internal plastic color.
+    case "invisible":
+      return bodyMaskColors.internal;
+    default:
+      return bodyMaskColors[mask];
+  }
+}
+function hintColor(style, mask) {
+  switch (mask) {
+    case "regular":
+      return { color: style.hintColor, opacity: 0.5 * style.hintOpacityScale };
+    case "dim":
+      return {
+        color: style.hintDimColor,
+        opacity: 0.5 * style.hintOpacityScale
+      };
+    case "invisible":
+      return { color: 0, opacity: 0 };
+    default:
+      return hintMaskStyles[mask];
+  }
+}
+function faceletAppearanceKey(faceStyle, mask, hintMask) {
+  return (faceStyle * faceletMeshStickeringMasks.length + faceletMeshStickeringMasks.indexOf(mask)) * faceletMeshStickeringMasks.length + faceletMeshStickeringMasks.indexOf(hintMask);
+}
+function faceletAppearance(cache, styles, faceStyle, mask, hintMask) {
+  const key = faceletAppearanceKey(faceStyle, mask, hintMask);
+  const cached = cache.get(key);
+  if (cached) {
+    return cached;
+  }
+  const style = styles[faceStyle];
+  const body = bodyColor(style, mask);
+  const hint = hintColor(style, hintMask);
+  const appearance = new Uint8Array([
+    body >> 16 & 255,
+    body >> 8 & 255,
+    body & 255,
+    255,
+    hint.color >> 16 & 255,
+    hint.color >> 8 & 255,
+    hint.color & 255,
+    Math.round(hint.opacity * 255)
+  ]);
+  cache.set(key, appearance);
+  return appearance;
+}
+function writeColor(colors, ranges, appearance, offset = 0) {
+  const array = colors.array;
+  const red = appearance[offset];
+  const green = appearance[offset + 1];
+  const blue = appearance[offset + 2];
+  const alpha = appearance[offset + 3];
+  for (const range of ranges) {
+    for (let vertex = range.start; vertex < range.start + range.count; vertex++) {
+      array[4 * vertex] = red;
+      array[4 * vertex + 1] = green;
+      array[4 * vertex + 2] = blue;
+      array[4 * vertex + 3] = alpha;
+    }
+  }
+}
+function paintInternal(colors, ranges) {
+  const internal = bodyMaskColors.internal;
+  writeColor(
+    colors,
+    ranges,
+    new Uint8Array([
+      internal >> 16 & 255,
+      internal >> 8 & 255,
+      internal & 255,
+      255
+    ])
+  );
+}
+
+// src/cubing/twisty/views/3D/puzzles/CubePieces.ts
+var PG_SCALE = 0.5;
+var FACE_COUNT = 6;
+function faceIdxForNormal(x, y, z) {
+  for (let faceIdx = 0; faceIdx < FACE_COUNT; faceIdx++) {
+    const { vector } = cubeFaceStyles[faceIdx];
+    if (vector.x * x + vector.y * y + vector.z * z > 0.5) {
+      return faceIdx;
+    }
+  }
+  return -1;
+}
+function cubeLayout(stickerDat) {
+  const { stickers } = stickerDat;
+  if (stickerDat.faces.length !== FACE_COUNT || stickers.length === 0) {
+    return null;
+  }
+  let faceletCount = 0;
+  let halfExtent = 0;
+  for (const sticker of stickers) {
+    if (sticker.coords.length !== 12) {
+      return null;
+    }
+    if (!sticker.isDup) {
+      faceletCount++;
+    }
+    for (const coord of sticker.coords) {
+      halfExtent = Math.max(halfExtent, Math.abs(coord));
+    }
+  }
+  const layers = Math.round(Math.sqrt(faceletCount / FACE_COUNT));
+  if (FACE_COUNT * layers * layers !== faceletCount || layers < 2) {
+    return null;
+  }
+  const slotWidth = 2 * halfExtent / layers;
+  const epsilon = slotWidth / 1e3;
+  const faceColors = new Array(FACE_COUNT);
+  const cubiesByPiece = /* @__PURE__ */ new Map();
+  const cubies = [];
+  const centroid = [0, 0, 0];
+  for (const sticker of stickers) {
+    const { coords } = sticker;
+    for (let axis = 0; axis < 3; axis++) {
+      centroid[axis] = (coords[axis] + coords[axis + 3] + coords[axis + 6] + coords[axis + 9]) / 4;
+    }
+    let normalAxis = 0;
+    for (let axis = 1; axis < 3; axis++) {
+      if (Math.abs(centroid[axis]) > Math.abs(centroid[normalAxis])) {
+        normalAxis = axis;
+      }
+    }
+    const outward = Math.sign(centroid[normalAxis]);
+    const center = new Vector34();
+    for (let axis = 0; axis < 3; axis++) {
+      let expected;
+      if (axis === normalAxis) {
+        expected = outward * halfExtent;
+        center.setComponent(axis, outward * (halfExtent - slotWidth / 2));
+      } else {
+        const slot = Math.round(
+          (centroid[axis] + halfExtent) / slotWidth - 0.5
+        );
+        if (slot < 0 || slot >= layers) {
+          return null;
+        }
+        expected = -halfExtent + (slot + 0.5) * slotWidth;
+        center.setComponent(axis, expected);
+      }
+      if (Math.abs(centroid[axis] - expected) > epsilon) {
+        return null;
+      }
+      const halfSpan = axis === normalAxis ? 0 : slotWidth / 2;
+      for (let vertex = 0; vertex < 4; vertex++) {
+        const offset = Math.abs(coords[3 * vertex + axis] - expected);
+        if (Math.abs(offset - halfSpan) > epsilon) {
+          return null;
+        }
+      }
+    }
+    const faceIdx = faceIdxForNormal(
+      normalAxis === 0 ? outward : 0,
+      normalAxis === 1 ? outward : 0,
+      normalAxis === 2 ? outward : 0
+    );
+    if (faceIdx === -1) {
+      return null;
+    }
+    faceColors[faceIdx] ??= sticker.color;
+    if (faceColors[faceIdx] !== sticker.color) {
+      return null;
+    }
+    const pieceKey = `${sticker.orbit}/${sticker.ord}`;
+    let cubie = cubiesByPiece.get(pieceKey);
+    if (!cubie) {
+      cubie = {
+        orbit: sticker.orbit,
+        ord: sticker.ord,
+        center,
+        outwardFaces: [],
+        stickers: []
+      };
+      cubiesByPiece.set(pieceKey, cubie);
+      cubies.push(cubie);
+    } else if (cubie.center.distanceTo(center) > epsilon) {
+      return null;
+    }
+    if (!cubie.outwardFaces.includes(faceIdx)) {
+      cubie.outwardFaces.push(faceIdx);
+      cubie.outwardFaces.sort((a, b) => a - b);
+    }
+    cubie.stickers.push({ faceIdx, ori: sticker.ori, isDup: !!sticker.isDup });
+  }
+  if (new Set(faceColors).size !== FACE_COUNT) {
+    return null;
+  }
+  return { layers, halfExtent, cubies };
+}
+function newCubieShape(outwardFaces, slotWidth) {
+  const scale = cubieBodyDimensions.pieceScale * slotWidth;
+  const body = beveledCubieGeometry(
+    cubeFaceStyles.map((style) => style.vector),
+    outwardFaces,
+    cubieBodyDimensions.halfWidth * scale,
+    cubieBodyDimensions.outerAxisRadius * scale,
+    cubieBodyDimensions.innerEdgeRadius * scale,
+    cubieBodyDimensions.innerCornerRadius * scale,
+    cubieBodyDimensions.cornerSharpness,
+    cubieBodyDimensions.roundingSegments
+  );
+  const bodyPositions = body.getAttribute("position").array;
+  const bodyIndices = Array.from(body.getIndex().array);
+  const faceVertexRanges = [];
+  for (const group of body.groups) {
+    let start = Number.POSITIVE_INFINITY;
+    let end = 0;
+    for (let i = group.start; i < group.start + group.count; i++) {
+      start = Math.min(start, bodyIndices[i]);
+      end = Math.max(end, bodyIndices[i] + 1);
+    }
+    faceVertexRanges[group.materialIndex] = { start, count: end - start };
+  }
+  const hintPositions = [];
+  const hintIndices = [];
+  const hintVertexRanges = /* @__PURE__ */ new Map();
+  const hintHalfWidth = HINT_FACELET_SCALE * slotWidth / 2;
+  const hintDistance = slotWidth / 2 + HINT_FACELET_ELEVATION;
+  const u = new Vector34();
+  const v = new Vector34();
+  const corner = new Vector34();
+  for (const faceIdx of outwardFaces) {
+    const normal2 = cubeFaceStyles[faceIdx].vector;
+    u.set(normal2.y, normal2.z, normal2.x);
+    v.crossVectors(normal2, u);
+    const start = hintPositions.length / 3;
+    for (const [su, sv] of [
+      [-1, -1],
+      [1, -1],
+      [1, 1],
+      [-1, 1]
+    ]) {
+      corner.copy(normal2).multiplyScalar(hintDistance).addScaledVector(u, su * hintHalfWidth).addScaledVector(v, sv * hintHalfWidth);
+      hintPositions.push(corner.x, corner.y, corner.z);
+    }
+    hintIndices.push(start, start + 1, start + 2, start, start + 2, start + 3);
+    hintVertexRanges.set(faceIdx, { start, count: 4 });
+  }
+  body.dispose();
+  return {
+    bodyPosition: new BufferAttribute3(bodyPositions.slice(), 3),
+    bodyIndex: new BufferAttribute3(new Uint16Array(bodyIndices), 1),
+    bodyVertexCount: bodyPositions.length / 3,
+    hintPosition: new BufferAttribute3(new Float32Array(hintPositions), 3),
+    hintIndex: new BufferAttribute3(new Uint16Array(hintIndices), 1),
+    hintVertexCount: hintPositions.length / 3,
+    faceVertexRanges,
+    hintVertexRanges
+  };
+}
+function newPieceMesh(position, index, vertexCount) {
+  const geometry = new BufferGeometry3();
+  geometry.setAttribute("position", position);
+  geometry.setIndex(index);
+  const colors = new BufferAttribute3(new Uint8Array(4 * vertexCount), 4, true);
+  geometry.setAttribute("color", colors);
+  return { geometry, colors };
+}
+function newCubiePiece(cubie, shape) {
+  const body = newPieceMesh(
+    shape.bodyPosition,
+    shape.bodyIndex,
+    shape.bodyVertexCount
+  );
+  const hint = shape.hintVertexCount > 0 ? newPieceMesh(shape.hintPosition, shape.hintIndex, shape.hintVertexCount) : null;
+  paintInternal(body.colors, shape.faceVertexRanges);
+  const facelets = cubie.stickers.map((sticker) => ({
+    ori: sticker.ori,
+    faceStyle: sticker.faceIdx,
+    // A duplicate shares its square with the real facelet, which is the one
+    // that gets painted.
+    body: sticker.isDup ? [] : [shape.faceVertexRanges[sticker.faceIdx]],
+    hint: sticker.isDup ? [] : [shape.hintVertexRanges.get(sticker.faceIdx)].filter(Boolean)
+  }));
+  return {
+    orbit: cubie.orbit,
+    ord: cubie.ord,
+    home: new Matrix42().setPosition(cubie.center),
+    body,
+    hint,
+    facelets
+  };
+}
+function cubePuzzlePlan(stickerDat) {
+  const layout = cubeLayout(stickerDat);
+  if (!layout) {
+    return null;
+  }
+  const slotWidth = 2 * layout.halfExtent / layout.layers;
+  const shapes = /* @__PURE__ */ new Map();
+  const pieces = layout.cubies.map((cubie) => {
+    const shapeKey = cubie.outwardFaces.join(",");
+    let shape = shapes.get(shapeKey);
+    if (!shape) {
+      shape = newCubieShape(cubie.outwardFaces, slotWidth);
+      shapes.set(shapeKey, shape);
+    }
+    return newCubiePiece(cubie, shape);
+  });
+  return {
+    faceStyles: cubeFaceStyles,
+    pieces,
+    // Oversized pieces push the puzzle past the half-extent the camera framing
+    // assumes, so scale it back to the size `PG3D` would have drawn.
+    scale: PG_SCALE * layout.halfExtent / (cubieBodyHalfExtent(layout.layers) * slotWidth)
+  };
+}
+
 // src/cubing/twisty/views/3D/puzzles/PG3D.ts
 import { DoubleSide as DoubleSide2, FrontSide as FrontSide2 } from "three/src/constants.js";
-import { BufferAttribute as BufferAttribute2 } from "three/src/core/BufferAttribute.js";
-import { BufferGeometry as BufferGeometry2 } from "three/src/core/BufferGeometry.js";
+import { BufferAttribute as BufferAttribute4 } from "three/src/core/BufferAttribute.js";
+import { BufferGeometry as BufferGeometry4 } from "three/src/core/BufferGeometry.js";
 import { Object3D as Object3D2 } from "three/src/core/Object3D.js";
-import { MeshBasicMaterial as MeshBasicMaterial2 } from "three/src/materials/MeshBasicMaterial.js";
-import { Color as Color2 } from "three/src/math/Color.js";
-import { Vector3 as Vector32 } from "three/src/math/Vector3.js";
+import { MeshBasicMaterial as MeshBasicMaterial3 } from "three/src/materials/MeshBasicMaterial.js";
+import { Color as Color3 } from "three/src/math/Color.js";
+import { Vector3 as Vector35 } from "three/src/math/Vector3.js";
 import { Group as Group2 } from "three/src/objects/Group.js";
 import { Mesh as Mesh2 } from "three/src/objects/Mesh.js";
-var foundationMaterial = new MeshBasicMaterial2({
+var foundationMaterial = new MeshBasicMaterial3({
   side: DoubleSide2,
   color: 0
 });
-var invisMaterial = new MeshBasicMaterial2({
+var invisMaterial = new MeshBasicMaterial3({
   visible: false
 });
-var basicStickerMaterial = new MeshBasicMaterial2({
+var basicStickerMaterial = new MeshBasicMaterial3({
   vertexColors: true
 });
 function dist(coords, a, b) {
@@ -1092,9 +1693,9 @@ var Filler = class {
     }
   }
   setAttributes(geo) {
-    geo.setAttribute("position", new BufferAttribute2(this.vertices, 3));
+    geo.setAttribute("position", new BufferAttribute4(this.vertices, 3));
     const sa2 = this.colors.subarray(0, 9 * this.sz);
-    geo.setAttribute("color", new BufferAttribute2(sa2, 3, true));
+    geo.setAttribute("color", new BufferAttribute4(sa2, 3, true));
   }
   makeGroups(geo) {
     geo.clearGroups();
@@ -1129,7 +1730,7 @@ var StickerDef = class {
     this.isDup = !!stickerDat.isDup;
     this.faceNum = stickerDat.face;
     this.stickerStart = filler.ipos;
-    const sdColor = new Color2(stickerDat.color).getHex();
+    const sdColor = new Color3(stickerDat.color).getHex();
     this.origColor = sdColor;
     this.origColorStickeringMask = sdColor;
     if (options?.stickeringMask) {
@@ -1203,7 +1804,7 @@ var StickerDef = class {
         if (this.origColor === 16777215) {
           c = 14540253;
         } else {
-          c = new Color2(this.origColor).multiplyScalar(0.5).getHex();
+          c = new Color3(this.origColor).multiplyScalar(0.5).getHex();
         }
         break;
       }
@@ -1320,7 +1921,7 @@ var HitPlaneDef = class {
       filler.addUncolored(coords, g);
       filler.addUncolored(coords, g + 1);
     }
-    this.geo = new BufferGeometry2();
+    this.geo = new BufferGeometry4();
     filler.setAttributes(this.geo);
     const obj = new Mesh2(this.geo, invisMaterial);
     obj.userData["quantumMove"] = stickerDat.notationMapper.notationToExternal(
@@ -1335,12 +1936,12 @@ var AxisInfo2 = class {
   order;
   constructor(axisDat) {
     const vec = axisDat.coordinates;
-    this.axis = new Vector32(vec[0], vec[1], vec[2]);
+    this.axis = new Vector35(vec[0], vec[1], vec[2]);
     this.order = axisDat.order;
   }
 };
 var DEFAULT_COLOR_FRACTION = 0.71;
-var PG_SCALE = 0.5;
+var PG_SCALE2 = 0.5;
 var PG3D = class extends Object3D2 {
   constructor(scheduleRenderCallback, kpuzzle, stickerDat, enableFoundationOpt = false, enableHintStickersOpt = false, hintStickerHeightScale = 1, faceletScale = 1, params = {}) {
     super();
@@ -1352,7 +1953,7 @@ var PG3D = class extends Object3D2 {
     if (stickerDat.stickers.length === 0) {
       throw Error("Reuse of stickerdat from pg; please don't do that.");
     }
-    this.hintMaterial = new MeshBasicMaterial2({
+    this.hintMaterial = new MeshBasicMaterial3({
       vertexColors: true,
       transparent: true,
       opacity: 0.5
@@ -1440,14 +2041,14 @@ var PG3D = class extends Object3D2 {
         this.stickers[orbit][ori][ord].addFoundation(filler, sticker, black);
       }
     }
-    const fixedGeo = new BufferGeometry2();
+    const fixedGeo = new BufferGeometry4();
     filler.setAttributes(fixedGeo);
     filler.makeGroups(fixedGeo);
     const obj = new Mesh2(fixedGeo, this.materialArray1);
-    obj.scale.set(PG_SCALE, PG_SCALE, PG_SCALE);
+    obj.scale.set(PG_SCALE2, PG_SCALE2, PG_SCALE2);
     this.add(obj);
     const obj2 = new Mesh2(fixedGeo, this.materialArray2);
-    obj2.scale.set(PG_SCALE, PG_SCALE, PG_SCALE);
+    obj2.scale.set(PG_SCALE2, PG_SCALE2, PG_SCALE2);
     this.add(obj2);
     const hitfaces = this.stickerDat.faces;
     this.movingObj = obj2;
@@ -1459,7 +2060,7 @@ var PG3D = class extends Object3D2 {
         stickerDat.textureMapper,
         this.stickerDat
       );
-      facedef.cubie.scale.set(PG_SCALE, PG_SCALE, PG_SCALE);
+      facedef.cubie.scale.set(PG_SCALE2, PG_SCALE2, PG_SCALE2);
       this.add(facedef.cubie);
       this.controlTargets.push(facedef.cubie.children[0]);
     }
@@ -1537,7 +2138,7 @@ var PG3D = class extends Object3D2 {
       }
     }
     for (const axis of this.stickerDat.axis) {
-      const product = point.dot(new Vector32(...axis.coordinates));
+      const product = point.dot(new Vector35(...axis.coordinates));
       if (product > closestMoveDotProduct) {
         const modified = this.stickerDat.notationMapper.notationToExternal(
           modify(axis.quantumMove)
@@ -1771,7 +2372,7 @@ var PG3D = class extends Object3D2 {
     } else if (v === 1) {
       this.hintMaterial = this.stickerMaterial;
     } else {
-      this.hintMaterial = new MeshBasicMaterial2({
+      this.hintMaterial = new MeshBasicMaterial3({
         vertexColors: true,
         transparent: true,
         opacity: v
@@ -1819,7 +2420,7 @@ var PG3D = class extends Object3D2 {
     }
     filler.uvs.copyWithin(6 * filler.sz, 0, 6 * filler.sz);
     const sa1 = filler.uvs.subarray(0, 6 * filler.sz);
-    this.fixedGeo.setAttribute("uv", new BufferAttribute2(sa1, 2, true));
+    this.fixedGeo.setAttribute("uv", new BufferAttribute4(sa1, 2, true));
   }
   experimentalUpdateTexture(enabled, stickerTexture, hintTexture) {
     if (!stickerTexture) {
@@ -1834,7 +2435,7 @@ var PG3D = class extends Object3D2 {
       this.stickerMaterialDisposable = false;
     }
     if (enabled) {
-      this.stickerMaterial = new MeshBasicMaterial2({
+      this.stickerMaterial = new MeshBasicMaterial3({
         map: stickerTexture,
         side: FrontSide2,
         transparent: false
@@ -1848,7 +2449,7 @@ var PG3D = class extends Object3D2 {
       this.hintMaterialDisposable = false;
     }
     if (enabled) {
-      this.hintMaterial = new MeshBasicMaterial2({
+      this.hintMaterial = new MeshBasicMaterial3({
         map: hintTexture,
         side: FrontSide2,
         transparent: true
@@ -1869,73 +2470,685 @@ var PG3D = class extends Object3D2 {
   }
 };
 
-// src/cubing/twisty/views/3D/puzzles/Square1_3D.ts
-import { DoubleSide as DoubleSide3 } from "three/src/constants.js";
-import { BufferAttribute as BufferAttribute3 } from "three/src/core/BufferAttribute.js";
-import { BufferGeometry as BufferGeometry3 } from "three/src/core/BufferGeometry.js";
-import { Object3D as Object3D3 } from "three/src/core/Object3D.js";
-import { MeshBasicMaterial as MeshBasicMaterial3 } from "three/src/materials/MeshBasicMaterial.js";
-import { Color as Color3 } from "three/src/math/Color.js";
-import { Quaternion as Quaternion2 } from "three/src/math/Quaternion.js";
-import { Vector3 as Vector33 } from "three/src/math/Vector3.js";
-import { Group as Group3 } from "three/src/objects/Group.js";
-import { Mesh as Mesh3 } from "three/src/objects/Mesh.js";
-var DEGREE = TAU / 360;
-var SLOT_ANGLE_DEGREES = 30;
-var WEDGES_PER_LAYER = 12;
-var CUBE_HALF_EDGE = 1;
-var EQUATOR_HALF_HEIGHT = 0.25;
-var PUZZLE_SCALE = 0.5;
-var DEFAULT_FACELET_SCALE = 0.85;
-var STICKER_ELEVATION = 4e-3;
-var COLOR_UP = 16776960;
-var COLOR_DOWN = 16777215;
-var RING_COLORS = [2254591, 16750848, 65280, 16711680];
-var FRAME_OFFSET_DEGREES = 180;
-var BODY_COLOR = 1118481;
-var MIRROR = -1;
-var Y_AXIS = new Vector33(0, 1, 0);
-var SLICE_AXIS = new Vector33(
-  MIRROR * Math.sin(15 * DEGREE),
-  0,
-  Math.cos(15 * DEGREE)
-).normalize();
-var SLICE_QUATERNION = new Quaternion2().setFromAxisAngle(SLICE_AXIS, TAU / 2);
-var HALF_TURN_Y = new Quaternion2().setFromAxisAngle(Y_AXIS, TAU / 2);
-function slotAzimuthDegrees(slot) {
-  return FRAME_OFFSET_DEGREES + (slot < WEDGES_PER_LAYER ? SLOT_ANGLE_DEGREES * slot + 120 : 90 - SLOT_ANGLE_DEGREES * (slot - WEDGES_PER_LAYER));
+// src/cubing/twisty/views/3D/puzzles/SolidPieces.ts
+import { BufferAttribute as BufferAttribute5 } from "three/src/core/BufferAttribute.js";
+import { BufferGeometry as BufferGeometry5 } from "three/src/core/BufferGeometry.js";
+import { Color as Color4 } from "three/src/math/Color.js";
+import { Matrix4 as Matrix43 } from "three/src/math/Matrix4.js";
+import { Vector3 as Vector37 } from "three/src/math/Vector3.js";
+
+// src/cubing/twisty/views/3D/puzzles/SolidPieceGeometry.ts
+import { Vector3 as Vector36 } from "three/src/math/Vector3.js";
+var SOLID_PIECE_GROOVE = 0.018;
+var SOLID_PIECE_CHAMFER = 5e-3;
+var BOX_PLANE = -1;
+function boxFacet(planeIdx, normal2, size) {
+  const reference = Math.abs(normal2.y) > 0.5 ? new Vector36(0, 0, 1) : new Vector36(0, 1, 0);
+  const u = new Vector36().crossVectors(reference, normal2).normalize();
+  const v = new Vector36().crossVectors(normal2, u);
+  const center = normal2.clone().multiplyScalar(size);
+  return {
+    plane: planeIdx,
+    vertices: [
+      [-1, -1],
+      [1, -1],
+      [1, 1],
+      [-1, 1]
+    ].map(
+      ([su, sv]) => center.clone().addScaledVector(u, su * size).addScaledVector(v, sv * size)
+    )
+  };
 }
-function slotQuaternion(slot) {
-  const quaternion = new Quaternion2().setFromAxisAngle(
-    Y_AXIS,
-    MIRROR * slotAzimuthDegrees(slot) * DEGREE
-  );
-  if (slot >= WEDGES_PER_LAYER) {
-    quaternion.multiply(
-      new Quaternion2().setFromAxisAngle(new Vector33(0, 0, 1), TAU / 2)
-    );
+var BOX_NORMALS = [
+  new Vector36(1, 0, 0),
+  new Vector36(-1, 0, 0),
+  new Vector36(0, 1, 0),
+  new Vector36(0, -1, 0),
+  new Vector36(0, 0, 1),
+  new Vector36(0, 0, -1)
+];
+function orderInPlane(points, normal2) {
+  const centroid = new Vector36();
+  for (const point of points) {
+    centroid.addScaledVector(point, 1 / points.length);
   }
-  return quaternion;
+  const reference = new Vector36().subVectors(points[0], centroid).normalize();
+  const other = new Vector36().crossVectors(normal2, reference);
+  const offset = new Vector36();
+  return points.map((point) => {
+    offset.subVectors(point, centroid);
+    return {
+      point,
+      angle: Math.atan2(offset.dot(other), offset.dot(reference))
+    };
+  }).sort((a, b) => a.angle - b.angle).map(({ point }) => point);
 }
-var SLOT_QUATERNIONS = new Array(2 * WEDGES_PER_LAYER).fill(null).map((_, slot) => slotQuaternion(slot));
-function wedgeShape(homeSlot) {
-  const phase = homeSlot < WEDGES_PER_LAYER ? homeSlot % 3 : (homeSlot - WEDGES_PER_LAYER + 2) % 3;
-  return phase === 0 ? "cornerHigh" : phase === 1 ? "cornerLow" : "edge";
+function vertexKey(vertex, quantum) {
+  return `${Math.round(vertex.x / quantum)},${Math.round(vertex.y / quantum)},${Math.round(vertex.z / quantum)}`;
 }
-function outerFaceOffsetDegrees(shape) {
-  switch (shape) {
-    case "cornerHigh":
-      return -30;
-    case "cornerLow":
-      return 30;
-    case "edge":
-      return 0;
+function clipByPlane(facets, plane, planeIdx, epsilon) {
+  const clipped = [];
+  const capPoints = [];
+  const capKeys = /* @__PURE__ */ new Set();
+  const quantum = epsilon * 10;
+  for (const facet of facets) {
+    const kept = [];
+    const count = facet.vertices.length;
+    for (let i = 0; i < count; i++) {
+      const current = facet.vertices[i];
+      const next = facet.vertices[(i + 1) % count];
+      const currentSide = current.dot(plane.normal) - plane.offset;
+      const nextSide = next.dot(plane.normal) - plane.offset;
+      if (currentSide <= epsilon) {
+        kept.push(current);
+      }
+      if (currentSide > epsilon && nextSide < -epsilon || currentSide < -epsilon && nextSide > epsilon) {
+        kept.push(
+          current.clone().lerp(next, currentSide / (currentSide - nextSide))
+        );
+      }
+    }
+    if (kept.length < 3) {
+      continue;
+    }
+    clipped.push({ plane: facet.plane, vertices: kept });
+    for (const vertex of kept) {
+      if (Math.abs(vertex.dot(plane.normal) - plane.offset) > epsilon) {
+        continue;
+      }
+      const key = vertexKey(vertex, quantum);
+      if (!capKeys.has(key)) {
+        capKeys.add(key);
+        capPoints.push(vertex);
+      }
+    }
   }
+  if (capPoints.length >= 3) {
+    clipped.push({
+      plane: planeIdx,
+      vertices: orderInPlane(capPoints, plane.normal)
+    });
+  }
+  return clipped;
 }
-function squarePoint(phiDegrees) {
-  return polarPoint(phiDegrees, Math.round(phiDegrees / 90) * 90);
+function buildFacets(planes, radius, epsilon) {
+  let facets = BOX_NORMALS.map(
+    (normal2) => boxFacet(BOX_PLANE, normal2, radius * 4)
+  );
+  for (let planeIdx = 0; planeIdx < planes.length; planeIdx++) {
+    facets = clipByPlane(facets, planes[planeIdx], planeIdx, epsilon);
+  }
+  if (facets.some((facet) => facet.plane === BOX_PLANE) || facets.length < 4) {
+    return null;
+  }
+  return facets;
 }
-function polarPoint(phiDegrees, faceCenterDegrees) {
+function chamferPlanes(facets, planes, chamfer, epsilon) {
+  const quantum = epsilon * 10;
+  const edges = /* @__PURE__ */ new Map();
+  for (const facet of facets) {
+    const { vertices } = facet;
+    for (let i = 0; i < vertices.length; i++) {
+      const edgeKey = [
+        vertexKey(vertices[i], quantum),
+        vertexKey(vertices[(i + 1) % vertices.length], quantum)
+      ].sort().join("|");
+      const sharing = edges.get(edgeKey);
+      if (sharing) {
+        sharing.push(facet.plane);
+      } else {
+        edges.set(edgeKey, [facet.plane]);
+      }
+    }
+  }
+  const added = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const sharing of edges.values()) {
+    if (sharing.length !== 2) {
+      continue;
+    }
+    const [a, b] = sharing;
+    const colored = planes[a].source !== -1 ? a : b;
+    const internal = planes[a].source !== -1 ? b : a;
+    if (planes[colored].source === -1 || planes[internal].source !== -1) {
+      continue;
+    }
+    const pairKey = `${colored}|${internal}`;
+    if (seen.has(pairKey)) {
+      continue;
+    }
+    seen.add(pairKey);
+    const sum = new Vector36().addVectors(
+      planes[colored].normal,
+      planes[internal].normal
+    );
+    if (sum.length() < 1e-6) {
+      continue;
+    }
+    added.push({
+      normal: sum.clone().normalize(),
+      // Where the two faces meet, measured along the bevel's own direction.
+      offset: (planes[colored].offset + planes[internal].offset) / sum.length() - chamfer,
+      source: planes[colored].source
+    });
+  }
+  return added;
+}
+function solidPieceGeometry(planes, options) {
+  const epsilon = options.radius * 1e-6;
+  const working = planes.map((plane, index) => ({
+    normal: plane.normal,
+    offset: plane.offset - (plane.color === null ? options.groove : 0),
+    source: plane.color === null ? -1 : index
+  }));
+  const plain = buildFacets(working, options.radius, epsilon);
+  if (!plain) {
+    return null;
+  }
+  const withChamfers = options.chamfer > 0 ? working.concat(chamferPlanes(plain, working, options.chamfer, epsilon)) : working;
+  const facets = (options.chamfer > 0 ? buildFacets(withChamfers, options.radius, epsilon) : plain) ?? plain;
+  const positions = [];
+  const ranges = planes.map(() => []);
+  const internalRanges = [];
+  for (const facet of facets) {
+    const start = positions.length / 3;
+    for (let i = 1; i < facet.vertices.length - 1; i++) {
+      for (const vertex of [
+        facet.vertices[0],
+        facet.vertices[i],
+        facet.vertices[i + 1]
+      ]) {
+        positions.push(vertex.x, vertex.y, vertex.z);
+      }
+    }
+    const range = { start, count: positions.length / 3 - start };
+    if (range.count === 0) {
+      continue;
+    }
+    if (withChamfers[facet.plane].source === -1) {
+      internalRanges.push(range);
+    } else {
+      ranges[withChamfers[facet.plane].source].push(range);
+    }
+  }
+  return {
+    positions: new Float32Array(positions),
+    vertexCount: positions.length / 3,
+    ranges,
+    internalRanges
+  };
+}
+
+// src/cubing/twisty/views/3D/puzzles/SolidPieces.ts
+var PG_SCALE3 = 0.5;
+var EPSILON = 1e-6;
+function vertexAt(sticker, index) {
+  return new Vector37(
+    sticker.coords[3 * index],
+    sticker.coords[3 * index + 1],
+    sticker.coords[3 * index + 2]
+  );
+}
+function polygonOf(sticker) {
+  const vertices = [];
+  for (let i = 0; i < sticker.coords.length / 3; i++) {
+    vertices.push(vertexAt(sticker, i));
+  }
+  return vertices;
+}
+function outwardNormal(polygon) {
+  const normal2 = new Vector37().crossVectors(
+    new Vector37().subVectors(polygon[1], polygon[0]),
+    new Vector37().subVectors(polygon[2], polygon[0])
+  );
+  if (normal2.length() < EPSILON) {
+    return null;
+  }
+  normal2.normalize();
+  return normal2.dot(polygon[0]) < 0 ? normal2.negate() : normal2;
+}
+function keyOf(vertex, quantum) {
+  return `${Math.round(vertex.x / quantum)},${Math.round(vertex.y / quantum)},${Math.round(vertex.z / quantum)}`;
+}
+function faceStyles(faceNormals, faceColors) {
+  const styles = [];
+  const cubeFaces = [];
+  for (let face2 = 0; face2 < faceNormals.length; face2++) {
+    const normal2 = faceNormals[face2];
+    const color = faceColors[face2];
+    if (!normal2 || color === void 0) {
+      return null;
+    }
+    cubeFaces.push(
+      cubeFaceStyles.findIndex((style) => style.vector.dot(normal2) > 0.999)
+    );
+  }
+  const isCube = faceNormals.length === cubeFaceStyles.length && new Set(cubeFaces).size === cubeFaceStyles.length && !cubeFaces.includes(-1) && new Set(faceColors).size === faceColors.length;
+  for (let face2 = 0; face2 < faceNormals.length; face2++) {
+    if (isCube) {
+      styles.push(cubeFaceStyles[cubeFaces[face2]]);
+      continue;
+    }
+    const color = new Color4(faceColors[face2]).getHex();
+    const dimColor = new Color4(color).multiplyScalar(0.5).getHex();
+    styles.push({
+      color,
+      dimColor,
+      hintColor: color,
+      hintDimColor: dimColor,
+      hintOpacityScale: 1
+    });
+  }
+  return styles;
+}
+function hintPolygon(polygon, normal2) {
+  const centroid = new Vector37();
+  for (const vertex of polygon) {
+    centroid.addScaledVector(vertex, 1 / polygon.length);
+  }
+  return polygon.map(
+    (vertex) => centroid.clone().addScaledVector(
+      new Vector37().subVectors(vertex, centroid),
+      HINT_FACELET_SCALE
+    ).addScaledVector(normal2, HINT_FACELET_ELEVATION)
+  );
+}
+function solidPuzzlePlan(stickerDat) {
+  const { stickers } = stickerDat;
+  if (stickers.length === 0 || stickerDat.faces.length === 0) {
+    return null;
+  }
+  let radius = 0;
+  let faceletArea = 0;
+  let faceletCount = 0;
+  for (const sticker of stickers) {
+    if (sticker.coords.length < 9 || sticker.coords.length % 3 !== 0) {
+      return null;
+    }
+    for (let i = 0; i < sticker.coords.length; i += 3) {
+      radius = Math.max(
+        radius,
+        Math.hypot(
+          sticker.coords[i],
+          sticker.coords[i + 1],
+          sticker.coords[i + 2]
+        )
+      );
+    }
+  }
+  const quantum = radius * 1e-5;
+  const faceNormals = new Array(stickerDat.faces.length);
+  const faceColors = new Array(stickerDat.faces.length);
+  const pieces = /* @__PURE__ */ new Map();
+  const order = [];
+  const edges = /* @__PURE__ */ new Map();
+  let faceDistance = 0;
+  for (const sticker of stickers) {
+    const pieceKey = `${sticker.orbit}/${sticker.ord}`;
+    let piece = pieces.get(pieceKey);
+    if (!piece) {
+      piece = {
+        orbit: sticker.orbit,
+        ord: sticker.ord,
+        stickers: [],
+        duplicates: []
+      };
+      pieces.set(pieceKey, piece);
+      order.push(piece);
+    }
+    if (sticker.isDup) {
+      piece.duplicates.push(sticker);
+      continue;
+    }
+    const polygon = polygonOf(sticker);
+    const normal2 = outwardNormal(polygon);
+    if (!normal2) {
+      return null;
+    }
+    for (const vertex of polygon) {
+      if (Math.abs(vertex.dot(normal2) - polygon[0].dot(normal2)) > quantum) {
+        return null;
+      }
+    }
+    const distance = polygon[0].dot(normal2);
+    faceDistance = faceDistance || distance;
+    if (faceNormals[sticker.face]) {
+      if (faceNormals[sticker.face].dot(normal2) < 0.999) {
+        return null;
+      }
+    } else {
+      faceNormals[sticker.face] = normal2;
+    }
+    faceColors[sticker.face] ??= sticker.color;
+    if (faceColors[sticker.face] !== sticker.color) {
+      return null;
+    }
+    faceletCount++;
+    for (let i = 1; i < polygon.length - 1; i++) {
+      faceletArea += new Vector37().subVectors(polygon[i], polygon[0]).cross(new Vector37().subVectors(polygon[i + 1], polygon[0])).length() / 2;
+    }
+    piece.stickers.push({ sticker, polygon });
+    for (let i = 0; i < polygon.length; i++) {
+      const edgeKey = [
+        keyOf(polygon[i], quantum),
+        keyOf(polygon[(i + 1) % polygon.length], quantum)
+      ].sort().join("|");
+      const sharing = edges.get(edgeKey);
+      if (sharing) {
+        sharing.add(pieceKey);
+      } else {
+        edges.set(edgeKey, /* @__PURE__ */ new Set([pieceKey]));
+      }
+    }
+  }
+  const styles = faceStyles(faceNormals, faceColors);
+  if (!styles) {
+    return null;
+  }
+  const featureScale = Math.min(
+    faceDistance,
+    1.5 * Math.sqrt(faceletArea / faceletCount)
+  );
+  const cuts = cutPlanes(
+    order,
+    edges,
+    stickerDat.axis.map((axis) => new Vector37(...axis.coordinates).normalize()),
+    quantum
+  );
+  if (!cuts) {
+    return null;
+  }
+  const plans = [];
+  for (const piece of order) {
+    const plan = newSolidPiece(
+      piece,
+      { planes: cuts, edges },
+      {
+        quantum,
+        radius,
+        featureScale
+      }
+    );
+    if (!plan) {
+      return null;
+    }
+    plans.push(plan);
+  }
+  return { faceStyles: styles, pieces: plans, scale: PG_SCALE3 };
+}
+function cutPlanes(pieces, edges, axes, quantum) {
+  const candidates = /* @__PURE__ */ new Map();
+  const boundaryEdges = [];
+  for (const piece of pieces) {
+    const pieceKey = `${piece.orbit}/${piece.ord}`;
+    for (const { polygon } of piece.stickers) {
+      for (let i = 0; i < polygon.length; i++) {
+        const a = polygon[i];
+        const b = polygon[(i + 1) % polygon.length];
+        const sharing = edges.get(
+          [keyOf(a, quantum), keyOf(b, quantum)].sort().join("|")
+        );
+        if (!sharing || ![...sharing].some((key) => key !== pieceKey)) {
+          continue;
+        }
+        boundaryEdges.push([a, b]);
+        for (const axis of axes) {
+          if (Math.abs(a.dot(axis) - b.dot(axis)) > quantum) {
+            continue;
+          }
+          const offset = a.dot(axis);
+          const key = `${keyOf(axis, 1e-4)}|${Math.round(offset / quantum)}`;
+          const candidate = candidates.get(key);
+          if (candidate) {
+            candidate.uses++;
+          } else {
+            candidates.set(key, { normal: axis, offset, uses: 1 });
+          }
+        }
+      }
+    }
+  }
+  const cuts = [...candidates.values()].sort((a, b) => b.uses - a.uses);
+  const kept = cuts.filter(({ normal: normal2, offset }) => {
+    for (const piece of pieces) {
+      let above = false;
+      let below = false;
+      for (const { polygon } of piece.stickers) {
+        let onIt = true;
+        for (const vertex of polygon) {
+          above ||= vertex.dot(normal2) > offset + quantum;
+          below ||= vertex.dot(normal2) < offset - quantum;
+          onIt &&= Math.abs(vertex.dot(normal2) - offset) <= quantum;
+        }
+        if (onIt) {
+          return false;
+        }
+      }
+      if (above && below) {
+        return false;
+      }
+    }
+    return true;
+  });
+  for (const [a, b] of boundaryEdges) {
+    const covered = kept.some(
+      ({ normal: normal2, offset }) => Math.abs(a.dot(normal2) - offset) < quantum && Math.abs(b.dot(normal2) - offset) < quantum
+    );
+    if (!covered) {
+      return null;
+    }
+  }
+  return kept;
+}
+function newSolidPiece(piece, cuts, sizes) {
+  if (piece.stickers.length === 0) {
+    return null;
+  }
+  const planes = [];
+  const planeOfSticker = /* @__PURE__ */ new Map();
+  const interior = new Vector37();
+  for (const { polygon } of piece.stickers) {
+    for (const vertex of polygon) {
+      interior.addScaledVector(
+        vertex,
+        1 / polygon.length / piece.stickers.length
+      );
+    }
+  }
+  for (const { sticker, polygon } of piece.stickers) {
+    const normal2 = outwardNormal(polygon);
+    planeOfSticker.set(sticker, planes.length);
+    planes.push({
+      normal: normal2,
+      offset: polygon[0].dot(normal2),
+      color: sticker.face
+    });
+  }
+  const pieceKey = `${piece.orbit}/${piece.ord}`;
+  for (const { polygon } of piece.stickers) {
+    for (let i = 0; i < polygon.length; i++) {
+      const a = polygon[i];
+      const b = polygon[(i + 1) % polygon.length];
+      const sharing = cuts.edges.get(
+        [keyOf(a, sizes.quantum), keyOf(b, sizes.quantum)].sort().join("|")
+      );
+      if (!sharing || ![...sharing].some((key) => key !== pieceKey)) {
+        continue;
+      }
+      const cut = cuts.planes.find(
+        ({ normal: normal3, offset: offset2 }) => Math.abs(a.dot(normal3) - offset2) < sizes.quantum && Math.abs(b.dot(normal3) - offset2) < sizes.quantum
+      );
+      if (!cut) {
+        return null;
+      }
+      const outward = interior.dot(cut.normal) < cut.offset;
+      const normal2 = outward ? cut.normal.clone() : cut.normal.clone().negate();
+      const offset = outward ? cut.offset : -cut.offset;
+      if (planes.some(
+        (plane) => plane.color === null && plane.normal.dot(normal2) > 0.9999 && Math.abs(plane.offset - offset) < sizes.quantum
+      )) {
+        continue;
+      }
+      planes.push({ normal: normal2, offset, color: null });
+    }
+  }
+  for (const cut of cuts.planes) {
+    let touches = false;
+    let above = false;
+    let below = false;
+    for (const { polygon } of piece.stickers) {
+      for (const vertex of polygon) {
+        const side = vertex.dot(cut.normal) - cut.offset;
+        if (Math.abs(side) <= sizes.quantum) {
+          touches = true;
+        } else if (side > 0) {
+          above = true;
+        } else {
+          below = true;
+        }
+      }
+    }
+    if (touches || above === below) {
+      continue;
+    }
+    planes.push(
+      above ? {
+        normal: cut.normal.clone().negate(),
+        offset: -cut.offset,
+        color: null
+      } : { normal: cut.normal.clone(), offset: cut.offset, color: null }
+    );
+  }
+  const solid = solidPieceGeometry(planes, {
+    groove: SOLID_PIECE_GROOVE * sizes.featureScale,
+    chamfer: SOLID_PIECE_CHAMFER * sizes.featureScale,
+    radius: sizes.radius
+  });
+  if (!solid) {
+    return null;
+  }
+  const hintPositions = [];
+  const hintRanges = /* @__PURE__ */ new Map();
+  for (const { sticker, polygon } of piece.stickers) {
+    const normal2 = outwardNormal(polygon);
+    const hint2 = hintPolygon(polygon, normal2);
+    const start = hintPositions.length / 3;
+    for (let i = 1; i < hint2.length - 1; i++) {
+      for (const vertex of [hint2[0], hint2[i], hint2[i + 1]]) {
+        hintPositions.push(vertex.x, vertex.y, vertex.z);
+      }
+    }
+    hintRanges.set(sticker, {
+      start,
+      count: hintPositions.length / 3 - start
+    });
+  }
+  const body = newPieceMesh2(solid.positions);
+  const hint = hintPositions.length > 0 ? newPieceMesh2(new Float32Array(hintPositions)) : null;
+  paintInternal(body.colors, solid.internalRanges);
+  const facelets = piece.stickers.map(({ sticker }) => ({
+    ori: sticker.ori,
+    faceStyle: sticker.face,
+    body: solid.ranges[planeOfSticker.get(sticker)],
+    hint: [hintRanges.get(sticker)]
+  }));
+  for (const sticker of piece.duplicates) {
+    facelets.push({
+      ori: sticker.ori,
+      faceStyle: sticker.face,
+      body: [],
+      hint: []
+    });
+  }
+  return {
+    orbit: piece.orbit,
+    ord: piece.ord,
+    // The geometry is already where the piece belongs.
+    home: new Matrix43(),
+    body,
+    hint,
+    facelets
+  };
+}
+function newPieceMesh2(positions) {
+  const geometry = new BufferGeometry5();
+  geometry.setAttribute("position", new BufferAttribute5(positions, 3));
+  const colors = new BufferAttribute5(
+    new Uint8Array(4 * positions.length / 3),
+    4,
+    true
+  );
+  geometry.setAttribute("color", colors);
+  return { geometry, colors };
+}
+
+// src/cubing/twisty/views/3D/puzzles/Square1_3D.ts
+import { DoubleSide as DoubleSide3 } from "three/src/constants.js";
+import { BufferAttribute as BufferAttribute6 } from "three/src/core/BufferAttribute.js";
+import { BufferGeometry as BufferGeometry6 } from "three/src/core/BufferGeometry.js";
+import { Object3D as Object3D3 } from "three/src/core/Object3D.js";
+import { MeshBasicMaterial as MeshBasicMaterial4 } from "three/src/materials/MeshBasicMaterial.js";
+import { Color as Color5 } from "three/src/math/Color.js";
+import { Quaternion as Quaternion2 } from "three/src/math/Quaternion.js";
+import { Vector3 as Vector38 } from "three/src/math/Vector3.js";
+import { Group as Group3 } from "three/src/objects/Group.js";
+import { Mesh as Mesh3 } from "three/src/objects/Mesh.js";
+var DEGREE = TAU / 360;
+var SLOT_ANGLE_DEGREES = 30;
+var WEDGES_PER_LAYER = 12;
+var CUBE_HALF_EDGE = 1;
+var EQUATOR_HALF_HEIGHT = 0.25;
+var PUZZLE_SCALE = 0.5;
+var DEFAULT_FACELET_SCALE = 0.85;
+var STICKER_ELEVATION = 4e-3;
+var COLOR_UP = 16776960;
+var COLOR_DOWN = 16777215;
+var RING_COLORS = [2254591, 16750848, 65280, 16711680];
+var FRAME_OFFSET_DEGREES = 180;
+var BODY_COLOR = 1118481;
+var MIRROR = -1;
+var Y_AXIS = new Vector38(0, 1, 0);
+var SLICE_AXIS = new Vector38(
+  MIRROR * Math.sin(15 * DEGREE),
+  0,
+  Math.cos(15 * DEGREE)
+).normalize();
+var SLICE_QUATERNION = new Quaternion2().setFromAxisAngle(SLICE_AXIS, TAU / 2);
+var HALF_TURN_Y = new Quaternion2().setFromAxisAngle(Y_AXIS, TAU / 2);
+function slotAzimuthDegrees(slot) {
+  return FRAME_OFFSET_DEGREES + (slot < WEDGES_PER_LAYER ? SLOT_ANGLE_DEGREES * slot + 120 : 90 - SLOT_ANGLE_DEGREES * (slot - WEDGES_PER_LAYER));
+}
+function slotQuaternion(slot) {
+  const quaternion = new Quaternion2().setFromAxisAngle(
+    Y_AXIS,
+    MIRROR * slotAzimuthDegrees(slot) * DEGREE
+  );
+  if (slot >= WEDGES_PER_LAYER) {
+    quaternion.multiply(
+      new Quaternion2().setFromAxisAngle(new Vector38(0, 0, 1), TAU / 2)
+    );
+  }
+  return quaternion;
+}
+var SLOT_QUATERNIONS = new Array(2 * WEDGES_PER_LAYER).fill(null).map((_, slot) => slotQuaternion(slot));
+function wedgeShape(homeSlot) {
+  const phase = homeSlot < WEDGES_PER_LAYER ? homeSlot % 3 : (homeSlot - WEDGES_PER_LAYER + 2) % 3;
+  return phase === 0 ? "cornerHigh" : phase === 1 ? "cornerLow" : "edge";
+}
+function outerFaceOffsetDegrees(shape) {
+  switch (shape) {
+    case "cornerHigh":
+      return -30;
+    case "cornerLow":
+      return 30;
+    case "edge":
+      return 0;
+  }
+}
+function squarePoint(phiDegrees) {
+  return polarPoint(phiDegrees, Math.round(phiDegrees / 90) * 90);
+}
+function polarPoint(phiDegrees, faceCenterDegrees) {
   const radius = CUBE_HALF_EDGE / Math.cos((phiDegrees - faceCenterDegrees) * DEGREE);
   const phi = phiDegrees * DEGREE;
   return [MIRROR * radius * Math.sin(phi), radius * Math.cos(phi)];
@@ -2001,15 +3214,15 @@ function prismStickerSpecs(spec) {
   const specs = [];
   if (topColor !== null) {
     specs.push({
-      corners: polygon.map(([x, z]) => new Vector33(x, yTop, z)),
-      normal: new Vector33(0, 1, 0),
+      corners: polygon.map(([x, z]) => new Vector38(x, yTop, z)),
+      normal: new Vector38(0, 1, 0),
       color: topColor
     });
   }
   if (bottomColor !== null) {
     specs.push({
-      corners: polygon.map(([x, z]) => new Vector33(x, yBottom, z)),
-      normal: new Vector33(0, -1, 0),
+      corners: polygon.map(([x, z]) => new Vector38(x, yBottom, z)),
+      normal: new Vector38(0, -1, 0),
       color: bottomColor
     });
   }
@@ -2026,17 +3239,17 @@ function prismStickerSpecs(spec) {
     }
     const [x0, z0] = polygon[i];
     const [x1, z1] = polygon[(i + 1) % polygon.length];
-    const normal2 = new Vector33(z1 - z0, 0, -(x1 - x0)).normalize();
+    const normal2 = new Vector38(z1 - z0, 0, -(x1 - x0)).normalize();
     const outward = normal2.x * ((x0 + x1) / 2 - centroidX) + normal2.z * ((z0 + z1) / 2 - centroidZ);
     if (outward < 0) {
       normal2.negate();
     }
     specs.push({
       corners: [
-        new Vector33(x0, yBottom, z0),
-        new Vector33(x1, yBottom, z1),
-        new Vector33(x1, yTop, z1),
-        new Vector33(x0, yTop, z0)
+        new Vector38(x0, yBottom, z0),
+        new Vector38(x1, yBottom, z1),
+        new Vector38(x1, yTop, z1),
+        new Vector38(x0, yTop, z0)
       ],
       normal: normal2,
       color
@@ -2045,7 +3258,7 @@ function prismStickerSpecs(spec) {
   return specs;
 }
 function stickerPositions(spec, faceletScale) {
-  const center = new Vector33();
+  const center = new Vector38();
   for (const corner of spec.corners) {
     center.addScaledVector(corner, 1 / spec.corners.length);
   }
@@ -2068,16 +3281,87 @@ function stickerPositions(spec, faceletScale) {
   }
   return new Float32Array(out);
 }
-var bodyMaterial = new MeshBasicMaterial3({
-  color: new Color3(BODY_COLOR).convertLinearToSRGB(),
+var PIECE_GROOVE_HALF_WIDTH = 0.018;
+var PIECE_CHAMFER = 5e-3;
+var PUZZLE_RADIUS = CUBE_HALF_EDGE * Math.SQRT2;
+function prismPlanes(spec) {
+  const { polygon, sideColors } = spec;
+  const planes = [
+    { normal: new Vector38(0, 1, 0), offset: spec.yTop, color: spec.topColor },
+    {
+      normal: new Vector38(0, -1, 0),
+      offset: -spec.yBottom,
+      color: spec.bottomColor
+    }
+  ];
+  let centroidX = 0;
+  let centroidZ = 0;
+  for (const [x, z] of polygon) {
+    centroidX += x / polygon.length;
+    centroidZ += z / polygon.length;
+  }
+  for (let i = 0; i < polygon.length; i++) {
+    const [x0, z0] = polygon[i];
+    const [x1, z1] = polygon[(i + 1) % polygon.length];
+    const normal2 = new Vector38(z1 - z0, 0, -(x1 - x0)).normalize();
+    if (normal2.x * (x0 - centroidX) + normal2.z * (z0 - centroidZ) < 0) {
+      normal2.negate();
+    }
+    planes.push({
+      normal: normal2,
+      offset: normal2.x * x0 + normal2.z * z0,
+      color: sideColors[i] ?? null
+    });
+  }
+  return planes;
+}
+function stickerlessPieceGeometry(spec) {
+  const planes = prismPlanes(spec);
+  const piece = solidPieceGeometry(planes, {
+    groove: PIECE_GROOVE_HALF_WIDTH,
+    chamfer: PIECE_CHAMFER,
+    radius: PUZZLE_RADIUS
+  });
+  if (!piece) {
+    throw new Error("Could not build a Square-1 piece out of its planes.");
+  }
+  const colors = new Uint8Array(4 * piece.vertexCount);
+  const paint = (ranges, color) => {
+    for (const range of ranges) {
+      for (let i = range.start; i < range.start + range.count; i++) {
+        colors[4 * i] = color >> 16 & 255;
+        colors[4 * i + 1] = color >> 8 & 255;
+        colors[4 * i + 2] = color & 255;
+        colors[4 * i + 3] = 255;
+      }
+    }
+  };
+  paint(piece.internalRanges, bodyMaskColors.internal);
+  for (let i = 0; i < planes.length; i++) {
+    const color = planes[i].color;
+    if (color !== null) {
+      paint(piece.ranges[i], color);
+    }
+  }
+  const geometry = new BufferGeometry6();
+  geometry.setAttribute("position", new BufferAttribute6(piece.positions, 3));
+  geometry.setAttribute("color", new BufferAttribute6(colors, 4, true));
+  return geometry;
+}
+var bodyMaterial = new MeshBasicMaterial4({
+  color: new Color5(BODY_COLOR).convertLinearToSRGB(),
   side: DoubleSide3
 });
+var stickerlessMaterialCache;
+function stickerlessMaterial() {
+  return stickerlessMaterialCache ??= newVertexColorBodyMaterial();
+}
 var stickerMaterialCache = /* @__PURE__ */ new Map();
 function stickerMaterial(color) {
   let material = stickerMaterialCache.get(color);
   if (!material) {
-    material = new MeshBasicMaterial3({
-      color: new Color3(color).convertLinearToSRGB(),
+    material = new MeshBasicMaterial4({
+      color: new Color5(color).convertLinearToSRGB(),
       side: DoubleSide3
     });
     stickerMaterialCache.set(color, material);
@@ -2086,23 +3370,31 @@ function stickerMaterial(color) {
 }
 var Square1Piece = class extends Group3 {
   body;
-  #stickerSpecs;
+  #stickerSpecs = [];
   #stickerMeshes = [];
-  constructor(spec, faceletScale) {
+  constructor(spec, faceletScale, stickerless) {
     super();
-    const bodyGeometry = new BufferGeometry3();
+    if (stickerless) {
+      this.body = new Mesh3(
+        stickerlessPieceGeometry(spec),
+        stickerlessMaterial()
+      );
+      this.add(this.body);
+      return;
+    }
+    const bodyGeometry = new BufferGeometry6();
     bodyGeometry.setAttribute(
       "position",
-      new BufferAttribute3(prismBodyPositions(spec), 3)
+      new BufferAttribute6(prismBodyPositions(spec), 3)
     );
     this.body = new Mesh3(bodyGeometry, bodyMaterial);
     this.add(this.body);
     this.#stickerSpecs = prismStickerSpecs(spec);
     for (const stickerSpec of this.#stickerSpecs) {
-      const geometry = new BufferGeometry3();
+      const geometry = new BufferGeometry6();
       geometry.setAttribute(
         "position",
-        new BufferAttribute3(stickerPositions(stickerSpec, faceletScale), 3)
+        new BufferAttribute6(stickerPositions(stickerSpec, faceletScale), 3)
       );
       const mesh = new Mesh3(geometry, stickerMaterial(stickerSpec.color));
       this.#stickerMeshes.push(mesh);
@@ -2114,7 +3406,7 @@ var Square1Piece = class extends Group3 {
       const geometry = this.#stickerMeshes[i].geometry;
       geometry.setAttribute(
         "position",
-        new BufferAttribute3(
+        new BufferAttribute6(
           stickerPositions(this.#stickerSpecs[i], faceletScale),
           3
         )
@@ -2122,7 +3414,9 @@ var Square1Piece = class extends Group3 {
     }
   }
   setFoundationVisible(visible) {
-    this.body.visible = visible;
+    if (this.#stickerMeshes.length > 0) {
+      this.body.visible = visible;
+    }
   }
 };
 function wedgePrismSpec(homeSlot) {
@@ -2186,8 +3480,15 @@ var Square1_3D = class extends Object3D3 {
     if (typeof options.showFoundation === "boolean") {
       this.#showFoundation = options.showFoundation;
     }
+    if (options.experimentalWedgeStyle) {
+      this.#stickerless = options.experimentalWedgeStyle === "stickerless";
+    }
     for (let piece = 0; piece < 2 * WEDGES_PER_LAYER; piece++) {
-      const wedge = new Square1Piece(wedgePrismSpec(piece), this.#faceletScale);
+      const wedge = new Square1Piece(
+        wedgePrismSpec(piece),
+        this.#faceletScale,
+        this.#stickerless
+      );
       wedge.setFoundationVisible(this.#showFoundation);
       wedge.quaternion.copy(SLOT_QUATERNIONS[piece]);
       this.#wedgePieces.push(wedge);
@@ -2196,7 +3497,8 @@ var Square1_3D = class extends Object3D3 {
     for (const pair of CORNER_PAIRS) {
       const corner = new Square1Piece(
         cornerPrismSpec(pair),
-        this.#faceletScale
+        this.#faceletScale,
+        this.#stickerless
       );
       corner.setFoundationVisible(this.#showFoundation);
       corner.visible = false;
@@ -2206,7 +3508,8 @@ var Square1_3D = class extends Object3D3 {
     for (let piece = 0; piece < 2; piece++) {
       const equator = new Square1Piece(
         equatorPrismSpec(piece),
-        this.#faceletScale
+        this.#faceletScale,
+        this.#stickerless
       );
       equator.setFoundationVisible(this.#showFoundation);
       this.#equatorPieces.push(equator);
@@ -2220,6 +3523,7 @@ var Square1_3D = class extends Object3D3 {
   #equatorPieces = [];
   #faceletScale = DEFAULT_FACELET_SCALE;
   #showFoundation = true;
+  #stickerless = true;
   #slotOfPiece = new Int8Array(2 * WEDGES_PER_LAYER);
   #slotMoveMask = new Uint8Array(2 * WEDGES_PER_LAYER);
   #slotRotation = new Array(2 * WEDGES_PER_LAYER).fill(
@@ -2345,13 +3649,444 @@ var Square1_3D = class extends Object3D3 {
   }
 };
 
+// src/cubing/twisty/views/3D/puzzles/Stickerless3D.ts
+import { BackSide as BackSide2 } from "three/src/constants.js";
+import { BufferAttribute as BufferAttribute7 } from "three/src/core/BufferAttribute.js";
+import { BufferGeometry as BufferGeometry7 } from "three/src/core/BufferGeometry.js";
+import { Object3D as Object3D4 } from "three/src/core/Object3D.js";
+import { MeshBasicMaterial as MeshBasicMaterial5 } from "three/src/materials/MeshBasicMaterial.js";
+import { Matrix4 as Matrix44 } from "three/src/math/Matrix4.js";
+import { Vector3 as Vector39 } from "three/src/math/Vector3.js";
+import { BatchedMesh } from "three/src/objects/BatchedMesh.js";
+import { Mesh as Mesh4 } from "three/src/objects/Mesh.js";
+var invisibleMaterial2 = new MeshBasicMaterial5({ visible: false });
+function newBatch(meshes, material) {
+  let vertices = 0;
+  let indices = 0;
+  for (const { geometry } of meshes) {
+    vertices += geometry.getAttribute("position").count;
+    indices += geometry.getIndex()?.count ?? 0;
+  }
+  return new BatchedMesh(meshes.length, vertices, indices, material);
+}
+function addToBatch(batch, mesh, home) {
+  const geometryId = batch.addGeometry(mesh.geometry);
+  const instance = batch.addInstance(geometryId);
+  batch.setMatrixAt(instance, home);
+  mesh.geometry.dispose();
+  const range = batch.getGeometryRangeAt(geometryId);
+  return { instance, vertexStart: range.vertexStart };
+}
+var Stickerless3D = class extends Object3D4 {
+  constructor(scheduleRenderCallback, kpuzzle, stickerDat, plan, options = {}) {
+    super();
+    this.scheduleRenderCallback = scheduleRenderCallback;
+    this.kpuzzle = kpuzzle;
+    this.stickerDat = stickerDat;
+    this.plan = plan;
+    this.#hintMaterial = new MeshBasicMaterial5({
+      vertexColors: true,
+      transparent: true,
+      // Hint facelets show the faces turned away from the camera, so they are
+      // drawn from the inside out.
+      side: BackSide2
+    });
+    this.#bodyMaterial = newVertexColorBodyMaterial();
+    for (const axis of stickerDat.axis) {
+      this.#axesInfo[axis.quantumMove.family] = {
+        axis: new Vector39(...axis.coordinates),
+        order: axis.order
+      };
+    }
+    this.#bodyBatch = newBatch(
+      plan.pieces.map((piecePlan) => piecePlan.body),
+      this.#bodyMaterial
+    );
+    this.#bodyBatch.sortObjects = false;
+    this.#bodyBatch.perObjectFrustumCulled = false;
+    this.add(this.#bodyBatch);
+    const hints = plan.pieces.map((piecePlan) => piecePlan.hint).filter((hint) => hint !== null);
+    if (hints.length > 0) {
+      this.#hintBatch = newBatch(hints, this.#hintMaterial);
+      this.#hintBatch.perObjectFrustumCulled = false;
+      this.add(this.#hintBatch);
+    }
+    for (const piecePlan of plan.pieces) {
+      this.#addPiece(piecePlan);
+    }
+    this.#bodyColors = this.#bodyBatch.geometry.getAttribute(
+      "color"
+    );
+    this.#hintColors = this.#hintBatch?.geometry.getAttribute("color") ?? null;
+    this.experimentalUpdateOptions({
+      hintFacelets: options.hintFacelets ?? "floating"
+    });
+    for (const face2 of stickerDat.faces) {
+      this.#addControlTarget(face2);
+    }
+    this.scale.setScalar(plan.scale);
+    if (options.stickeringMask) {
+      this.setStickeringMask(options.stickeringMask);
+    }
+  }
+  scheduleRenderCallback;
+  kpuzzle;
+  stickerDat;
+  plan;
+  #pieces = [];
+  /**
+   * One draw call for every piece of the puzzle, and one for every hint
+   * facelet. A batch keeps a matrix per instance, so a move still moves the
+   * pieces it sweeps and nothing else.
+   */
+  #bodyBatch;
+  #hintBatch = null;
+  #bodyColors;
+  #hintColors = null;
+  /** Indexed `[orbit][ori][ord]`, like the orbits of the `KPuzzle`. */
+  #facelets = {};
+  #axesInfo = {};
+  #controlTargets = [];
+  #bodyMaterial;
+  #hintMaterial;
+  #appearances = /* @__PURE__ */ new Map();
+  /** Pieces rotated away from their home position by the last frame. */
+  #turningPieces = [];
+  /** Which pieces each quantum move sweeps, by the move's notation. */
+  #turnedPieces = /* @__PURE__ */ new Map();
+  /** The span of each color attribute that changed, so only it is uploaded. */
+  #dirtyColors = /* @__PURE__ */ new Map();
+  #lastPosition = null;
+  #pendingStickeringUpdate = false;
+  #addPiece(plan) {
+    const bodyInstance = addToBatch(this.#bodyBatch, plan.body, plan.home);
+    const hintInstance = plan.hint && this.#hintBatch ? addToBatch(this.#hintBatch, plan.hint, plan.home) : -1;
+    const piece = {
+      bodyInstance: bodyInstance.instance,
+      hintInstance: hintInstance === -1 ? -1 : hintInstance.instance,
+      home: plan.home,
+      matrix: plan.home.clone(),
+      turning: false
+    };
+    this.#pieces.push(piece);
+    const shift = (ranges, offset) => ranges.map((range) => ({
+      start: range.start + offset,
+      count: range.count
+    }));
+    const orbitFacelets = this.#facelets[plan.orbit] ??= [];
+    for (const facelet of plan.facelets) {
+      (orbitFacelets[facelet.ori] ??= [])[plan.ord] = {
+        piece,
+        faceStyle: facelet.faceStyle,
+        body: shift(facelet.body, bodyInstance.vertexStart),
+        hint: hintInstance === -1 ? [] : shift(facelet.hint, hintInstance.vertexStart),
+        appearanceKey: -1,
+        mask: "regular",
+        hintMask: "regular"
+      };
+    }
+  }
+  #setMatrix(piece) {
+    this.#bodyBatch.setMatrixAt(piece.bodyInstance, piece.matrix);
+    if (piece.hintInstance !== -1) {
+      this.#hintBatch.setMatrixAt(piece.hintInstance, piece.matrix);
+    }
+  }
+  #addControlTarget(face2) {
+    const { coords } = face2;
+    const triangles = coords.length / 3 - 2;
+    const positions = new Float32Array(9 * triangles);
+    for (let triangle = 0; triangle < triangles; triangle++) {
+      for (const [vertex, source] of [
+        0,
+        triangle + 1,
+        triangle + 2
+      ].entries()) {
+        for (let axis = 0; axis < 3; axis++) {
+          positions[9 * triangle + 3 * vertex + axis] = coords[3 * source + axis];
+        }
+      }
+    }
+    const geometry = new BufferGeometry7();
+    geometry.setAttribute("position", new BufferAttribute7(positions, 3));
+    const mesh = new Mesh4(geometry, invisibleMaterial2);
+    mesh.userData["quantumMove"] = this.stickerDat.notationMapper.notationToExternal(new Move(face2.name));
+    mesh.scale.setScalar(0.99);
+    this.add(mesh);
+    this.#controlTargets.push(mesh);
+  }
+  dispose() {
+    this.#bodyBatch.dispose();
+    this.#bodyBatch.geometry.dispose();
+    this.#hintBatch?.dispose();
+    this.#hintBatch?.geometry.dispose();
+    this.#bodyMaterial.dispose();
+    this.#hintMaterial.dispose();
+  }
+  experimentalGetStickerTargets() {
+    return [];
+  }
+  experimentalGetControlTargets() {
+    return this.#controlTargets;
+  }
+  #isValidMove(move) {
+    try {
+      this.kpuzzle.moveToTransformation(move);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  getClosestMoveToAxis(point, transformations) {
+    let closestMove = null;
+    let closestMoveDotProduct = 0;
+    let modify = (m) => m;
+    switch (transformations.depth) {
+      case "secondSlice": {
+        modify = (m) => m.modified({ innerLayer: 2 });
+        break;
+      }
+      case "rotation": {
+        modify = (m) => m.modified({ family: `${m.family}v` });
+        break;
+      }
+    }
+    for (const axis of this.stickerDat.axis) {
+      const product = point.dot(new Vector39(...axis.coordinates));
+      if (product > closestMoveDotProduct) {
+        const modified = this.stickerDat.notationMapper.notationToExternal(
+          modify(axis.quantumMove)
+        );
+        if (!modified || !this.#isValidMove(modified)) {
+          continue;
+        }
+        closestMoveDotProduct = product;
+        closestMove = modified;
+      }
+    }
+    if (!closestMove) {
+      return null;
+    }
+    if (transformations.invert) {
+      closestMove = closestMove.invert();
+    }
+    const order = this.kpuzzle.moveToTransformation(closestMove).repetitionOrder();
+    return { move: closestMove, order };
+  }
+  setStickeringMask(stickeringMask) {
+    for (const orbitDefinition of stickeringMask.specialBehaviour === "picture" ? [] : this.kpuzzle.definition.orbits) {
+      const { orbitName, numPieces, numOrientations } = orbitDefinition;
+      const orbitFacelets = this.#facelets[orbitName];
+      if (!orbitFacelets) {
+        continue;
+      }
+      for (let ori = 0; ori < numOrientations; ori++) {
+        for (let ord = 0; ord < numPieces; ord++) {
+          const facelet = orbitFacelets[ori]?.[ord];
+          if (!facelet) {
+            continue;
+          }
+          facelet.mask = getFaceletStickeringMask(
+            stickeringMask,
+            orbitName,
+            ord,
+            ori,
+            false
+          );
+          facelet.hintMask = getFaceletStickeringMask(
+            stickeringMask,
+            orbitName,
+            ord,
+            ori,
+            true
+          );
+        }
+      }
+    }
+    this.#pendingStickeringUpdate = true;
+    if (this.#lastPosition) {
+      this.onPositionChange(this.#lastPosition);
+    }
+  }
+  /** @deprecated */
+  experimentalUpdateOptions(options) {
+    if (options.hintFacelets !== void 0 && this.#hintBatch) {
+      this.#hintBatch.visible = options.hintFacelets !== "none";
+      this.scheduleRenderCallback();
+    }
+  }
+  /** @deprecated */
+  experimentalUpdateTexture(enabled, stickerTexture, _hintTexture) {
+    if (enabled && stickerTexture) {
+      console.warn(
+        "Sprites are not supported for stickerless pieces. For now, set the sprite before creating the TwistyPlayer."
+      );
+    }
+  }
+  onPositionChange(position) {
+    const { pattern } = position;
+    if (this.#pendingStickeringUpdate || !this.#lastPosition || !this.#lastPosition.pattern.isIdentical(pattern)) {
+      this.#updateColors(position);
+      this.#lastPosition = position;
+      this.#pendingStickeringUpdate = false;
+    }
+    const wereTurning = this.#turningPieces;
+    for (const piece of wereTurning) {
+      piece.turning = false;
+    }
+    this.#turningPieces = [];
+    const turnMatrix = new Matrix44();
+    for (const moveProgress of position.movesInProgress) {
+      const move = moveProgress.move;
+      const unswizzled = this.stickerDat.unswizzle(move);
+      if (!unswizzled) {
+        continue;
+      }
+      const axisInfo = this.#axesInfo[unswizzled.family];
+      if (!axisInfo) {
+        continue;
+      }
+      turnMatrix.makeRotationAxis(
+        axisInfo.axis,
+        -smootherStep(moveProgress.fraction) * moveProgress.direction * unswizzled.amount * TAU / axisInfo.order
+      );
+      for (const piece of this.#piecesTurnedBy(move)) {
+        if (!piece.turning) {
+          piece.turning = true;
+          piece.matrix.copy(piece.home);
+          this.#turningPieces.push(piece);
+        }
+        piece.matrix.premultiply(turnMatrix);
+      }
+    }
+    for (const piece of wereTurning) {
+      if (!piece.turning) {
+        piece.matrix.copy(piece.home);
+        this.#setMatrix(piece);
+      }
+    }
+    for (const piece of this.#turningPieces) {
+      this.#setMatrix(piece);
+    }
+    this.scheduleRenderCallback();
+  }
+  /**
+   * The pieces a single quantum of `move` sweeps: the ones whose slot does not
+   * map to itself.
+   */
+  #piecesTurnedBy(move) {
+    const quantum = move.modified({ amount: 1 });
+    const key = quantum.toString();
+    const cached = this.#turnedPieces.get(key);
+    if (cached) {
+      return cached;
+    }
+    const pieces = [];
+    const { transformationData } = this.#quantumTransformation(quantum);
+    for (const orbitName in this.#facelets) {
+      const orbitTransformation = transformationData[orbitName];
+      if (!orbitTransformation) {
+        continue;
+      }
+      const { permutation, orientationDelta } = orbitTransformation;
+      const slots = this.#facelets[orbitName][0];
+      for (let ord = 0; ord < permutation.length; ord++) {
+        if (permutation[ord] !== ord || orientationDelta[ord] !== 0) {
+          const slot = slots[ord];
+          if (slot) {
+            pieces.push(slot.piece);
+          }
+        }
+      }
+    }
+    this.#turnedPieces.set(key, pieces);
+    return pieces;
+  }
+  #quantumTransformation(quantum) {
+    try {
+      return this.kpuzzle.moveToTransformation(quantum);
+    } catch (e) {
+      const internal = this.stickerDat.notationMapper.notationToInternal(quantum);
+      const external = internal && this.stickerDat.notationMapper.notationToExternal(
+        internal.modified({ amount: 1 })
+      );
+      if (!external) {
+        throw e;
+      }
+      return this.kpuzzle.moveToTransformation(external);
+    }
+  }
+  /** Repaints every slot with the colors of whatever piece is now in it. */
+  #updateColors(position) {
+    for (const orbitName in this.#facelets) {
+      const orbitFacelets = this.#facelets[orbitName];
+      const orbitPattern = position.pattern.patternData[orbitName];
+      const numOrientations = orbitFacelets.length;
+      for (let ori = 0; ori < numOrientations; ori++) {
+        const slots = orbitFacelets[ori];
+        for (let ord = 0; ord < slots.length; ord++) {
+          const slot = slots[ord];
+          if (!slot) {
+            continue;
+          }
+          const sourceOri = numOrientations === 1 ? 0 : (ori + numOrientations - orbitPattern.orientation[ord]) % numOrientations;
+          const source = orbitFacelets[sourceOri][orbitPattern.pieces[ord]];
+          const key = faceletAppearanceKey(
+            source.faceStyle,
+            source.mask,
+            source.hintMask
+          );
+          if (key === slot.appearanceKey) {
+            continue;
+          }
+          slot.appearanceKey = key;
+          if (slot.body.length === 0 && slot.hint.length === 0) {
+            continue;
+          }
+          const appearance = faceletAppearance(
+            this.#appearances,
+            this.plan.faceStyles,
+            source.faceStyle,
+            source.mask,
+            source.hintMask
+          );
+          this.#paint(this.#bodyColors, slot.body, appearance, 0);
+          if (this.#hintColors) {
+            this.#paint(this.#hintColors, slot.hint, appearance, 4);
+          }
+        }
+      }
+    }
+    for (const [colors, span] of this.#dirtyColors) {
+      colors.addUpdateRange(4 * span.first, 4 * (span.last - span.first + 1));
+      colors.needsUpdate = true;
+    }
+    this.#dirtyColors.clear();
+  }
+  #paint(colors, ranges, appearance, offset) {
+    if (ranges.length === 0) {
+      return;
+    }
+    writeColor(colors, ranges, appearance, offset);
+    let span = this.#dirtyColors.get(colors);
+    if (!span) {
+      span = { first: Number.POSITIVE_INFINITY, last: 0 };
+      this.#dirtyColors.set(colors, span);
+    }
+    for (const range of ranges) {
+      span.first = Math.min(span.first, range.start);
+      span.last = Math.max(span.last, range.start + range.count - 1);
+    }
+  }
+};
+
 // src/cubing/twisty/heavy-code-imports/dynamic-entries/twisty-dynamic-3d.ts
 import { PerspectiveCamera } from "three/src/cameras/PerspectiveCamera.js";
 import { Raycaster } from "three/src/core/Raycaster.js";
 import { TextureLoader as TextureLoader2 } from "three/src/loaders/TextureLoader.js";
 import { Spherical } from "three/src/math/Spherical.js";
 import { Vector2 as Vector22 } from "three/src/math/Vector2.js";
-import { Vector3 as Vector34 } from "three/src/math/Vector3.js";
+import { Vector3 as Vector310 } from "three/src/math/Vector3.js";
 import { WebGLRenderer } from "three/src/renderers/WebGLRenderer.js";
 import { Scene } from "three/src/scenes/Scene.js";
 
@@ -2393,11 +4128,19 @@ async function square1_3DShim(renderCallback, puzzleLoader, faceletScale) {
     faceletScale
   });
 }
-async function pg3dShim(renderCallback, puzzleLoader, hintFacelets, faceletScale, darkIgnoredOrbits) {
+async function pg3dShim(renderCallback, puzzleLoader, hintFacelets, faceletScale, darkIgnoredOrbits, pictureCube = false) {
+  const kpuzzle = await puzzleLoader.kpuzzle();
+  const stickerDat = (await puzzleLoader.pg()).get3d({ darkIgnoredOrbits });
+  const plan = darkIgnoredOrbits || pictureCube ? null : cubePuzzlePlan(stickerDat) ?? solidPuzzlePlan(stickerDat);
+  if (plan) {
+    return new Stickerless3D(renderCallback, kpuzzle, stickerDat, plan, {
+      hintFacelets
+    });
+  }
   return new PG3D(
     renderCallback,
-    await puzzleLoader.kpuzzle(),
-    (await puzzleLoader.pg()).get3d({ darkIgnoredOrbits }),
+    kpuzzle,
+    stickerDat,
     true,
     hintFacelets === "floating",
     void 0,
@@ -2408,17 +4151,18 @@ export {
   Cube3D,
   PG3D,
   Square1_3D,
+  Stickerless3D,
   PerspectiveCamera as ThreePerspectiveCamera,
   Raycaster as ThreeRaycaster,
   Scene as ThreeScene,
   Spherical as ThreeSpherical,
   TextureLoader2 as ThreeTextureLoader,
   Vector22 as ThreeVector2,
-  Vector34 as ThreeVector3,
+  Vector310 as ThreeVector3,
   WebGLRenderer as ThreeWebGLRenderer,
   Twisty3DScene,
   cube3DShim,
   pg3dShim,
   square1_3DShim
 };
-//# sourceMappingURL=twisty-dynamic-3d-XQOH6E2O.js.map
+//# sourceMappingURL=twisty-dynamic-3d-MF76FSDA.js.map