feat: Points (#82)

Replaces the former sole Element entity by two, Sphere and Point, both implementing an Element trait. Adds Point display, uses the former Element display for Sphere. Adds a new "canned" configuration, and the ability to add, select, and nudge Point entities.

Co-authored-by: Aaron Fenyes <aaron.fenyes@fareycircles.ooo>
Reviewed-on: #82
Co-authored-by: Vectornaut <vectornaut@nobody@nowhere.net>
Co-committed-by: Vectornaut <vectornaut@nobody@nowhere.net>

app-proto/src/add_remove.rs

@@ -1,58 +1,59 @@
+use std::{f64::consts::FRAC_1_SQRT_2, rc::Rc};
 use sycamore::prelude::*;
 use web_sys::{console, wasm_bindgen::JsValue};
 
 use crate::{
     engine,
     AppState,
-    assembly::{Assembly, Element, InversiveDistanceRegulator}
+    assembly::{Assembly, InversiveDistanceRegulator, Point, Sphere}
 };
 
 /* DEBUG */
 // load an example assembly for testing. this code will be removed once we've
 // built a more formal test assembly system
 fn load_gen_assemb(assembly: &Assembly) {
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             String::from("gemini_a"),
             String::from("Castor"),
             [1.00_f32, 0.25_f32, 0.00_f32],
             engine::sphere(0.5, 0.5, 0.0, 1.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             String::from("gemini_b"),
             String::from("Pollux"),
             [0.00_f32, 0.25_f32, 1.00_f32],
             engine::sphere(-0.5, -0.5, 0.0, 1.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             String::from("ursa_major"),
             String::from("Ursa major"),
             [0.25_f32, 0.00_f32, 1.00_f32],
             engine::sphere(-0.5, 0.5, 0.0, 0.75)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             String::from("ursa_minor"),
             String::from("Ursa minor"),
             [0.25_f32, 1.00_f32, 0.00_f32],
             engine::sphere(0.5, -0.5, 0.0, 0.5)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             String::from("moon_deimos"),
             String::from("Deimos"),
             [0.75_f32, 0.75_f32, 0.00_f32],
             engine::sphere(0.0, 0.15, 1.0, 0.25)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             String::from("moon_phobos"),
             String::from("Phobos"),
             [0.00_f32, 0.75_f32, 0.50_f32],
@@ -66,64 +67,64 @@ fn load_gen_assemb(assembly: &Assembly) {
 // built a more formal test assembly system
 fn load_low_curv_assemb(assembly: &Assembly) {
     let a = 0.75_f64.sqrt();
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             "central".to_string(),
             "Central".to_string(),
             [0.75_f32, 0.75_f32, 0.75_f32],
             engine::sphere(0.0, 0.0, 0.0, 1.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             "assemb_plane".to_string(),
             "Assembly plane".to_string(),
             [0.75_f32, 0.75_f32, 0.75_f32],
             engine::sphere_with_offset(0.0, 0.0, 1.0, 0.0, 0.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             "side1".to_string(),
             "Side 1".to_string(),
             [1.00_f32, 0.00_f32, 0.25_f32],
             engine::sphere_with_offset(1.0, 0.0, 0.0, 1.0, 0.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             "side2".to_string(),
             "Side 2".to_string(),
             [0.25_f32, 1.00_f32, 0.00_f32],
             engine::sphere_with_offset(-0.5, a, 0.0, 1.0, 0.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             "side3".to_string(),
             "Side 3".to_string(),
             [0.00_f32, 0.25_f32, 1.00_f32],
             engine::sphere_with_offset(-0.5, -a, 0.0, 1.0, 0.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             "corner1".to_string(),
             "Corner 1".to_string(),
             [0.75_f32, 0.75_f32, 0.75_f32],
             engine::sphere(-4.0/3.0, 0.0, 0.0, 1.0/3.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             "corner2".to_string(),
             "Corner 2".to_string(),
             [0.75_f32, 0.75_f32, 0.75_f32],
             engine::sphere(2.0/3.0, -4.0/3.0 * a, 0.0, 1.0/3.0)
         )
     );
-    let _ = assembly.try_insert_sphere(
-        Element::new(
+    let _ = assembly.try_insert_element(
+        Sphere::new(
             String::from("corner3"),
             String::from("Corner 3"),
             [0.75_f32, 0.75_f32, 0.75_f32],
@@ -132,6 +133,49 @@ fn load_low_curv_assemb(assembly: &Assembly) {
     );
 }
 
+fn load_pointed_assemb(assembly: &Assembly) {
+    let _ = assembly.try_insert_element(
+        Point::new(
+            format!("point_front"),
+            format!("Front point"),
+            [0.75_f32, 0.75_f32, 0.75_f32],
+            engine::point(0.0, 0.0, FRAC_1_SQRT_2)
+        )
+    );
+    let _ = assembly.try_insert_element(
+        Point::new(
+            format!("point_back"),
+            format!("Back point"),
+            [0.75_f32, 0.75_f32, 0.75_f32],
+            engine::point(0.0, 0.0, -FRAC_1_SQRT_2)
+        )
+    );
+    for index_x in 0..=1 {
+        for index_y in 0..=1 {
+            let x = index_x as f64 - 0.5;
+            let y = index_y as f64 - 0.5;
+            
+            let _ = assembly.try_insert_element(
+                Sphere::new(
+                    format!("sphere{index_x}{index_y}"),
+                    format!("Sphere {index_x}{index_y}"),
+                    [0.5*(1.0 + x) as f32, 0.5*(1.0 + y) as f32, 0.5*(1.0 - x*y) as f32],
+                    engine::sphere(x, y, 0.0, 1.0)
+                )
+            );
+            
+            let _ = assembly.try_insert_element(
+                Point::new(
+                    format!("point{index_x}{index_y}"),
+                    format!("Point {index_x}{index_y}"),
+                    [0.5*(1.0 + x) as f32, 0.5*(1.0 + y) as f32, 0.5*(1.0 - x*y) as f32],
+                    engine::point(x, y, 0.0)
+                )
+            );
+        }
+    }
+}
+
 #[component]
 pub fn AddRemove() -> View {
     /* DEBUG */
@@ -157,6 +201,7 @@ pub fn AddRemove() -> View {
             match name.as_str() {
                 "general" => load_gen_assemb(assembly),
                 "low-curv" => load_low_curv_assemb(assembly),
+                "pointed" => load_pointed_assemb(assembly),
                 _ => ()
             };
         });
@@ -167,9 +212,15 @@ pub fn AddRemove() -> View {
             button(
                 on:click=|_| {
                     let state = use_context::<AppState>();
-                    state.assembly.insert_new_sphere();
+                    state.assembly.insert_element_default::<Sphere>();
                 }
-            ) { "+" }
+            ) { "Add sphere" }
+            button(
+                on:click=|_| {
+                    let state = use_context::<AppState>();
+                    state.assembly.insert_element_default::<Point>();
+                }
+            ) { "Add point" }
             button(
                 class="emoji", /* KLUDGE */ // for convenience, we're using an emoji as a temporary icon for this button
                 disabled={
@@ -190,7 +241,7 @@ pub fn AddRemove() -> View {
                             .unwrap()
                     );
                     state.assembly.insert_regulator(
-                        InversiveDistanceRegulator::new(subjects, &state.assembly)
+                        Rc::new(InversiveDistanceRegulator::new(subjects, &state.assembly))
                     );
                     state.selection.update(|sel| sel.clear());
                 }
@@ -198,6 +249,7 @@ pub fn AddRemove() -> View {
             select(bind:value=assembly_name) { /* DEBUG */ // example assembly chooser
                 option(value="general") { "General" }
                 option(value="low-curv") { "Low-curvature" }
+                option(value="pointed") { "Pointed" }
                 option(value="empty") { "Empty" }
             }
         }