dev/mushroom_generator
2
1 Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

split layers.rs -> layers.rs, translate.rs

Browse Source 
This splits up the types and supporting code for defining layers from
the code for generating layers for a given mushroom.
This commit is contained in:
dongar committed 2024-06-13 11:29:56 -05:00
1 parent e90f330a5e
commit b731b29c96
3 files changed
+94 -91
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/layers.rs
-90
View File
@@ -1,7 +1,5 @@
use stl_io::{self, Vertex};
use crate::mushroom::{CapStyle, Mushroom};
#[derive(Debug, PartialEq, Clone)]
pub struct Layer {
/// Stalk height in millimeters. Zero for default.
@@ -36,91 +34,3 @@ impl Layers {
return max_radius;
}
}
fn stalk_layers(mushroom: &Mushroom, base: &Vertex, _resolution: f32) -> Vec<Layer> {
let stalk_top = Vertex::new([base[0], base[1], base[2] + mushroom.stalk_h]);
return [
Layer {
center: base.clone(),
radius: mushroom.stalk_r,
},
Layer {
center: stalk_top,
radius: mushroom.stalk_r,
},
]
.to_vec();
}
fn cap_layers_cylinder(mushroom: &Mushroom, base: &Vertex) -> Vec<Layer> {
let top = Vertex::new([base[0], base[1], base[2] + mushroom.cap_h]);
return [
Layer {
center: base.clone(),
radius: mushroom.cap_r,
},
Layer {
center: top,
radius: mushroom.cap_r,
},
]
.to_vec();
}
fn cap_layers_dome(mushroom: &Mushroom, base: &Vertex, resolution: f32) -> Vec<Layer> {
let mut result: Vec<Layer> = Vec::with_capacity((mushroom.cap_h / resolution) as usize);
let mut height = 0.0;
loop {
// A = mushroom.cap_h
// B = mushroom.cap_r
// x=B/π * arccos(y/A)
let radius = (mushroom.cap_r / std::f32::consts::PI) * (height / mushroom.cap_h).acos();
result.push(Layer {
center: Vertex::new([base[0], base[1], base[2] + height]),
radius: radius,
});
height += resolution;
if height >= mushroom.cap_h {
break;
}
}
return result;
}
fn cap_layers(mushroom: &Mushroom, base: &Vertex, resolution: f32) -> Vec<Layer> {
match mushroom.cap_style {
CapStyle::Cylinder => cap_layers_cylinder(mushroom, base),
CapStyle::Dome => cap_layers_dome(mushroom, base, resolution),
CapStyle::Pointed => cap_layers_dome(mushroom, base, resolution),
}
}
pub fn mushroom(mushroom: &Mushroom, resolution: f32) -> Layers {
let _vertical_steps = (mushroom.height() / resolution) as u32;
let base = Vertex::new([0.0, 0.0, 0.0]);
// Get layers for the stalk.
let mut stalk_layers = stalk_layers(mushroom, &base, resolution);
// Get layers for the cap.
let cap_base = stalk_layers.last().unwrap().center;
let mut cap_layers = cap_layers(mushroom, &cap_base, resolution);
// The very top of the mushroom is directly above the top layer of the cap (or even with it)
// at the exact height of the total mushroom.
let cap_top = &cap_layers.last().unwrap().center;
let top = Vertex::new([cap_top[0], cap_top[1], base[2] + mushroom.height()]);
// Assemble the final Layers object.
let mut layers: Vec<Layer> = Vec::new();
layers.append(&mut stalk_layers);
layers.append(&mut cap_layers);
return Layers { base, top, layers };
}
src/main.rs
+2 -1
View File
@@ -1,6 +1,7 @@
pub mod layers;
pub mod mushroom;
pub mod render;
pub mod translate;
use self::mushroom::Mushroom;
use clap::Parser;
@@ -17,7 +18,7 @@ fn main() {
// Render the mushroom.
// let mesh = render::cylinder(mushroom.stalk_h, mushroom.stalk_d, 128);
let layers = layers::mushroom(&mushroom, 0.1);
let layers = translate::mushroom(&mushroom, 0.1);
let mesh = render::render(&layers, 0.1);
// Save output to file.
src/translate.rs
+92
View File
@@ -0,0 +1,92 @@
use stl_io::{self, Vertex};
use crate::layers;
use crate::mushroom::{CapStyle, Mushroom};
fn stalk_layers(mushroom: &Mushroom, base: &Vertex, _resolution: f32) -> Vec<layers::Layer> {
let stalk_top = Vertex::new([base[0], base[1], base[2] + mushroom.stalk_h]);
return [
layers::Layer {
center: base.clone(),
radius: mushroom.stalk_r,
},
layers::Layer {
center: stalk_top,
radius: mushroom.stalk_r,
},
]
.to_vec();
}
fn cap_layers_cylinder(mushroom: &Mushroom, base: &Vertex) -> Vec<layers::Layer> {
let top = Vertex::new([base[0], base[1], base[2] + mushroom.cap_h]);
return [
layers::Layer {
center: base.clone(),
radius: mushroom.cap_r,
},
layers::Layer {
center: top,
radius: mushroom.cap_r,
},
]
.to_vec();
}
fn cap_layers_dome(mushroom: &Mushroom, base: &Vertex, resolution: f32) -> Vec<layers::Layer> {
let mut result: Vec<layers::Layer> = Vec::with_capacity((mushroom.cap_h / resolution) as usize);
let mut height = 0.0;
loop {
// A = mushroom.cap_h
// B = mushroom.cap_r
// x=B/π * arccos(y/A)
let radius = (mushroom.cap_r / std::f32::consts::PI) * (height / mushroom.cap_h).acos();
result.push(layers::Layer {
center: Vertex::new([base[0], base[1], base[2] + height]),
radius: radius,
});
height += resolution;
if height >= mushroom.cap_h {
break;
}
}
return result;
}
fn cap_layers(mushroom: &Mushroom, base: &Vertex, resolution: f32) -> Vec<layers::Layer> {
match mushroom.cap_style {
CapStyle::Cylinder => cap_layers_cylinder(mushroom, base),
CapStyle::Dome => cap_layers_dome(mushroom, base, resolution),
CapStyle::Pointed => cap_layers_dome(mushroom, base, resolution),
}
}
pub fn mushroom(mushroom: &Mushroom, resolution: f32) -> layers::Layers {
let _vertical_steps = (mushroom.height() / resolution) as u32;
let base = Vertex::new([0.0, 0.0, 0.0]);
// Get layers for the stalk.
let mut stalk_layers = stalk_layers(mushroom, &base, resolution);
// Get layers for the cap.
let cap_base = stalk_layers.last().unwrap().center;
let mut cap_layers = cap_layers(mushroom, &cap_base, resolution);
// The very top of the mushroom is directly above the top layer of the cap (or even with it)
// at the exact height of the total mushroom.
let cap_top = &cap_layers.last().unwrap().center;
let top = Vertex::new([cap_top[0], cap_top[1], base[2] + mushroom.height()]);
// Assemble the final Layers object.
let mut layers: Vec<layers::Layer> = Vec::new();
layers.append(&mut stalk_layers);
layers.append(&mut cap_layers);
return layers::Layers { base, top, layers };
}