From fdc2d91285cd9548a3c95f1bdfb75c70ccfffff6 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <clyne@bitgloo.com>
Date: Thu, 16 May 2024 08:03:42 -0400
Subject: abstract objects

---
 sphere.h | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'sphere.h')

diff --git a/sphere.h b/sphere.h
index 3cb2c8c..61d6de2 100644
--- a/sphere.h
+++ b/sphere.h
@@ -2,6 +2,7 @@
 #define SPHERE_H
 
 #include "color.h"
+#include "object.h"
 #include "ray.h"
 #include "vec3.h"
 
@@ -9,21 +10,14 @@
 #include <optional>
 #include <tuple>
 
-enum class Material : int {
-    Lambertian = 0,
-    Metal,
-    Dielectric,
-    Undefined
-};
-
-struct Sphere
+struct Sphere : public Object
 {
-    point3 center;
     double radius;
-    Material M;
-    color tint;
 
-    std::pair<color, ray> scatter(const ray& r, double root) const {
+    Sphere(point3 center_, double radius_, Material M_, color tint_):
+        Object(center_, M_, tint_), radius(radius_) {}
+
+    std::pair<color, ray> scatter(const ray& r, double root) const override {
         const auto p = r.at(root);
         auto normal = (p - center) / radius;
 
@@ -52,7 +46,7 @@ struct Sphere
         }
     }
 
-    std::optional<double> hit(const ray& r, double tmin, double tmax) const {
+    std::optional<double> hit(const ray& r, double tmin, double tmax) const override {
         const vec3 oc = center - r.origin();
         const auto a = r.direction().length_squared();
         const auto h = r.direction().dot(oc);
-- 
cgit v1.2.3