Update object_sphere for C++; inherit from Shape

src/object_sphere.cc

@@ -8,6 +8,7 @@
 #include <cassert>
 #include <cmath>
 #include <cstdlib>
+#include <cstdio>
 
 #include "basics.h"
 #include "object.h"
@@ -68,6 +69,7 @@ Sphere::set_radius(float r)
  */
 int
 Sphere::does_intersect(const Ray &ray, float **t)
+    const
 {
     // Origin of the vector in object space.
     Vector3 ray_origin_obj = ray.origin - get_origin();
@@ -148,23 +150,17 @@ sphere_point_lies_on_surface(Object *obj, Vector3 p)
 
 
 /*
- * sphere_compute_normal --
+ * Sphere::compute_normal --
  *
- * Compute the normal for the given Object (which must be a Sphere) at the given point. This point must lie on the
+ * Compute the normal for this Sphere at the given point. If the point does not lie on the surface of the sphere, a zero
- * surface of the object.
+ * vector is returned.
  */
-#if 0
+Vector3
-/* static */ Vector3
+Sphere::compute_normal(const Vector3 &p)
-sphere_compute_normal(Object *obj, Vector3 p)
+    const
 {
-    assert(obj != NULL && object_get_type(obj) == ObjectTypeSphere);
+    // TODO: Make sure the given point is actually on the surface of the sphere.
-
-    // Make sure the given point is actually on the surface of the sphere.
-    if (!sphere_point_lies_on_surface(obj, p)) {
-        return Vector3Zero;
-    }
 
     // The fun thing about sphere is the normal to any point on the sphere is the point itself. Woo!
-    return p;
+    return Vector3::Zero;
 }
-#endif

src/object_sphere.h

@@ -15,6 +15,7 @@
 class Sphere
     : public Shape
 {
+public:
     Sphere();
     Sphere(float r);
     Sphere(Vector3 o, float r);
@@ -22,7 +23,8 @@ class Sphere
     float get_radius();
     void set_radius(float r);
 
-    int does_intersect(const Ray &ray, float **t);
+    int does_intersect(const Ray &ray, float **t) const;
+    Vector3 compute_normal(const Vector3 &p) const;
 private:
     float radius;
 };