glen/dyna3
1
0
Fork 0
Code Issues 14 Pull Requests 1 Actions Projects Releases 2 Wiki Activity

Compare commits

base: glen:fc39f2a5f31958764ddab9d2f1b08783acae07b8
Branches Tags
glen:main
glen:tangent-space
glen:select-in-display
glen:cargo-examples_on_main
glen:element-serial
glen:outline-update-fix
glen:outline-cleanup_on_main
glen:engine-integration
glen:cargo-examples
glen:outline-cleanup
glen:app-proto
glen:engine-proto
glen:lang-trials
glen:gram
glen:macaulay2
glen:seed-problem
glen:v0.1.1
glen:v0.1.0
..
compare: glen:1f3a6eea3ba7cf4ba3e785425b853f8319c81527
Branches Tags
glen:tangent-space
glen:main
glen:select-in-display
glen:cargo-examples_on_main
glen:element-serial
glen:outline-update-fix
glen:outline-cleanup_on_main
glen:engine-integration
glen:cargo-examples
glen:outline-cleanup
glen:app-proto
glen:engine-proto
glen:lang-trials
glen:gram
glen:macaulay2
glen:seed-problem
glen:v0.1.1
glen:v0.1.0

No commits in common. "fc39f2a5f31958764ddab9d2f1b08783acae07b8" and "1f3a6eea3ba7cf4ba3e785425b853f8319c81527" have entirely different histories.
fc39f2a5f3 ... 1f3a6eea3b

6 changed files with 200 additions and 209 deletions
Show Stats Expand all files Collapse all files

2
app-proto/index.html
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"/> <meta charset="utf-8"/>
<title>dyna3</title> <title>dyna3</title>
<link data-trunk rel="css" href="main.css"/> <link data-trunk rel="css" href="main.css"/>
<link href="https://fonts.bunny.net/css?family=fira-sans:ital,wght@0,400;1,400&display=swap" rel="stylesheet"> <link href="https://fonts.bunny.net/css?family=lato:ital,wght@0,400;1,400&display=swap" rel="stylesheet">
<link href="https://fonts.bunny.net/css?family=noto-emoji:wght@400&text=%f0%9f%94%97%e2%9a%a0&display=swap" rel="stylesheet"> <link href="https://fonts.bunny.net/css?family=noto-emoji:wght@400&text=%f0%9f%94%97%e2%9a%a0&display=swap" rel="stylesheet">
</head> </head>
<body></body> <body></body>

5
app-proto/main.css
View File

