Revert tri, ellipse, annulus primitives

This reverts commit b0fbca7b0c6c4e77491b1bbebc6ed5fe939d912e.

Removing these primitives, since we will not be using them. This change
also removes the temporary test scene for quads.

Resolves #292
Resolves #662
Resolves #681
Resolves #756
Resolves #780

Author: hollasch

CHANGELOG.md

@@ -23,6 +23,11 @@ Change Log -- Ray Tracing in One Weekend
   - Change: hittable::bounding_box() signature has changed to always return a value (#859)
   - Fix: Enabled compiler warnings for MSVC, Clang, GNU. Cleaned up warnings as fit (#865)
   - Change: replaced random vector in `isotropic` with `random_unit_vector`
+  - Delete: `box`, `xy_rect`, `yz_rect`, `xz_rect` classes. Now replaced with new `quad` primitive
+    (#292, #780, #681)
+  - Fix: rect hit returning NaNs and infinities. Superseded with new `quad` primitive (#681)
+  - Added: New 2D `quad` primitive of arbitrary orientation (#756)
+  - Added: New `box()` utility function returns `hittable_list` of new `quad` primitives (#780)
 
 ### In One Weekend
   - Added: More commentary about the choice between `double` and `float` (#752)
@@ -35,7 +40,7 @@ Change Log -- Ray Tracing in One Weekend
   - Change: Broad rewrite of time management for moving objects, primarily `camera` and
     `moving_sphere`, but also impacting the API for `hittable::bounding_box()` (#799)
   - Fix: Fixed `bvh_node` constructor definition signature (#872)
-  - Fix: Fixed scaling for final Perlin noise texture (#896). 
+  - Fix: Fixed scaling for final Perlin noise texture (#896).
 
 ### The Rest of Your Life
   - Fix: Added missing functionality for `isotropic` (#664)

src/TheNextWeek/main.cc

@@ -318,56 +318,14 @@ void default_scene(scene& scene_desc) {
 }
 
 
-void quad_test(scene& scene_desc) {
-    scene_desc.image_width       = 400;
-    scene_desc.aspect_ratio      = 1.0;
-    scene_desc.samples_per_pixel = 4;
-    scene_desc.max_depth         = 4;
-
-    scene_desc.cam.aperture = 0.0;
-    scene_desc.cam.vfov     = 20.0;
-    scene_desc.cam.lookfrom = point3(0,0,12);
-    scene_desc.cam.lookat   = point3(0,0,0);
-
-    scene_desc.background   = color(0.90, 0.90, 0.90);
-
-    auto earth_texture = make_shared<image_texture>("earthmap.jpg");
-    auto mat = make_shared<lambertian>(earth_texture);
-
-    shared_ptr<hittable> thing;
-    switch (0) {
-        default:
-        case 0:
-            thing = make_shared<quad>(point3(-2,-1,0), vec3(4,0,0), vec3(0,2,0), mat);
-            break;
-        case 1:
-            scene_desc.cam.vfov = 30.0;
-            scene_desc.cam.lookat = point3(1,0,0);
-            thing = make_shared<quad>(point3(-2,-1,0), vec3(4,0,0), vec3(2,2,0), mat);
-            break;
-        case 2:
-            thing = make_shared<tri>(point3(-2,-1,0), vec3(4,0,0), vec3(0,2,0), mat);
-            break;
-        case 3:
-            thing = make_shared<ellipse>(point3(0,0,0), vec3(2,0,0), vec3(0,1,0), mat);
-            break;
-        case 4:
-            thing = make_shared<annulus>(point3(0,0,0), vec3(2,0,0), vec3(0,1,0), 0.60, mat);
-            break;
-    }
-
-    scene_desc.world.add(thing);
-}
-
-
 int main() {
     scene scene_desc;
 
     scene_desc.background = color(0.70, 0.80, 1.00);
     scene_desc.cam.vup = vec3(0,1,0);
     scene_desc.cam.focus_dist = 10.0;
 
-    switch (100) {
+    switch (0) {
         case 1:  random_spheres(scene_desc);     break;
         case 2:  two_spheres(scene_desc);        break;
         case 3:  earth(scene_desc);              break;
@@ -378,8 +336,6 @@ int main() {
         case 8:  final_scene(scene_desc);        break;
         default:
         case 9:  default_scene(scene_desc);      break;
-
-        case 100: quad_test(scene_desc); break;
     }
 
     scene_desc.render();

src/TheNextWeek/quad.h

@@ -113,70 +113,4 @@ inline shared_ptr<hittable_list> box(const point3& a, const point3& b, shared_pt
 }
 
 
-class tri : public quad {
-  public:
-    tri(const point3& o, const vec3& aa, const vec3& ab, shared_ptr<material> m)
-      : quad(o, aa, ab, m)
-    {}
-
-    virtual bool hit_ab(double a, double b, hit_record& rec) const override {
-        if ((a < 0) || (b < 0) || (a + b > 1))
-            return false;
-
-        rec.u = a;
-        rec.v = b;
-        return true;
-    }
-};
-
-
-class ellipse : public quad {
-  public:
-    ellipse(
-        const point3& center, const vec3& side_A, const vec3& side_B, shared_ptr<material> m
-    ) : quad(center, side_A, side_B, m)
-    {}
-
-    virtual void set_bounding_box() override {
-        bbox = aabb(plane_origin - axis_A - axis_B, plane_origin + axis_A + axis_B).pad();
-    }
-
-    virtual bool hit_ab(double a, double b, hit_record& rec) const override {
-        if ((a*a + b*b) > 1)
-            return false;
-
-        rec.u = a/2 + 0.5;
-        rec.v = b/2 + 0.5;
-        return true;
-    }
-};
-
-
-class annulus : public quad {
-  public:
-    annulus(
-        const point3& center, const vec3& side_A, const vec3& side_B, double _inner,
-        shared_ptr<material> m)
-      : quad(center, side_A, side_B, m), inner(_inner)
-    {}
-
-    virtual void set_bounding_box() override {
-        bbox = aabb(plane_origin - axis_A - axis_B, plane_origin + axis_A + axis_B).pad();
-    }
-
-    virtual bool hit_ab(double a, double b, hit_record& rec) const override {
-        auto center_dist = sqrt(a*a + b*b);
-        if ((center_dist < inner) || (center_dist > 1))
-            return false;
-
-        rec.u = a/2 + 0.5;
-        rec.v = b/2 + 0.5;
-        return true;
-    }
-
-  private:
-    double inner;
-};
-
-
 #endif