Rust 2024!

Author: Peter Aarestad

Cargo.lock

@@ -2,22 +2,22 @@
 name = "ray-tracer"
 version = "1.7.3"
 authors = ["Peter Aarestad <aarestad@gmail.com>"]
-edition = "2021"
+edition = "2024"
 description = "Trace some rays"
 default-run = "ray-tracer"
 
 [dependencies]
-rand = "0.8.5"
-rand_distr = "0.4.3"
-image = "0.25.1"
+rand = "0.9.0"
+rand_distr = "0.5.1"
+image = "0.25.5"
 threadpool = "1.8.1"
 num_cpus = "1.16.0"
 args = "2.2.0"
 getopts = "0.2.21"
 array-init = "2.1.0"
-nalgebra = "0.33.0"
-parry3d = "0.17.0"
+nalgebra = "0.33.2"
 approx = "0.5.1"
+#parry3d = "0.18.0"
 
 [[bin]]
 name = "ppm_test"

Cargo.toml

@@ -59,7 +59,7 @@ impl Camera {
             direction: self.lower_left_corner + self.horizontal * s + self.vertical * t
                 - self.origin
                 - offset,
-            exposure_time: rand::thread_rng().gen_range(self.exposure_time.clone()),
+            exposure_time: rand::rng().random_range(self.exposure_time.clone()),
         }
     }
 }

src/camera.rs

@@ -1,4 +1,4 @@
-use crate::data::color64::{Color64, BLACK};
+use crate::data::color64::{BLACK, Color64};
 use crate::data::point64::Point64;
 use crate::hittables::Hittable;
 use std::ops::Add;

src/data/ray.rs

@@ -9,10 +9,10 @@ use crate::util::EPSILON;
 pub type Vector = Vector3<f64>;
 
 pub fn random_in_unit_sphere() -> Vector {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
-    let theta = TAU * rng.gen::<f64>();
-    let phi = (1.0 - 2.0 * rng.gen::<f64>()).acos();
+    let theta = TAU * rng.random::<f64>();
+    let phi = (1.0 - 2.0 * rng.random::<f64>()).acos();
     let x = phi.sin() * theta.cos();
     let y = phi.sin() * theta.sin();
     let z = phi.cos();
@@ -21,18 +21,18 @@ pub fn random_in_unit_sphere() -> Vector {
 }
 
 pub fn random_in_unit_disk() -> Vector {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
-    let sqrt_r: f64 = rng.gen::<f64>().sqrt();
-    let theta: f64 = rng.gen_range(0.0..TAU);
+    let sqrt_r: f64 = rng.random::<f64>().sqrt();
+    let theta: f64 = rng.random_range(0.0..TAU);
 
     Vector3::new(sqrt_r * theta.cos(), sqrt_r * theta.sin(), 0.)
 }
 
 pub fn rand_range(min: f64, max: f64) -> Vector {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
 
-    let dist = Uniform::new_inclusive(min, max);
+    let dist = Uniform::new_inclusive(min, max).unwrap();
 
     Vector3::new(rng.sample(dist), rng.sample(dist), rng.sample(dist))
 }

src/data/vector3.rs

@@ -2,7 +2,7 @@ use crate::data::ray::Ray;
 use crate::hittables::axis_aligned_bounding_box::AxisAlignedBoundingBox;
 use crate::hittables::bvh_comparators::BOX_COMPARATORS;
 use crate::hittables::{HitRecord, Hittable};
-use rand::prelude::SliceRandom;
+use rand::prelude::IndexedRandom;
 use std::sync::Arc;
 
 pub struct BoundedVolumeHierarchy {
@@ -39,7 +39,7 @@ impl BoundedVolumeHierarchy {
         time0: f64,
         time1: f64,
     ) -> Arc<dyn Hittable> {
-        let comparator = BOX_COMPARATORS.choose(&mut rand::thread_rng()).unwrap();
+        let comparator = BOX_COMPARATORS.choose(&mut rand::rng()).unwrap();
 
         let left_child: Arc<dyn Hittable>;
         let right_child: Arc<dyn Hittable>;

src/hittables/bounded_volume_hierarchy.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use super::{axis_aligned_bounding_box::AxisAlignedBoundingBox, HitRecord, Hittable};
+use super::{HitRecord, Hittable, axis_aligned_bounding_box::AxisAlignedBoundingBox};
 use crate::{
     data::{point64::Point64, ray::Ray, vector3::Vector},
     materials::Material,

src/hittables/triangle.rs

@@ -1,5 +1,5 @@
-use std::sync::mpsc::channel;
 use std::sync::Arc;
+use std::sync::mpsc::channel;
 
 use image::{ImageResult, RgbImage};
 use rand::Rng;
@@ -60,10 +60,10 @@ fn main() -> ImageResult<()> {
 
             pool.execute(move || {
                 let mut pixel_color = Color64::new(0., 0., 0.);
-                let mut rng = rand::thread_rng();
+                let mut rng = rand::rng();
 
                 for _ in 0..world.samples_per_pixel {
-                    let rands: [f64; 2] = rng.gen();
+                    let rands: [f64; 2] = rng.random();
 
                     let u = (x as f64 + rands[0]) / (world.image_width - 1) as f64;
                     let v = (y as f64 + rands[1]) / (world.image_height - 1) as f64;

src/main.rs

@@ -1,4 +1,4 @@
-use crate::data::color64::{Color64, BLACK};
+use crate::data::color64::{BLACK, Color64};
 use crate::data::point64::Point64;
 use crate::data::ray::Ray;
 use crate::hittables::HitRecord;

src/materials.rs

@@ -3,8 +3,8 @@ use crate::data::point64::Point64;
 use crate::data::ray::Ray;
 use crate::hittables::HitRecord;
 use crate::materials::{Material, ScatterRecord};
-use crate::textures::solid_color::SolidColor;
 use crate::textures::Texture;
+use crate::textures::solid_color::SolidColor;
 use std::sync::Arc;
 
 pub struct DiffuseLight {