Vectornaut/dyna3
1
0
Fork 0
forked from StudioInfinity/dyna3
Code Pull requests Activity

Move pointer creation into insert_regulator

Browse source 
This will make it easier to give each regulator a constructor instead of
an "insert new" method.
This commit is contained in:
Aaron Fenyes 2025-04-17 14:02:37 -07:00
parent ee8a01b9cb
commit 8f8e806d12
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -323,11 +323,15 @@ impl Assembly {
); );
} }
fn insert_regulator(&self, regulator: Rc<dyn Regulator>) { fn insert_regulator<T: Regulator + 'static>(&self, regulator: T) {
let subjects = regulator.subjects(); // add the regulator to the assembly's regulator list
let regulator_rc = Rc::new(regulator);
let key = self.regulators.update( let key = self.regulators.update(
|regs| regs.insert(regulator.clone()) |regs| regs.insert(regulator_rc.clone())
); );
// add the regulator to each subject's regulator list
let subjects = regulator_rc.subjects();
let subject_regulators: Vec<_> = self.elements.with_untracked( let subject_regulators: Vec<_> = self.elements.with_untracked(
|elts| subjects.into_iter().map( |elts| subjects.into_iter().map(
|subj| elts[subj].regulators |subj| elts[subj].regulators
@ -342,10 +346,10 @@ impl Assembly {
let self_for_effect = self.clone(); let self_for_effect = self.clone();
create_effect(move || { create_effect(move || {
console::log_1(&JsValue::from( console::log_1(&JsValue::from(
format!("Updated regulator with subjects {:?}", regulator.subjects()) format!("Updated regulator with subjects {:?}", regulator_rc.subjects())
)); ));
if regulator.set_point().with(|set_pt| set_pt.is_present()) { if regulator_rc.set_point().with(|set_pt| set_pt.is_present()) {
regulator.activate(&self_for_effect); regulator_rc.activate(&self_for_effect);
self_for_effect.realize(); self_for_effect.realize();
} }
}); });
@ -386,11 +390,11 @@ impl Assembly {
} }
); );
let set_point = create_signal(SpecifiedValue::from_empty_spec()); let set_point = create_signal(SpecifiedValue::from_empty_spec());
self.insert_regulator(Rc::new(ProductRegulator { self.insert_regulator(ProductRegulator {
subjects: subjects, subjects: subjects,
measurement: measurement, measurement: measurement,
set_point: set_point set_point: set_point
})); });
} }
pub fn insert_new_half_curvature_regulator(&self, subject: ElementKey) { pub fn insert_new_half_curvature_regulator(&self, subject: ElementKey) {
@ -399,11 +403,11 @@ impl Assembly {
move |elts| elts[subject].representation.with(|rep| rep[3]) move |elts| elts[subject].representation.with(|rep| rep[3])
); );
let set_point = create_signal(SpecifiedValue::from_empty_spec()); let set_point = create_signal(SpecifiedValue::from_empty_spec());
self.insert_regulator(Rc::new(HalfCurvatureRegulator { self.insert_regulator(HalfCurvatureRegulator {
subject: subject, subject: subject,
measurement: measurement, measurement: measurement,
set_point: set_point set_point: set_point
})); });
} }
// --- realization --- // --- realization ---