matthew
/
vanrijn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace anonymous tuple with tuple struct to improve readability

This commit is contained in:
Matthew Gordon 2020-04-03 23:33:06 -04:00
parent 5fbed4a17f
commit c063ff22a4
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/raycasting/bounding_volume_hierarchy.rs
View File

@ -31,6 +31,8 @@ fn centre<T: Real>(bounds: &BoundingBox<T>) -> Point3<T> {
) )
} }
struct PrimitiveInfo<T: Real>(BoundingBox<T>, Arc<dyn Primitive<T>>);
impl<T: Real> BoundingVolumeHierarchy<T> { impl<T: Real> BoundingVolumeHierarchy<T> {
pub fn build<'a, I>(primitives: I) -> Self pub fn build<'a, I>(primitives: I) -> Self
where where
@ -39,25 +41,25 @@ impl<T: Real> BoundingVolumeHierarchy<T> {
Self::from_node_vec( Self::from_node_vec(
primitives primitives
.into_iter() .into_iter()
.map(|primitive| (primitive.bounding_box(), Arc::clone(primitive))) .map(|primitive| PrimitiveInfo(primitive.bounding_box(), Arc::clone(primitive)))
.collect(), .collect(),
) )
} }
fn from_node_vec(nodes: Vec<(BoundingBox<T>, Arc<dyn Primitive<T>>)>) -> Self { fn from_node_vec(nodes: Vec<PrimitiveInfo<T>>) -> Self {
let overall_bounds = nodes let overall_bounds = nodes
.iter() .iter()
.fold(BoundingBox::empty(), |a, (b, _)| a.union(b)); .fold(BoundingBox::empty(), |a, PrimitiveInfo(b, _)| a.union(b));
let normalizer = Point3Normalizer::new(overall_bounds); let normalizer = Point3Normalizer::new(overall_bounds);
let mut nodes = nodes; let mut nodes = nodes;
nodes.sort_by(|(a, _), (b, _)| { nodes.sort_by(|PrimitiveInfo(a, _), PrimitiveInfo(b, _)| {
morton_order_value_3d(normalizer.normalize(centre(a))) morton_order_value_3d(normalizer.normalize(centre(a)))
.cmp(&morton_order_value_3d(normalizer.normalize(centre(b)))) .cmp(&morton_order_value_3d(normalizer.normalize(centre(b))))
}); });
Self::from_sorted_nodes(nodes.as_slice()) Self::from_sorted_nodes(nodes.as_slice())
} }
fn from_sorted_nodes(nodes: &[(BoundingBox<T>, Arc<dyn Primitive<T>>)]) -> Self { fn from_sorted_nodes(nodes: &[PrimitiveInfo<T>]) -> Self {
if nodes.len() >= 2 { if nodes.len() >= 2 {
let midpoint = nodes.len() / 2; let midpoint = nodes.len() / 2;
let left = Box::new(Self::from_sorted_nodes(&nodes[..midpoint])); let left = Box::new(Self::from_sorted_nodes(&nodes[..midpoint]));
@ -69,7 +71,7 @@ impl<T: Real> BoundingVolumeHierarchy<T> {
right, right,
} }
} else if nodes.len() == 1 { } else if nodes.len() == 1 {
let (bounds, ref primitive) = nodes[0]; let PrimitiveInfo(bounds, ref primitive) = nodes[0];
BoundingVolumeHierarchy::Leaf { BoundingVolumeHierarchy::Leaf {
bounds, bounds,
primitive: Arc::clone(primitive), primitive: Arc::clone(primitive),