Fix symmetric puzzle gizmos

Author: HactarCE

crates/hyperpuzzle_core/src/puzzle/twists.rs

@@ -45,10 +45,10 @@ impl fmt::Debug for TwistSystem {
 
 impl TwistSystem {
     /// Returns an empty twist system.
-    pub fn new_empty(axes: &Arc<AxisSystem>) -> Self {
+    pub fn new_empty() -> Self {
         Self {
             meta: Arc::new(CatalogMetadata::dummy()),
-            axes: Arc::clone(axes),
+            axes: Arc::new(AxisSystem::new_empty()),
             axis_from_family: Box::new(|_| None),
             directions: IndexMap::new(),
             vantage_groups: IndexMap::from_iter([("trivial".to_string(), ().into())]),

crates/hyperpuzzle_impl_nd_euclid/src/hps/puzzle.rs

@@ -106,16 +106,17 @@ impl HpsPuzzle {
         };
 
         let axes = self.twists().axes();
-        let mut this = self.lock();
-        let axes: Vec<Axis> = axis_vectors
+        let axes_to_add_layers_to: Vec<Axis> = axis_vectors
             .iter()
             .map(|v| eyre::Ok(super::axis_from_vector(&*axes.lock_vectors()?, v)?))
             .try_collect()
             .at(span)?;
 
+        let mut this = self.lock();
+
         // Add layers.
-        this.axis_layers.resize(axes.len()).at(span)?;
-        for axis in axes {
+        for axis in axes_to_add_layers_to {
+            this.axis_layers.extend_to_contain(axis);
             let axis_layers = &mut this.axis_layers[axis].0;
             for (&top, &bottom) in layers.iter().tuple_windows() {
                 axis_layers

crates/hyperpuzzle_impl_nd_euclid/src/lib.rs

@@ -66,11 +66,10 @@ impl PuzzleStateRenderData for NdEuclidPuzzleStateRenderData {}
 lazy_static! {
     /// Hard-coded placeholder puzzle with no pieces, no stickers, no mesh, etc.
     pub static ref PLACEHOLDER_PUZZLE: Arc<Puzzle> = {
-        let axes = Arc::new(AxisSystem::new_empty());
-        let twists = Arc::new(TwistSystem::new_empty(&axes));
         let mut components = ComponentList::new();
         let geom = Arc::new(NdEuclidPuzzleGeometry::placeholder());
         components.insert(Arc::clone(&geom));
+
         Arc::new_cyclic(|this| Puzzle {
             this: Weak::clone(this),
             meta: Arc::new(CatalogMetadata {
@@ -90,7 +89,7 @@ lazy_static! {
             can_scramble: false,
             full_scramble_length: 0,
             axis_layers: PerAxis::new(),
-            twists,
+            twists: Arc::new(TwistSystem::new_empty()),
             new: Box::new(move |this| NdEuclidPuzzleState::new(this, Arc::clone(&geom)).into()),
             random_move: Box::new(move |_rng| None),
             components,

crates/hyperpuzzle_impl_symmetric/src/builder/mod.rs

@@ -10,7 +10,7 @@ use hypermath::prelude::*;
 use hyperpuzzle_core::ComponentList;
 use hyperpuzzle_core::catalog::{BuildCtx, BuildTask};
 use hyperpuzzle_core::prelude::*;
-use hyperpuzzle_impl_nd_euclid::NdEuclidPuzzleGeometry;
+use hyperpuzzle_impl_nd_euclid::{NdEuclidPuzzleGeometry, ad_hoc_id};
 
 mod axes;
 mod from_space;
@@ -170,7 +170,25 @@ impl ProductPuzzleBuilder {
             self.shape.build_piece_types(warn_fn)?;
 
         let axes = Arc::new(self.axes.build_axis_system()?);
-        let mut twists = TwistSystem::new_empty(&axes);
+        let mut twists = TwistSystem {
+            meta: Arc::new(CatalogMetadata::simple(
+                ad_hoc_id(id.clone()),
+                format!("{id} (ad-hoc)"),
+            )),
+            axes: Arc::clone(&axes),
+            axis_from_family: Box::new({
+                let axes = axes.clone();
+                move |family_str| {
+                    // TODO: correct number of underscores
+                    let axis_name = match family_str.split_once('_') {
+                        Some((first, _)) => first,
+                        None => family_str,
+                    };
+                    axes.names.id_from_name(axis_name)
+                }
+            }),
+            ..TwistSystem::new_empty()
+        };
         let axis_undeorbiters = self.axes.build_axis_undeorbiters();
 
         let named_point_names = self.axes.build_named_point_names()?;