From 4193adbbff4a5b633f59f88367fe1b74aec7789b Mon Sep 17 00:00:00 2001 From: Keuin Date: Fri, 15 Apr 2022 12:32:42 +0800 Subject: Code Refactor: - Add material class. - Move diffuse routine into separate material classes. --- main_simple_scanner.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'main_simple_scanner.cpp') diff --git a/main_simple_scanner.cpp b/main_simple_scanner.cpp index 806fcfe..f0a2099 100644 --- a/main_simple_scanner.cpp +++ b/main_simple_scanner.cpp @@ -14,6 +14,7 @@ #include "hitlist.h" #include "sphere.h" #include "aa.h" +#include "material.h" #define DEMO_BALL @@ -35,11 +36,12 @@ void generate_image(uint16_t image_width, uint16_t image_height, double viewport } else { vp = new aa_viewport{viewport_width, viewport_width / r, vec3d{0, 0, -focal_length}, samples}; } + material_diffuse_lambertian materi{0.5}; hitlist world; world.add_object(std::make_shared( vec3d{0, -100.5, -1}, - 100)); // the earth - world.add_object(std::make_shared(vec3d{0, 0, sphere_z}, sphere_r)); + 100, materi)); // the earth + world.add_object(std::make_shared(vec3d{0, 0, sphere_z}, sphere_r, materi)); timer tm; std::cerr << "Rendering..." << std::endl; tm.start_measure(); -- cgit v1.2.3