Finally closed off geometry in 'barbs' example

This commit is contained in:
Chris Hodapp 2020-05-13 12:23:24 -04:00
parent 70463e0dfd
commit a6449a2b94
2 changed files with 11 additions and 17 deletions

View File

@ -72,17 +72,14 @@ pub fn barbs() -> Rule<()> {
); );
let geom = util::parallel_zigzag(next_verts.clone(), b0..b1+1, a0..a1); let geom = util::parallel_zigzag(next_verts.clone(), b0..b1+1, a0..a1);
/*let (vc, faces) = util::connect_convex(&next_verts, true); let final_geom = MeshFunc {
let final_geom = Rc::new(OpenMesh { verts: (0..4).map(|i| VertexUnion::Arg(i)).collect(),
verts: vec![vc], faces: vec![ 0, 2, 1, 0, 3, 2 ],
alias_verts: vec![], };
faces: faces,
});
*/
RuleEval { RuleEval {
geom: Rc::new(geom.transform(&barb_incr)), geom: Rc::new(geom.transform(&barb_incr)),
final_geom: Rc::new(prim::empty_meshfunc()), // TODO final_geom: Rc::new(final_geom), // no transform needed (no vertices)
children: vec![ children: vec![
Child { Child {
rule: self_.clone(), rule: self_.clone(),
@ -118,17 +115,14 @@ pub fn barbs() -> Rule<()> {
verts: next_verts.clone(), verts: next_verts.clone(),
faces: vec![], faces: vec![],
}; };
/* let final_geom = MeshFunc {
let (vc, faces) = util::connect_convex(&next_verts, true); verts: (0..4).map(|i| VertexUnion::Arg(i)).collect(),
let final_geom = Rc::new(MeshFunc { faces: vec![ 0, 2, 1, 0, 3, 2 ],
verts: vec![vc], };
faces: faces,
});
*/
RuleEval { RuleEval {
geom: Rc::new(geom), geom: Rc::new(geom),
final_geom: Rc::new(prim::empty_meshfunc()), // TODO final_geom: Rc::new(final_geom),
children: vec![ children: vec![
Child { Child {
rule: self_.clone(), rule: self_.clone(),

View File

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