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

Some shuffling around from last commit

Browse Source
This commit is contained in:
Chris Hodapp 2020-03-26 14:01:48 -04:00
parent 7a6d29da81
commit 02cfa49bd7
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/examples.rs
View File

@ -26,38 +26,30 @@ fn cube_thing() -> Rule {
geometry::Rotation3::from_axis_angle(z, -qtr).to_homogeneous(), geometry::Rotation3::from_axis_angle(z, -qtr).to_homogeneous(),
]; ];
let rec = move |self_: Rc<Rule>| -> RuleEval { let gen_xform = |rot: &Mat4| -> Mat4 {
let gen_rulestep = |rot: &Mat4| -> Child { (rot *
let m: Mat4 = rot * Matrix4::new_scaling(0.5) *
Matrix4::new_scaling(0.5) * geometry::Translation3::new(6.0, 0.0, 0.0).to_homogeneous())
geometry::Translation3::new(6.0, 0.0, 0.0).to_homogeneous(); };
Child {
rule: self_.clone(),
xf: m,
vmap: vec![],
}
};
let rec = move |self_: Rc<Rule>| -> RuleEval {
let xforms = turns.iter().map(gen_xform);
RuleEval { RuleEval {
geom: prim::cube(), geom: prim::cube(),
final_geom: prim::empty_mesh(), final_geom: prim::empty_mesh(),
children: turns.iter().map(gen_rulestep).collect(), children: xforms.map(move |xf| Child {
rule: self_.clone(),
xf: xf,
vmap: vec![],
}).collect(),
} }
}; };
// I can't really do *mutual* recursion with the above, can I? I'd // I can't really do *mutual* recursion with the above, can I? I'd
// need actual functions for that. // need actual functions for that.
// Also: 'turns' above is a problem. I can't clone it *inside* the // "Constants" outside the closure only work the way I think they
// closure because it doesn't live long enough (it is out of scope // should work if:
// when the closure runs). I can't move it, or Fn becomes
// FnOnce. It doesn't implement Copy, and really can't, because it
// has vectors inside.
//
// (I guess I could use Rc<OpenMesh> instead if I want cheap
// support for Copy. Or... just put prim::cube() right inside.)
//
// what did I learn from this? That "constants" outside the
// closure only work the way I think they should work if:
// - they're actually static // - they're actually static
// - they implement Copy // - they implement Copy
// - the closure can move them // - the closure can move them