diff --git a/scenes/texture.json b/scenes/texture.json index 751cb12..8f631ab 100644 --- a/scenes/texture.json +++ b/scenes/texture.json @@ -6,27 +6,28 @@ "camera": { "anti_alias_rate": 2, "fov": 50.0, - "look_from": [-2, 4, 5], - "look_at": [-2, 0.0, 0.0], - "vup": [0.0, 1.0, 0.0], "defocus_angle": 0, "focus_dist": 15.68 + "look_from": [-3, 4, 10], + "look_at": [-3, 0.0, -10.0], + "vup": [0.0, 1.0, 0.0], + "defocus_angle": 0, + "focus_dist": 15.68 }, "materials": [ { "type": "lambertian", "albedo": [0.2, 0.2, 0.2], "prob": 0.8 }, - { "type": "lambertian", "albedo": [0.9, 0.9, 0.0], "prob": 1.0, "fuzz": 0.1 }, - { "type": "dielectric", "refraction_index": 1.5}, - { "type": "normal"}, {"type": "texture", "source": "./textures/earthmap1k.png"}, - {"type": "texture", "source": "./textures/yellow.png"} + {"type": "texture", "source": "./textures/bluegrid.png"} ], "objects": [ - { "type": "sphere", "center": [0.0, 0.0, -1.2], "radius": 0.9, "material": 5}, - { "type": "sphere", "center": [-2, 0, -1], "radius": 0.8, "material": 4}, - { "type": "triangle", "p1": [0, 0, -4], "p2": [4, 0, -4], "p3": [2, 2, -4], "material": 5}, - { "type": "triangle", "p1": [-2, 2, -4], "p2": [2, 2, -4], "p3": [0, 4, -4], "material": 4}, + { "type": "sphere", "center": [0.0, 0.0, -1.2], "radius": 0.9, "material": 2}, + { "type": "sphere", "center": [-2, 0, -1], "radius": 0.8, "material": 1}, + { "type": "triangle", "p1": [0, 0, -4], "p2": [4, 0, -4], "p3": [2, 2, -4], "material": 2}, + { "type": "triangle", "p1": [-2, 2, -4], "p2": [2, 2, -4], "p3": [0, 4, -4], "material": 1}, { "type": "quad", "p1": [-20, -1, -20], "p2": [20, -1, -20], "p3": [20, 20, -20], "p4": [-20, 20, -20], "material": 0}, { "type": "quad", "p1": [-20, -1, 20], "p2": [-20, -1, -20], "p3": [-20, 20, -20], "p4": [-20, 20, 20], "material": 0}, { "type": "quad", "p1": [-20, -1, 20], "p2": [20, -1, 20], "p3": [20, -1, -20], "p4": [-20, -1, -20], "material": 0}, - { "type": "quad", "p1": [20, -1, 20], "p2": [20, -1, -20], "p3": [20, 20, -20], "p4": [20, 20, 20], "material": 0} + { "type": "quad", "p1": [20, -1, 20], "p2": [20, -1, -20], "p3": [20, 20, -20], "p4": [20, 20, 20], "material": 0}, + { "type": "quad", "p1": [-4, 3, -4], "p2": [-1, 3, -4], "p3": [-1, 6, -4], "p4": [-4, 6, -4], "material": 1}, + { "type": "quad", "p1": [-8, 3, -4], "p2": [-5, 3, -4], "p3": [-5, 6, -4], "p4": [-8, 6, -4], "material": 2} ] } diff --git a/src/objects/quad.rs b/src/objects/quad.rs index 88f6ab9..fe77756 100644 --- a/src/objects/quad.rs +++ b/src/objects/quad.rs @@ -57,9 +57,10 @@ impl Debug for Quad { } } +// FIXME: texture mapping does not work properly for quads impl Hittable for Quad { fn hit(&self, r: &Ray) -> Option { - Quad::hit( + let hit = Quad::hit( self.p1, self.p2, self.p3, @@ -67,7 +68,9 @@ impl Hittable for Quad { self.material.clone(), self.normal, r, - ) + ); + + return hit } fn to_uv(&self, point: &Vec3) -> Vec3 {