diff options
Diffstat (limited to 'src/hittable')
| -rw-r--r-- | src/hittable/aabb.rs | 4 | ||||
| -rw-r--r-- | src/hittable/bvh_node.rs | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/hittable/aabb.rs b/src/hittable/aabb.rs index 5c5c9fa..92b8fa1 100644 --- a/src/hittable/aabb.rs +++ b/src/hittable/aabb.rs @@ -16,9 +16,7 @@ impl AABB { let mut t0 = (self.minimum.get(a).unwrap() - ray.origin.get(a).unwrap()) * inv_d; let mut t1 = (self.maximum.get(a).unwrap() - ray.origin.get(a).unwrap()) * inv_d; if inv_d < 0.0 { - // TODO: destructuring assignments are unstable :( - //(t0, t1) = (t1, t0); - std::mem::swap(&mut t0, &mut t1); + (t0, t1) = (t1, t0); } t_min = if t0 > t_min { t0 } else { t_min }; t_max = if t1 < t_max { t1 } else { t_max }; diff --git a/src/hittable/bvh_node.rs b/src/hittable/bvh_node.rs index 405ab5b..64fa3a1 100644 --- a/src/hittable/bvh_node.rs +++ b/src/hittable/bvh_node.rs @@ -102,13 +102,11 @@ impl BVHNode { .bounding_box(0.0, 0.0) .expect("No bounding box in bvh_node constructor!"); - // TODO: total_cmp is unstable :( box_a .minimum .get(axis as usize) .unwrap() - .partial_cmp(box_b.minimum.get(axis as usize).unwrap()) - .unwrap() + .total_cmp(box_b.minimum.get(axis as usize).unwrap()) } } |