From 87b2f2835ae4c0aa131793a57a23439c31ecf7e1 Mon Sep 17 00:00:00 2001 From: Matthew Gordon Date: Wed, 19 Feb 2020 08:02:36 -0500 Subject: [PATCH] Rename morton_order_value() to morton_order_value_3d() --- src/raycasting/bounding_volume_hierarchy.rs | 6 +++--- src/util/morton.rs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/raycasting/bounding_volume_hierarchy.rs b/src/raycasting/bounding_volume_hierarchy.rs index 10469ad..39b86ef 100644 --- a/src/raycasting/bounding_volume_hierarchy.rs +++ b/src/raycasting/bounding_volume_hierarchy.rs @@ -1,6 +1,6 @@ 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::Real; @@ -51,8 +51,8 @@ impl BoundingVolumeHierarchy { let normalizer = Point3Normalizer::new(overall_bounds); let mut nodes = nodes; nodes.sort_by(|(a, _), (b, _)| { - morton_order_value(normalizer.normalize(centre(a))) - .cmp(&morton_order_value(normalizer.normalize(centre(b)))) + morton_order_value_3d(normalizer.normalize(centre(a))) + .cmp(&morton_order_value_3d(normalizer.normalize(centre(b)))) }); Self::from_sorted_nodes(nodes.as_slice()) } diff --git a/src/util/morton.rs b/src/util/morton.rs index 6f8c5ea..7e730d8 100644 --- a/src/util/morton.rs +++ b/src/util/morton.rs @@ -13,7 +13,7 @@ fn spread_bits(v: u32) -> u32 { result } -pub fn morton_order_value(p: Point3) -> u32 { +pub fn morton_order_value_3d(p: Point3) -> u32 { let x = p.x.normalized_to_u32(10); let y = p.y.normalized_to_u32(10); let z = p.z.normalized_to_u32(10);