@ -2,7 +2,7 @@ body {
margin: 0px; margin: 0px;
color: #fcfcfc; color: #fcfcfc;
background-color: #222; background-color: #222;
font-family: 'Fira Sans', sans-serif; font-family: 'Lato';
} }
/* sidebar */ /* sidebar */
@ -36,7 +36,7 @@ body {
/* KLUDGE */ /* KLUDGE */
#add-remove > button.emoji { #add-remove > button.emoji {
font-family: 'Noto Emoji', sans-serif; font-family: 'Noto Emoji';
} }
/* outline */ /* outline */
@ -102,7 +102,6 @@ details[open]:has(li) .elt-switch::after {
.elt-rep > div { .elt-rep > div {
padding: 2px 0px 0px 0px; padding: 2px 0px 0px 0px;
font-size: 10pt; font-size: 10pt;
font-variant-numeric: tabular-nums;
text-align: right; text-align: right;
width: 56px; width: 56px;
} }

214
app-proto/src/add_remove.rs
View File

@ -1,3 +1,4 @@
use std::collections::BTreeSet; /* DEBUG */
use sycamore::prelude::*; use sycamore::prelude::*;
use web_sys::{console, wasm_bindgen::JsValue}; use web_sys::{console, wasm_bindgen::JsValue};
@ -6,52 +7,64 @@ use crate::{engine, AppState, assembly::{Assembly, Constraint, Element}};
/* DEBUG */ /* DEBUG */
fn load_gen_assemb(assembly: &Assembly) { fn load_gen_assemb(assembly: &Assembly) {
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
String::from("gemini_a"), id: String::from("gemini_a"),
String::from("Castor"), label: String::from("Castor"),
[1.00_f32, 0.25_f32, 0.00_f32], color: [1.00_f32, 0.25_f32, 0.00_f32],
engine::sphere(0.5, 0.5, 0.0, 1.0) rep: engine::sphere(0.5, 0.5, 0.0, 1.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
String::from("gemini_b"), id: String::from("gemini_b"),
String::from("Pollux"), label: String::from("Pollux"),
[0.00_f32, 0.25_f32, 1.00_f32], color: [0.00_f32, 0.25_f32, 1.00_f32],
engine::sphere(-0.5, -0.5, 0.0, 1.0) rep: engine::sphere(-0.5, -0.5, 0.0, 1.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
String::from("ursa_major"), id: String::from("ursa_major"),
String::from("Ursa major"), label: String::from("Ursa major"),
[0.25_f32, 0.00_f32, 1.00_f32], color: [0.25_f32, 0.00_f32, 1.00_f32],
engine::sphere(-0.5, 0.5, 0.0, 0.75) rep: engine::sphere(-0.5, 0.5, 0.0, 0.75),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
String::from("ursa_minor"), id: String::from("ursa_minor"),
String::from("Ursa minor"), label: String::from("Ursa minor"),
[0.25_f32, 1.00_f32, 0.00_f32], color: [0.25_f32, 1.00_f32, 0.00_f32],
engine::sphere(0.5, -0.5, 0.0, 0.5) rep: engine::sphere(0.5, -0.5, 0.0, 0.5),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
String::from("moon_deimos"), id: String::from("moon_deimos"),
String::from("Deimos"), label: String::from("Deimos"),
[0.75_f32, 0.75_f32, 0.00_f32], color: [0.75_f32, 0.75_f32, 0.00_f32],
engine::sphere(0.0, 0.15, 1.0, 0.25) rep: engine::sphere(0.0, 0.15, 1.0, 0.25),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
String::from("moon_phobos"), id: String::from("moon_phobos"),
String::from("Phobos"), label: String::from("Phobos"),
[0.00_f32, 0.75_f32, 0.50_f32], color: [0.00_f32, 0.75_f32, 0.50_f32],
engine::sphere(0.0, -0.15, -1.0, 0.25) rep: engine::sphere(0.0, -0.15, -1.0, 0.25),
) constraints: BTreeSet::default(),
index: 0
}
); );
} }
@ -59,68 +72,84 @@ fn load_gen_assemb(assembly: &Assembly) {
fn load_low_curv_assemb(assembly: &Assembly) { fn load_low_curv_assemb(assembly: &Assembly) {
let a = 0.75_f64.sqrt(); let a = 0.75_f64.sqrt();
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
"central".to_string(), id: "central".to_string(),
"Central".to_string(), label: "Central".to_string(),
[0.75_f32, 0.75_f32, 0.75_f32], color: [0.75_f32, 0.75_f32, 0.75_f32],
engine::sphere(0.0, 0.0, 0.0, 1.0) rep: engine::sphere(0.0, 0.0, 0.0, 1.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
"assemb_plane".to_string(), id: "assemb_plane".to_string(),
"Assembly plane".to_string(), label: "Assembly plane".to_string(),
[0.75_f32, 0.75_f32, 0.75_f32], color: [0.75_f32, 0.75_f32, 0.75_f32],
engine::sphere_with_offset(0.0, 0.0, 1.0, 0.0, 0.0) rep: engine::sphere_with_offset(0.0, 0.0, 1.0, 0.0, 0.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
"side1".to_string(), id: "side1".to_string(),
"Side 1".to_string(), label: "Side 1".to_string(),
[1.00_f32, 0.00_f32, 0.25_f32], color: [1.00_f32, 0.00_f32, 0.25_f32],
engine::sphere_with_offset(1.0, 0.0, 0.0, 1.0, 0.0) rep: engine::sphere_with_offset(1.0, 0.0, 0.0, 1.0, 0.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
"side2".to_string(), id: "side2".to_string(),
"Side 2".to_string(), label: "Side 2".to_string(),
[0.25_f32, 1.00_f32, 0.00_f32], color: [0.25_f32, 1.00_f32, 0.00_f32],
engine::sphere_with_offset(-0.5, a, 0.0, 1.0, 0.0) rep: engine::sphere_with_offset(-0.5, a, 0.0, 1.0, 0.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
"side3".to_string(), id: "side3".to_string(),
"Side 3".to_string(), label: "Side 3".to_string(),
[0.00_f32, 0.25_f32, 1.00_f32], color: [0.00_f32, 0.25_f32, 1.00_f32],
engine::sphere_with_offset(-0.5, -a, 0.0, 1.0, 0.0) rep: engine::sphere_with_offset(-0.5, -a, 0.0, 1.0, 0.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
"corner1".to_string(), id: "corner1".to_string(),
"Corner 1".to_string(), label: "Corner 1".to_string(),
[0.75_f32, 0.75_f32, 0.75_f32], color: [0.75_f32, 0.75_f32, 0.75_f32],
engine::sphere(-4.0/3.0, 0.0, 0.0, 1.0/3.0) rep: engine::sphere(-4.0/3.0, 0.0, 0.0, 1.0/3.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
"corner2".to_string(), id: "corner2".to_string(),
"Corner 2".to_string(), label: "Corner 2".to_string(),
[0.75_f32, 0.75_f32, 0.75_f32], color: [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) rep: engine::sphere(2.0/3.0, -4.0/3.0 * a, 0.0, 1.0/3.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
let _ = assembly.try_insert_element( let _ = assembly.try_insert_element(
Element::new( Element {
String::from("corner3"), id: String::from("corner3"),
String::from("Corner 3"), label: String::from("Corner 3"),
[0.75_f32, 0.75_f32, 0.75_f32], color: [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) rep: engine::sphere(2.0/3.0, 4.0/3.0 * a, 0.0, 1.0/3.0),
) constraints: BTreeSet::default(),
index: 0
}
); );
} }
@ -187,15 +216,15 @@ pub fn AddRemove() -> View {
} }
); );
let rep = create_signal(0.0); let rep = create_signal(0.0);
let rep_valid = create_signal(false);
let active = create_signal(true); let active = create_signal(true);
state.assembly.insert_constraint(Constraint { state.assembly.insert_constraint(Constraint {
args: args, args: args,
rep: rep, rep: rep,
rep_text: create_signal(String::new()), rep_text: create_signal(String::new()),
rep_valid: rep_valid, rep_valid: create_signal(false),
active: active, active: active,
}); });
state.assembly.realize();
state.selection.update(|sel| sel.clear()); state.selection.update(|sel| sel.clear());
/* DEBUG */ /* DEBUG */
@ -213,14 +242,15 @@ pub fn AddRemove() -> View {
} }
}); });
// update the realization when the constraint becomes active // update the realization when the constraint activated, or
// and valid, or is edited while active and valid // edited while active
create_effect(move || { create_effect(move || {
console::log_1(&JsValue::from(
format!("Constraint ({}, {}) updated", args.0, args.1)
));
rep.track(); rep.track();
if active.get() && rep_valid.get() { console::log_2(
&JsValue::from("Lorentz product updated to"),
&JsValue::from(rep.get_untracked())
);
if active.get() {
state.assembly.realize(); state.assembly.realize();
} }
}); });

58
app-proto/src/assembly.rs
View File

@ -12,32 +12,13 @@ pub struct Element {
pub id: String, pub id: String,
pub label: String, pub label: String,
pub color: [f32; 3], pub color: [f32; 3],
pub rep: Signal<DVector<f64>>, pub rep: DVector<f64>,
pub constraints: Signal<BTreeSet<usize>>, pub constraints: BTreeSet<usize>,
// internal properties, not reflected in any view // internal properties, not reflected in any view
pub index: usize pub index: usize
} }
impl Element {
pub fn new(
id: String,
label: String,
color: [f32; 3],
rep: DVector<f64>
) -> Element {
Element {
id: id,
label: label,
color: color,
rep: create_signal(rep),
constraints: create_signal(BTreeSet::default()),
index: 0
}
}
}
#[derive(Clone)] #[derive(Clone)]
pub struct Constraint { pub struct Constraint {
pub args: (usize, usize), pub args: (usize, usize),
@ -101,23 +82,24 @@ impl Assembly {
// create and insert a new element // create and insert a new element
self.insert_element_unchecked( self.insert_element_unchecked(
Element::new( Element {
id, id: id,
format!("Sphere {}", id_num), label: format!("Sphere {}", id_num),
[0.75_f32, 0.75_f32, 0.75_f32], color: [0.75_f32, 0.75_f32, 0.75_f32],
DVector::<f64>::from_column_slice(&[0.0, 0.0, 0.0, 0.5, -0.5]) rep: DVector::<f64>::from_column_slice(&[0.0, 0.0, 0.0, 0.5, -0.5]),
) constraints: BTreeSet::default(),
index: 0
}
); );
} }
pub fn insert_constraint(&self, constraint: Constraint) { pub fn insert_constraint(&self, constraint: Constraint) {
let args = constraint.args; let args = constraint.args;
let key = self.constraints.update(|csts| csts.insert(constraint)); let key = self.constraints.update(|csts| csts.insert(constraint));
let arg_constraints = self.elements.with( self.elements.update(|elts| {
|elts| (elts[args.0].constraints, elts[args.1].constraints) elts[args.0].constraints.insert(key);
); elts[args.1].constraints.insert(key);
arg_constraints.0.update(|csts| csts.insert(key)); });
arg_constraints.1.update(|csts| csts.insert(key));
} }
// --- realization --- // --- realization ---
@ -151,7 +133,7 @@ impl Assembly {
for (_, elt) in elts { for (_, elt) in elts {
let index = elt.index; let index = elt.index;
gram_to_be.push_sym(index, index, 1.0); gram_to_be.push_sym(index, index, 1.0);
guess_to_be.set_column(index, &elt.rep.get_clone_untracked()); guess_to_be.set_column(index, &elt.rep);
} }
(gram_to_be, guess_to_be) (gram_to_be, guess_to_be)
@ -193,11 +175,11 @@ impl Assembly {
if success { if success {
// read out the solution // read out the solution
for (_, elt) in self.elements.get_clone_untracked() { self.elements.update(|elts| {
elt.rep.update( for (_, elt) in elts.iter_mut() {
|rep| rep.set_column(0, &config.column(elt.index)) elt.rep.set_column(0, &config.column(elt.index));
); }
} });
} }
} }
} }

