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

Fix NestedSpiral & add to README.md

Browse Source
This commit is contained in:
Chris Hodapp 2021-01-22 17:44:23 -05:00
parent 04aca1b3d0
commit 5bee3c8aa3
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -171,3 +171,9 @@ See `examples::Sierpinski` & "sierpinski" test in `lib.rs`.
This looks cooler with some randomness added and 3D printed. This looks cooler with some randomness added and 3D printed.
![sierpinski](./images/sierpinski_preview.png) ![sierpinski](./images/sierpinski_preview.png)
### Triple Nested Spiral
See `examples::NestedSpiral` & "nested_spiral" test in `lib.rs`.
![nested_spiral](./images/nested_spiral.jpg)

BIN
images/nested_spiral.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 MiB

20
src/examples.rs
View File

@ -378,18 +378,18 @@ pub struct NestedSpiral {
} }
impl NestedSpiral { impl NestedSpiral {
// TODO: Fix winding order being wrong on 'body' vertices (not end caps)
pub fn new() -> NestedSpiral { pub fn new() -> NestedSpiral {
let d = vertex(0.5, 0.0, 0.5);
// 'Base' vertices, used throughout: // 'Base' vertices, used throughout:
let mut base = vec![ let mut base = vec![
(vertex(-0.5, 0.0, -0.5)), (vertex(0.0, 0.0, 0.0)),
(vertex(0.5, 0.0, -0.5)), (vertex(1.0, 0.0, 0.0)),
(vertex(0.5, 0.0, 0.5)), (vertex(1.0, 0.0, 1.0)),
(vertex(-0.5, 0.0, 0.5)), (vertex(0.0, 0.0, 1.0)),
]; ];
base = id().scale(0.3).transform(&base); base = id().scale(0.3).translate(-0.5, 0.0, -0.5).transform(&base);
// TODO: Check winding order
// TODO: Subdivide vertices down (Python version goes from 4
// verts up to 16 by subdividing twice)
let rot_y = |ang| id().rotate(&Vector3::y_axis(), ang); let rot_y = |ang| id().rotate(&Vector3::y_axis(), ang);
let rot_y_and_trans = |ang, dx| rot_y(ang).translate(dx, 0.0, 0.0); let rot_y_and_trans = |ang, dx| rot_y(ang).translate(dx, 0.0, 0.0);
@ -450,7 +450,7 @@ impl NestedSpiral {
// Generate geometry: // Generate geometry:
let g = global.transform(&self.base); let g = global.transform(&self.base);
let (n0, n1) = self.verts.append_indexed(g); let (n0, n1) = self.verts.append_indexed(g);
self.faces.append(&mut util::parallel_zigzag2(b.to_vec(), n0..n1)); self.faces.append(&mut util::parallel_zigzag2(n0..n1, b.to_vec()));
// Increment the individual transformations: // Increment the individual transformations:
let xforms_next: Vec<Transform> = xforms.iter() let xforms_next: Vec<Transform> = xforms.iter()
@ -468,7 +468,7 @@ impl NestedSpiral {
for seed in seeds { for seed in seeds {
let global = seed.iter().fold(id(), |acc, m| acc * (*m)); let global = seed.iter().fold(id(), |acc, m| acc * (*m));
let g = global.transform(&self.base); let g = global.transform(&self.base);
let (n0, n1) = self.verts.append_indexed(g); let (n0, _) = self.verts.append_indexed(g);
self.faces.extend_from_slice(&[n0, n0+1, n0+2, n0, n0+2, n0+3]); self.faces.extend_from_slice(&[n0, n0+1, n0+2, n0, n0+2, n0+3]);
self.iter(0, [n0, n0 + 1, n0 + 2, n0 + 3], &seed); self.iter(0, [n0, n0 + 1, n0 + 2, n0 + 3], &seed);