hodapp/prosha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Progress with barbs example

Browse Source
This commit is contained in:
Chris Hodapp 2020-05-12 19:02:22 -04:00
parent 19988a0b35
commit 5641a9c96e
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/examples.rs
View File

@ -61,9 +61,15 @@ pub fn barbs() -> Rule<()> {
let incr: Transform = Transform::new(). let incr: Transform = Transform::new().
translate(0.0, 0.0, 1.0). translate(0.0, 0.0, 1.0).
rotate(&Vector3::z_axis(), 0.1). rotate(&Vector3::z_axis(), 0.15).
rotate(&Vector3::x_axis(), 0.1).
scale(0.95); scale(0.95);
let incr2: Transform = Transform::new().
translate(0.0, 0.0, 1.5).
rotate(&Vector3::y_axis(), -0.2).
scale(0.8);
let b = base_verts.clone(); let b = base_verts.clone();
let barb = move |self_: Rc<Rule<()>>| -> RuleEval<()> { let barb = move |self_: Rc<Rule<()>>| -> RuleEval<()> {
let mut next_verts = b.clone(); let mut next_verts = b.clone();
@ -71,8 +77,7 @@ pub fn barbs() -> Rule<()> {
&mut (0..4).map(|i| VertexUnion::Arg(i)).collect() &mut (0..4).map(|i| VertexUnion::Arg(i)).collect()
); );
let geom = util::parallel_zigzag(next_verts.clone(), b0..b1+1, a0..a1);
let geom = util::parallel_zigzag(next_verts.clone(), b0..b1, a0..a1);
/*let (vc, faces) = util::connect_convex(&next_verts, true); /*let (vc, faces) = util::connect_convex(&next_verts, true);
let final_geom = Rc::new(OpenMesh { let final_geom = Rc::new(OpenMesh {
verts: vec![vc], verts: vec![vc],
@ -87,13 +92,15 @@ pub fn barbs() -> Rule<()> {
children: vec![ children: vec![
Child { Child {
rule: self_.clone(), rule: self_.clone(),
xf: incr, xf: incr2,
vmap: (0..n).collect(), vmap: (0..n).collect(),
} }
] ]
} }
}; };
let barb_ = Rc::new(barb);
let b = base_verts.clone(); let b = base_verts.clone();
let main = move |self_: Rc<Rule<()>>| -> RuleEval<()> { let main = move |self_: Rc<Rule<()>>| -> RuleEval<()> {
let mut next_verts = b.clone(); let mut next_verts = b.clone();
@ -119,8 +126,16 @@ pub fn barbs() -> Rule<()> {
rule: self_.clone(), rule: self_.clone(),
xf: incr, xf: incr,
vmap: (0..n).collect(), vmap: (0..n).collect(),
} },
] Child {
rule: Rc::new(Rule { eval: barb_.clone(), ctxt: () }),
xf: Transform::new().
translate(0.0, 0.0, 1.4).
rotate(&Vector3::y_axis(), -std::f32::consts::FRAC_PI_2).
scale(0.9),
vmap: vec![b0, b0 + 1, a0 + 1, a0],
},
],
} }
}; };

2
src/lib.rs
View File

@ -74,7 +74,7 @@ mod tests {
*/ */
#[test] #[test]
fn barbs() { run_test(examples::barbs(), 20, "barbs", false); } fn barbs() { run_test(examples::barbs(), 60, "barbs", false); }
/* /*
#[test] #[test]