59
app-proto/src/display.rs
View File

@ -103,11 +103,7 @@ pub fn Display() -> View {
// change listener // change listener
let scene_changed = create_signal(true); let scene_changed = create_signal(true);
create_effect(move || { create_effect(move || {
state.assembly.elements.with(|elts| { state.assembly.elements.track();
for (_, elt) in elts {
elt.rep.track();
}
});
state.selection.track(); state.selection.track();
scene_changed.set(true); scene_changed.set(true);
}); });
@ -299,40 +295,23 @@ pub fn Display() -> View {
let assembly_to_world = &location * &orientation; let assembly_to_world = &location * &orientation;
// get the assembly // get the assembly
let ( let elements = state.assembly.elements.get_clone();
elt_cnt, let element_iter = (&elements).into_iter();
reps_world, let reps_world: Vec<_> = element_iter.clone().map(|(_, elt)| &assembly_to_world * &elt.rep).collect();
colors, let colors: Vec<_> = element_iter.clone().map(|(key, elt)|
highlights if state.selection.with(|sel| sel.contains(&key)) {
) = state.assembly.elements.with(|elts| { elt.color.map(|ch| 0.2 + 0.8*ch)
( } else {
// number of elements elt.color
elts.len() as i32, }
).collect();
// representation vectors in world coordinates let highlights: Vec<_> = element_iter.map(|(key, _)|
elts.iter().map( if state.selection.with(|sel| sel.contains(&key)) {
|(_, elt)| elt.rep.with(|rep| &assembly_to_world * rep) 1.0_f32
).collect::<Vec<_>>(), } else {
HIGHLIGHT
// colors }
elts.iter().map(|(key, elt)| { ).collect();
if state.selection.with(|sel| sel.contains(&key)) {
elt.color.map(|ch| 0.2 + 0.8*ch)
} else {
elt.color
}
}).collect::<Vec<_>>(),
// highlight levels
elts.iter().map(|(key, _)| {
if state.selection.with(|sel| sel.contains(&key)) {
1.0_f32
} else {
HIGHLIGHT
}
}).collect::<Vec<_>>()
)
});
// set the resolution // set the resolution
let width = canvas.width() as f32; let width = canvas.width() as f32;
@ -341,7 +320,7 @@ pub fn Display() -> View {
ctx.uniform1f(shortdim_loc.as_ref(), width.min(height)); ctx.uniform1f(shortdim_loc.as_ref(), width.min(height));
// pass the assembly // pass the assembly
ctx.uniform1i(sphere_cnt_loc.as_ref(), elt_cnt); ctx.uniform1i(sphere_cnt_loc.as_ref(), elements.len() as i32);
for n in 0..reps_world.len() { for n in 0..reps_world.len() {
let v = &reps_world[n]; let v = &reps_world[n];
ctx.uniform3f( ctx.uniform3f(

71
app-proto/src/outline.rs
View File

@ -1,5 +1,5 @@
use itertools::Itertools; use itertools::Itertools;
use sycamore::prelude::*; use sycamore::{prelude::*, web::tags::div};
use web_sys::{ use web_sys::{
Event, Event,
HtmlInputElement, HtmlInputElement,
@ -43,9 +43,13 @@ fn ConstraintOutlineItem(constraint_key: usize, element_key: usize) -> View {
constraint.args.0 constraint.args.0
}; };
let other_arg_label = assembly.elements.with(|elts| elts[other_arg].label.clone()); let other_arg_label = assembly.elements.with(|elts| elts[other_arg].label.clone());
let class = constraint.rep_valid.map( let class = create_memo(move || {
|&rep_valid| if rep_valid { "cst" } else { "cst invalid" } if constraint.rep_valid.get() {
); "cst"
} else {
"cst invalid"
}
});
view! { view! {
li(class=class.get()) { li(class=class.get()) {
input(r#type="checkbox", bind:checked=constraint.active) input(r#type="checkbox", bind:checked=constraint.active)
@ -60,19 +64,19 @@ fn ConstraintOutlineItem(constraint_key: usize, element_key: usize) -> View {
#[component(inline_props)] #[component(inline_props)]
fn ElementOutlineItem(key: usize, element: assembly::Element) -> View { fn ElementOutlineItem(key: usize, element: assembly::Element) -> View {
let state = use_context::<AppState>(); let state = use_context::<AppState>();
let class = state.selection.map( let class = create_memo(move || {
move |sel| if sel.contains(&key) { "selected" } else { "" } if state.selection.with(|sel| sel.contains(&key)) {
); "selected"
} else {
""
}
});
let label = element.label.clone(); let label = element.label.clone();
let rep_components = element.rep.map( let rep_components = element.rep.iter().map(|u| {
|rep| rep.iter().map( let u_coord = format!("{:.3}", u).replace("-", "\u{2212}");
|u| format!("{:.3}", u).replace("-", "\u{2212}") View::from(div().children(u_coord))
).collect() }).collect::<Vec<_>>();
); let constrained = element.constraints.len() > 0;
let constrained = element.constraints.map(|csts| csts.len() > 0);
let constraint_list = element.constraints.map(
|csts| csts.clone().into_iter().collect()
);
let details_node = create_node_ref(); let details_node = create_node_ref();
view! { view! {
li { li {
@ -97,7 +101,7 @@ fn ElementOutlineItem(key: usize, element: assembly::Element) -> View {
} }
event.prevent_default(); event.prevent_default();
}, },
"ArrowRight" if constrained.get() => { "ArrowRight" if constrained => {
let _ = details_node let _ = details_node
.get() .get()
.unchecked_into::<web_sys::Element>() .unchecked_into::<web_sys::Element>()
@ -140,20 +144,13 @@ fn ElementOutlineItem(key: usize, element: assembly::Element) -> View {
} }
) { ) {
div(class="elt-label") { (label) } div(class="elt-label") { (label) }
div(class="elt-rep") { div(class="elt-rep") { (rep_components) }
Indexed(
list=rep_components,
view=|coord_str| view! {
div { (coord_str) }
}
)
}
div(class="status") div(class="status")
} }
} }
ul(class="constraints") { ul(class="constraints") {
Keyed( Keyed(
list=constraint_list, list=element.constraints.into_iter().collect::<Vec<_>>(),
view=move |cst_key| view! { view=move |cst_key| view! {
ConstraintOutlineItem( ConstraintOutlineItem(
constraint_key=cst_key, constraint_key=cst_key,
@ -176,16 +173,15 @@ fn ElementOutlineItem(key: usize, element: assembly::Element) -> View {
// //
#[component] #[component]
pub fn Outline() -> View { pub fn Outline() -> View {
let state = use_context::<AppState>(); // sort the elements alphabetically by ID
let elements_sorted = create_memo(|| {
// list the elements alphabetically by ID let state = use_context::<AppState>();
let element_list = state.assembly.elements.map( state.assembly.elements
|elts| elts .get_clone()
.clone()
.into_iter() .into_iter()
.sorted_by_key(|(_, elt)| elt.id.clone()) .sorted_by_key(|(_, elt)| elt.id.clone())
.collect() .collect()
); });
view! { view! {
ul( ul(
@ -196,11 +192,16 @@ pub fn Outline() -> View {
} }
) { ) {
Keyed( Keyed(
list=element_list, list=elements_sorted,
view=|(key, elt)| view! { view=|(key, elt)| view! {
ElementOutlineItem(key=key, element=elt) ElementOutlineItem(key=key, element=elt)
}, },
key=|(key, _)| key.clone() key=|(key, elt)| (
key.clone(),
elt.id.clone(),
elt.label.clone(),
elt.constraints.clone()
)
) )
} }
} }