New Scene struct

The scene is more than just a list of hittables. It's any and all hittables (so the list, yeah), and also the camera(s!) in the world. This doens't compile, however. More work will need to be done to untangle the other things that could previously see these scattered components.
2023-09-23 14:40:34 -07:00
parent 7c43c3fb82
commit 60b4407573
2 changed files with 101 additions and 92 deletions
--- a/src/scene.rs
+++ b/src/scene.rs
@@ -228,85 +228,92 @@ impl Camera {
    }
 }

-pub fn random_scene(srng: &mut SmallRng) -> Hittable {
-    let mat_ground = Material::Lambertian { albedo: Vec3::new(0.5, 0.5, 0.5) };
-    let mut world = Hittable::HittableList { hittables : Vec::<Hittable>::new() };
-    
-    world.push( Hittable::Sphere { center: Vec3::new(0.0, -1000.0, 0.0), radius: 1000.0, material: mat_ground });
-    
-    let distrib_zero_one = Uniform::new(0.0, 1.0);
-    for a in -11..11 {
-        for b in -11..11 {
-            let choose_mat = srng.sample(distrib_zero_one);
-            let center = Vec3 {
-                x: a as f32 + 0.9 * srng.sample(distrib_zero_one),
-                y: 0.2,
-                z: b as f32 + 0.9 * srng.sample(distrib_zero_one),
-            };
-            if (center - Vec3::new(4.0, 0.2, 0.0)).length() > 0.9 {

-                if choose_mat < 0.8 {
-                    // diffuse
-                    let albedo = Vec3::rand(srng, distrib_zero_one) * Vec3::rand(srng, distrib_zero_one);
-                    let sphere_material = Material::Lambertian { albedo };
-                    world.push(
-                        Hittable::Sphere {
-                            center,
-                            radius: 0.2,
-                            material: sphere_material,
-                        }
-                    );
-                } else if choose_mat < 0.95 {
-                    // metal
-                    let distr_albedo = Uniform::new(0.5, 1.0);
-                    let distr_fuzz = Uniform::new(0.0, 0.5);
-
-                    let albedo = Vec3::rand(srng, distr_albedo);
-                    let fuzz = srng.sample(distr_fuzz);
-                    let material = Material::Metal { albedo, fuzz };
-                    world.push(
-                        Hittable::Sphere {
-                            center,
-                            radius: 0.2,
-                            material: material,
-                        }
-                    );
-                } else {
-                    // glass
-                    let material = Material::Dielectric { index_refraction: 1.5 };
-                    world.push(
-                        Hittable::Sphere{
-                            center,
-                            radius: 0.2,
-                            material: material,
-                        }
-                    );
+pub struct Scene {
+    pub camera: Camera,
+    pub world: Hittable,
+}

+impl Scene {
+    pub fn random_world(srng: &mut SmallRng) -> Hittable {
+        let mat_ground = Material::Lambertian { albedo: Vec3::new(0.5, 0.5, 0.5) };
+        let mut world = Hittable::HittableList { hittables : Vec::<Hittable>::new() };
+        
+        world.push( Hittable::Sphere { center: Vec3::new(0.0, -1000.0, 0.0), radius: 1000.0, material: mat_ground });
+        
+        let distrib_zero_one = Uniform::new(0.0, 1.0);
+        for a in -11..11 {
+            for b in -11..11 {
+                let choose_mat = srng.sample(distrib_zero_one);
+                let center = Vec3 {
+                    x: a as f32 + 0.9 * srng.sample(distrib_zero_one),
+                    y: 0.2,
+                    z: b as f32 + 0.9 * srng.sample(distrib_zero_one),
                };
+                if (center - Vec3::new(4.0, 0.2, 0.0)).length() > 0.9 {
+
+                    if choose_mat < 0.8 {
+                        // diffuse
+                        let albedo = Vec3::rand(srng, distrib_zero_one) * Vec3::rand(srng, distrib_zero_one);
+                        let sphere_material = Material::Lambertian { albedo };
+                        world.push(
+                            Hittable::Sphere {
+                                center,
+                                radius: 0.2,
+                                material: sphere_material,
+                            }
+                        );
+                    } else if choose_mat < 0.95 {
+                        // metal
+                        let distr_albedo = Uniform::new(0.5, 1.0);
+                        let distr_fuzz = Uniform::new(0.0, 0.5);
+
+                        let albedo = Vec3::rand(srng, distr_albedo);
+                        let fuzz = srng.sample(distr_fuzz);
+                        let material = Material::Metal { albedo, fuzz };
+                        world.push(
+                            Hittable::Sphere {
+                                center,
+                                radius: 0.2,
+                                material: material,
+                            }
+                        );
+                    } else {
+                        // glass
+                        let material = Material::Dielectric { index_refraction: 1.5 };
+                        world.push(
+                            Hittable::Sphere{
+                                center,
+                                radius: 0.2,
+                                material: material,
+                            }
+                        );
+
+                    };
+                }
            }
        }
+
+        let material1 = Material::Dielectric { index_refraction: 1.5 };
+        world.push( Hittable::Sphere{
+            center: Vec3::new(0.0, 1.0, 0.0),
+            radius: 1.0,
+            material: material1
+        });
+
+        let material2 = Material::Lambertian { albedo: Vec3::new(0.4, 0.2, 0.1) };
+        world.push( Hittable::Sphere {
+            center: Vec3::new(-4.0, 1.0, 0.0),
+            radius: 1.0,
+            material: material2
+        });
+
+        let material3 = Material::Metal { albedo: Vec3::new(0.7, 0.6, 0.5), fuzz: 0.0 };
+        world.push( Hittable::Sphere {
+            center: Vec3::new(4.0, 1.0, 0.0),
+            radius: 1.0,
+            material: material3
+        });
+        world
    }
-
-    let material1 = Material::Dielectric { index_refraction: 1.5 };
-    world.push( Hittable::Sphere{
-        center: Vec3::new(0.0, 1.0, 0.0),
-        radius: 1.0,
-        material: material1
-    });
-
-    let material2 = Material::Lambertian { albedo: Vec3::new(0.4, 0.2, 0.1) };
-    world.push( Hittable::Sphere {
-        center: Vec3::new(-4.0, 1.0, 0.0),
-        radius: 1.0,
-        material: material2
-    });
-
-    let material3 = Material::Metal { albedo: Vec3::new(0.7, 0.6, 0.5), fuzz: 0.0 };
-    world.push( Hittable::Sphere {
-        center: Vec3::new(4.0, 1.0, 0.0),
-        radius: 1.0,
-        material: material3
-    });
-
-    return world;
-}
+}