forked from StudioInfinity/dyna3
Give every sphere a curvature regulator
In the process, fix a reactivity bug by removing unintended signal tracking from `insert_regulator`.
This commit is contained in:
parent
63e3d733ba
commit
81e423fcbe
2 changed files with 34 additions and 30 deletions
|
@ -11,7 +11,7 @@ use crate::{
|
|||
// 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_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
String::from("gemini_a"),
|
||||
String::from("Castor"),
|
||||
|
@ -19,7 +19,7 @@ fn load_gen_assemb(assembly: &Assembly) {
|
|||
engine::sphere(0.5, 0.5, 0.0, 1.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
String::from("gemini_b"),
|
||||
String::from("Pollux"),
|
||||
|
@ -27,7 +27,7 @@ fn load_gen_assemb(assembly: &Assembly) {
|
|||
engine::sphere(-0.5, -0.5, 0.0, 1.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
String::from("ursa_major"),
|
||||
String::from("Ursa major"),
|
||||
|
@ -35,7 +35,7 @@ fn load_gen_assemb(assembly: &Assembly) {
|
|||
engine::sphere(-0.5, 0.5, 0.0, 0.75)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
String::from("ursa_minor"),
|
||||
String::from("Ursa minor"),
|
||||
|
@ -43,7 +43,7 @@ fn load_gen_assemb(assembly: &Assembly) {
|
|||
engine::sphere(0.5, -0.5, 0.0, 0.5)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
String::from("moon_deimos"),
|
||||
String::from("Deimos"),
|
||||
|
@ -51,7 +51,7 @@ fn load_gen_assemb(assembly: &Assembly) {
|
|||
engine::sphere(0.0, 0.15, 1.0, 0.25)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
String::from("moon_phobos"),
|
||||
String::from("Phobos"),
|
||||
|
@ -66,7 +66,7 @@ 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_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
"central".to_string(),
|
||||
"Central".to_string(),
|
||||
|
@ -74,7 +74,7 @@ fn load_low_curv_assemb(assembly: &Assembly) {
|
|||
engine::sphere(0.0, 0.0, 0.0, 1.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
"assemb_plane".to_string(),
|
||||
"Assembly plane".to_string(),
|
||||
|
@ -82,7 +82,7 @@ fn load_low_curv_assemb(assembly: &Assembly) {
|
|||
engine::sphere_with_offset(0.0, 0.0, 1.0, 0.0, 0.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
"side1".to_string(),
|
||||
"Side 1".to_string(),
|
||||
|
@ -90,7 +90,7 @@ fn load_low_curv_assemb(assembly: &Assembly) {
|
|||
engine::sphere_with_offset(1.0, 0.0, 0.0, 1.0, 0.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
"side2".to_string(),
|
||||
"Side 2".to_string(),
|
||||
|
@ -98,7 +98,7 @@ fn load_low_curv_assemb(assembly: &Assembly) {
|
|||
engine::sphere_with_offset(-0.5, a, 0.0, 1.0, 0.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
"side3".to_string(),
|
||||
"Side 3".to_string(),
|
||||
|
@ -106,7 +106,7 @@ fn load_low_curv_assemb(assembly: &Assembly) {
|
|||
engine::sphere_with_offset(-0.5, -a, 0.0, 1.0, 0.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
"corner1".to_string(),
|
||||
"Corner 1".to_string(),
|
||||
|
@ -114,7 +114,7 @@ fn load_low_curv_assemb(assembly: &Assembly) {
|
|||
engine::sphere(-4.0/3.0, 0.0, 0.0, 1.0/3.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
"corner2".to_string(),
|
||||
"Corner 2".to_string(),
|
||||
|
@ -122,7 +122,7 @@ fn load_low_curv_assemb(assembly: &Assembly) {
|
|||
engine::sphere(2.0/3.0, -4.0/3.0 * a, 0.0, 1.0/3.0)
|
||||
)
|
||||
);
|
||||
let _ = assembly.try_insert_element(
|
||||
let _ = assembly.try_insert_sphere(
|
||||
Element::new(
|
||||
String::from("corner3"),
|
||||
String::from("Corner 3"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue