StudioInfinity/dyna3
2
0
Fork 1
Code Issues 44 Pull requests Projects 2 Releases 2 Wiki Activity Actions

Generalize constraints to observables #48

Merged
glen merged 25 commits from Vectornaut/dyna3:observables_on_main into main 2025-03-10 23:43:25 +00:00
Conversation 69 Commits 25 Files changed 7 +30 -16
4 changed files with 30 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit af2724f934 - Show all commits

8
app-proto/main.css
View file

@ -127,7 +127,7 @@ details[open]:has(li) .element-switch::after {
font-style: italic;
}
.observable.invalid {
.observable.invalid-constraint {
color: var(--text-invalid);
}
@ -138,7 +138,7 @@ details[open]:has(li) .element-switch::after {
border-radius: 2px;
}
.observable.invalid > input[type=text] {
.observable.invalid-constraint > input[type=text] {
border-color: var(--border-invalid);
}
@ -150,11 +150,11 @@ details[open]:has(li) .element-switch::after {
font-style: normal;
}
.constrained > .status::after, details:has(.constrained):not([open]) .status::after {
.valid-constraint > .status::after, details:has(.valid-constraint):not([open]) .status::after {
content: '🔗';
}
.invalid > .status::after, details:has(.invalid):not([open]) .status::after {
.invalid-constraint > .status::after, details:has(.invalid-constraint):not([open]) .status::after {
content: '⚠';
color: var(--text-invalid);
}

4
app-proto/src/add_remove.rs
View file

@ -210,7 +210,7 @@ pub fn AddRemove() -> View {
}
);
let desired = create_signal(0.0);
let role = create_signal(ObservableRole::Measure);
let role = create_signal(ObservableRole::Measurement);
state.assembly.insert_observable(Observable {
subjects: subjects,
measured: measured,
@ -242,7 +242,7 @@ pub fn AddRemove() -> View {
format!("Updated constraint with subjects ({}, {})", subjects.0, subjects.1)
));
desired.track();
if role.with(|r| matches!(r, ObservableRole::Constrain)) {
if role.with(|rl| rl.is_valid_constraint()) {
state.assembly.realize();
}
});

22
app-proto/src/assembly.rs
View file

@ -112,9 +112,17 @@ impl Element {
}
pub enum ObservableRole {
Measure,
Constrain,
Invalid
Measurement,
Constraint(bool)
}
impl ObservableRole {
pub fn is_valid_constraint(&self) -> bool {
match self {
ObservableRole::Measurement => false,
ObservableRole::Constraint(valid) => *valid
}
}
}
#[derive(Clone)]
@ -126,6 +134,12 @@ pub struct Observable {
pub role: Signal<ObservableRole>
}
impl Observable {
fn role_is_valid_constraint_untracked(&self) -> bool {
self.role.with_untracked(|role| role.is_valid_constraint())
}
}
// the velocity is expressed in uniform coordinates
pub struct ElementMotion<'a> {
pub key: ElementKey,
@ -236,7 +250,7 @@ impl Assembly {
let mut gram_to_be = PartialMatrix::new();
self.observables.with_untracked(|obsls| {
for (_, obs) in obsls {
if obs.role.with_untracked(|role| matches!(role, ObservableRole::Constrain)) {
if obs.role_is_valid_constraint_untracked() {
let subjects = obs.subjects;
let row = elts[subjects.0].column_index.unwrap();
let col = elts[subjects.1].column_index.unwrap();

12
app-proto/src/outline.rs
View file

@ -31,14 +31,14 @@ fn ObservableInput(observable: Observable) -> View {
let target: HtmlInputElement = event.target().unwrap().unchecked_into();
let value = target.value();
if value.is_empty() {
observable.role.set(Measure);
observable.role.set(Measurement);
} else {
match target.value().parse::<f64>() {
Ok(desired) => batch(|| {
observable.desired.set(desired);
observable.role.set(Constrain);
observable.role.set(Constraint(true));
}),
Err(_) => observable.role.set(Invalid)
Err(_) => observable.role.set(Constraint(false))
glen marked this conversation as resolved
glen commented 2025-03-10 19:36:54 +00:00
Review
Copy link

Please could you explain to me the three moves in the three closures in this view! macro, the one that specifies the class of the input element, the one that specifies its change handler, and the one that specifies its keydown handler?

If I am understanding Rust correctly, the move annotation specifies that the closure should take ownership of any free variables that appear therein. So that would mean that the function that computes the class of the input takes ownership of the regulator. Why is that desired? Is it because the input element may not actually be realized until after the RegulatorInput function returns, and the ownership transfer extends the lifetime of the regulator until the closure has a chance to run and grab the info it needs to set the class (or perhaps actually, it has to persist that regulator indefinitely and then it can react to all future changes to the regulator)? The class-calculating closure of the input element seems like a slightly odd place for the long-term ownership of the regulator to reside, but maybe it doesn't really matter what owns it, as long as it persists indefinitely?

But it seems my suggestions in the previous paragraph can't possibly be correct, because regulator also occurs free in the closure passed as on:change, but the ownership of one entity can't exist in two places, if I am understanding correctly. So I guess please just explain to me what's going on here.

And finally, the third move seems the most confusing. For the life of me, I can't see any free variables in the closure passed as on:keydown, so there doesn't seem to be anything to move, and so the move shouldn't be there.

Thanks in advance for illuminating these things for me.

Please could you explain to me the three `move`s in the three closures in this `view!` macro, the one that specifies the class of the input element, the one that specifies its change handler, and the one that specifies its keydown handler? If I am understanding Rust correctly, the `move` annotation specifies that the closure should take ownership of any free variables that appear therein. So that would mean that the function that computes the class of the input takes ownership of the regulator. Why is that desired? Is it because the input element may not actually be realized until after the RegulatorInput function returns, and the ownership transfer extends the lifetime of the regulator until the closure has a chance to run and grab the info it needs to set the class (or perhaps actually, it has to persist that regulator indefinitely and then it can react to all future changes to the regulator)? The class-calculating closure of the input element seems like a slightly odd place for the long-term ownership of the regulator to reside, but maybe it doesn't really matter what owns it, as long as it persists indefinitely? But it seems my suggestions in the previous paragraph can't possibly be correct, because `regulator` also occurs free in the closure passed as `on:change`, but the ownership of one entity can't exist in two places, if I am understanding correctly. So I guess please just explain to me what's going on here. And finally, the third `move` seems the most confusing. For the life of me, I can't see _any_ free variables in the closure passed as `on:keydown`, so there doesn't seem to be anything _to_ move, and so the `move` shouldn't be there. Thanks in advance for illuminating these things for me.
glen commented 2025-03-10 23:26:48 +00:00
Review
Copy link

Replying to your latest post here, to keep it in this resolvable conversation. Ah, the fact that Signal has Copy semantics makes this code much clearer. I didn't know that, and it seems a weird quirk of Rust to me that with ownership such a crucial concept to Rust, it is not clear whether copy or ownership transfer is in effect and I don't see any way you can know without consulting the source/docs for Signal.

Anyhow, I now get the first two moves. And now I see that reset_value is just a local closure, and that's what's being moved by the third move (for the keydown event). So that's good. Resolving.

Replying to your latest post here, to keep it in this resolvable conversation. Ah, the fact that Signal has Copy semantics makes this code much clearer. I didn't know that, and it seems a weird quirk of Rust to me that with ownership such a crucial concept to Rust, it is not clear whether copy or ownership transfer is in effect and I don't see any way you can know without consulting the source/docs for Signal. Anyhow, I now get the first two `move`s. And now I see that `reset_value` is just a local closure, and that's what's being `move`d by the third `move` (for the keydown event). So that's good. Resolving.
};
}
}
@ -60,9 +60,9 @@ fn ObservableOutlineItem(observable_key: ObservableKey, element_key: ElementKey)
let other_subject_label = assembly.elements.with(|elts| elts[other_subject].label.clone());
let class = observable.role.map(
|role| match role {
Measure => "observable",
Constrain => "observable constrained",
Invalid => "observable invalid"
Measurement => "observable",
Constraint(true) => "observable valid-constraint",
Constraint(false) => "observable invalid-constraint"
}
);
view! {