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

Fix to_mesh_iter bug

Browse Source
This commit is contained in:
Chris Hodapp 2020-04-05 12:15:29 -04:00
parent e9a6f1f840
commit 8f8bca9c2f
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -2,8 +2,6 @@
## Highest priority: ## Highest priority:
- `to_mesh_iter` has a bug which `ram_horn_twist` exhibits. The bug
is not present in `to_mesh`. Fix this!
- See `automata_scratch/examples.py` and implement some of the tougher - See `automata_scratch/examples.py` and implement some of the tougher
examples. examples.
- `spiral_nested_2` & `spiral_nested_3` (how to compose - `spiral_nested_2` & `spiral_nested_3` (how to compose
@ -38,6 +36,8 @@
- they're actually static - they're actually static
- they implement Copy - they implement Copy
- the closure can move them - the closure can move them
- Use an actual logging framework.
- Migrate tests to... well... actual tests.
## If I'm bored: ## If I'm bored:

15
src/rule.rs
View File

@ -77,14 +77,6 @@ pub struct Child<S> {
impl<S> Rule<S> { impl<S> Rule<S> {
// TODO: Do I want to make 'geom' shared somehow, maybe with Rc? I
// could end up having a lot of identical geometry that need not be
// duplicated until it is transformed into the global space.
//
// This might produce bigger gains if I rewrite to_mesh so that
// rather than repeatedly transforming meshes, it stacks
// transformations and then applies them all at once.
/// Convert this `Rule` to mesh data, recursively (depth first). /// Convert this `Rule` to mesh data, recursively (depth first).
/// `iters_left` sets the maximum recursion depth. This returns /// `iters_left` sets the maximum recursion depth. This returns
/// (geometry, number of rule evaluations). /// (geometry, number of rule evaluations).
@ -229,10 +221,9 @@ impl<S> Rule<S> {
// merged 'new_geom' into, not 'new_geom' directly. To // merged 'new_geom' into, not 'new_geom' directly. To
// account for this, we must shift vmap by the offset that // account for this, we must shift vmap by the offset that
// 'geom.connect' gave us: // 'geom.connect' gave us:
for (offset, child) in offsets.iter().zip(eval.children.iter_mut()) { let off = offsets[0];
child.vmap = child.vmap.iter().map(|n| { for child in eval.children.iter_mut() {
n + offset child.vmap = child.vmap.iter().map(|n| n + off).collect();
}).collect();
} }
// We're done evaluating this rule, so increment 'next'. // We're done evaluating this rule, so increment 'next'.