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

Rename morton_order_value() to morton_order_value_3d()

This commit is contained in:
Matthew Gordon 2020-02-19 08:02:36 -05:00
parent 3c813c4526
commit 87b2f2835a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/raycasting/bounding_volume_hierarchy.rs
View File

@ -1,6 +1,6 @@
use super::{BoundingBox, Primitive}; use super::{BoundingBox, Primitive};
use crate::util::morton::morton_order_value; use crate::util::morton::morton_order_value_3d;
use crate::util::normalizer::Point3Normalizer; use crate::util::normalizer::Point3Normalizer;
use crate::Real; use crate::Real;
@ -51,8 +51,8 @@ impl<T: Real> BoundingVolumeHierarchy<T> {
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(|(a, _), (b, _)| {
morton_order_value(normalizer.normalize(centre(a))) morton_order_value_3d(normalizer.normalize(centre(a)))
.cmp(&morton_order_value(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())
} }

2
src/util/morton.rs
View File

@ -13,7 +13,7 @@ fn spread_bits(v: u32) -> u32 {
result result
} }
pub fn morton_order_value<T: Real>(p: Point3<T>) -> u32 { pub fn morton_order_value_3d<T: Real>(p: Point3<T>) -> u32 {
let x = p.x.normalized_to_u32(10); let x = p.x.normalized_to_u32(10);
let y = p.y.normalized_to_u32(10); let y = p.y.normalized_to_u32(10);
let z = p.z.normalized_to_u32(10); let z = p.z.normalized_to_u32(10);