Move all v4-alpha content into alpha/ directory

Author: hollasch

.gitignore

@@ -2,3 +2,6 @@
 
 /build/
 /*.ppm
+
+/alpha/build
+/alpha/*.ppm

CHANGELOG.md

@@ -1,58 +1,6 @@
 Change Log -- Ray Tracing in One Weekend
 ====================================================================================================
 
-# v4.0.0 (pending)
-
-### Common
-  - Change: Introduce new `interval` class used throughout codebase (#777)
-  - Change: Use `class` instead of `struct` throughout for simpler C++ (#781)
-  - Change: `hittable:hit()` methods use new interval class for ray-t parameter
-  - Change: Class public/private access labels get two-space indents (#782)
-  - Change: `interval::clamp()` replaces standalone `clamp` utility function
-  - Added: `rtw_image` class for easier image data loading, better search (#807)
-  - Change: New `scene` class manages image settings, camera, geometry, and lights (#699)
-  - Change: Cleaned up multiple cases where the `inline` keyword was unnecessary, and reorganized
-    some global utility functions as either private static, or in better locations.
-  - Fix: Remove redundant `virtual` keyword for methods with `override` (#805)
-  - Change: `aabb` class constructor treats two params as extreme points in any orientation (#733)
-  - Change: `aabb` class uses intervals for each axis (#796)
-  - Change: Moved all class method definitions inside class definition (#802)
-  - Fix: CSS fix for cases where code listing overflow; change to fit content (#826)
-  - Change: `hittable` member variable `ptr` renamed to `object`
-  - Change: general rename of `mat_ptr` to `mat` (material)
-  - 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)
-  - Fix: Add `\mathit` to italic math variables to fix slight kerning issues in equations (#839)
-  - Change: Use std::clog instead of std::cerr to log scanline progress (#935)
-  - Fix: Added missing commas for the Bib(La)TeX entries.
-
-### In One Weekend
-  - Added: More commentary about the choice between `double` and `float` (#752)
-  - Added: Software context around the shadow acne listing
-
-### The Next Week
-  - Change: Rearranged the texture-mapping presentation. The three types (solid, spatial, image) are
-    now sequenced in that order, and the checker texture presented more explicitly as an
-    illustration of a spatial texture.
-  - 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).
-  - Added: Add listing to use new `bvh_node` class in the `random_spheres` scene (#715).
-
-### The Rest of Your Life
-  - Fix: Added missing functionality for `isotropic` (#664)
-  - Fix: Variable `direction` was used without being defined in listing 11 (#831)
-  - Fix: Added missing functionality for `isotropic` (#664)
-
-
-----------------------------------------------------------------------------------------------------
 # v3.2.3 (2020-12-07)
 
 ### Common

CMakeLists.txt

@@ -6,118 +6,78 @@
 
 cmake_minimum_required ( VERSION 3.1.0...3.27.0 )
 
-project ( RTWeekend LANGUAGES CXX )
+project ( RTWeekend
+  VERSION 3.0.0
+  LANGUAGES CXX
+)
 
-# Set to C++11
-set ( CMAKE_CXX_STANDARD          11 )
-set ( CMAKE_CXX_STANDARD_REQUIRED ON )
-set ( CMAKE_CXX_EXTENSIONS        OFF )
+# Set to c++11
+set ( CMAKE_CXX_STANDARD 11 )
 
 # Source
-
-set ( EXTERNAL
-  src/external/stb_image.h
+set ( COMMON_ALL
+  src/common/rtweekend.h
+  src/common/camera.h
+  src/common/ray.h
+  src/common/vec3.h
 )
 
 set ( SOURCE_ONE_WEEKEND
-  src/external/stb_image.h
-
-  src/InOneWeekend/camera.h
-  src/InOneWeekend/color.h
+  ${COMMON_ALL}
   src/InOneWeekend/hittable.h
   src/InOneWeekend/hittable_list.h
-  src/InOneWeekend/interval.h
   src/InOneWeekend/material.h
-  src/InOneWeekend/ray.h
-  src/InOneWeekend/rtw_stb_image.h
-  src/InOneWeekend/rtweekend.h
   src/InOneWeekend/sphere.h
-  src/InOneWeekend/vec3.h
-
   src/InOneWeekend/main.cc
 )
 
 set ( SOURCE_NEXT_WEEK
-  src/external/stb_image.h
-
-  src/TheNextWeek/aabb.h
+  ${COMMON_ALL}
+  src/common/aabb.h
+  src/common/external/stb_image.h
+  src/common/perlin.h
+  src/common/rtw_stb_image.h
+  src/common/texture.h
+  src/TheNextWeek/aarect.h
+  src/TheNextWeek/box.h
   src/TheNextWeek/bvh.h
-  src/TheNextWeek/camera.h
-  src/TheNextWeek/color.h
   src/TheNextWeek/constant_medium.h
   src/TheNextWeek/hittable.h
   src/TheNextWeek/hittable_list.h
-  src/TheNextWeek/interval.h
   src/TheNextWeek/material.h
-  src/TheNextWeek/perlin.h
-  src/TheNextWeek/quad.h
-  src/TheNextWeek/ray.h
-  src/TheNextWeek/rtw_stb_image.h
-  src/TheNextWeek/rtweekend.h
+  src/TheNextWeek/moving_sphere.h
   src/TheNextWeek/sphere.h
-  src/TheNextWeek/texture.h
-  src/TheNextWeek/vec3.h
-
   src/TheNextWeek/main.cc
 )
 
 set ( SOURCE_REST_OF_YOUR_LIFE
-  src/external/stb_image.h
-
-  src/TheRestOfYourLife/aabb.h
-  src/TheRestOfYourLife/camera.h
-  src/TheRestOfYourLife/color.h
-  src/TheRestOfYourLife/constant_medium.h
+  ${COMMON_ALL}
+  src/common/aabb.h
+  src/common/external/stb_image.h
+  src/common/perlin.h
+  src/common/rtw_stb_image.h
+  src/common/texture.h
+  src/TheRestOfYourLife/aarect.h
+  src/TheRestOfYourLife/box.h
+  src/TheRestOfYourLife/bvh.h
   src/TheRestOfYourLife/hittable.h
   src/TheRestOfYourLife/hittable_list.h
-  src/TheRestOfYourLife/interval.h
   src/TheRestOfYourLife/material.h
   src/TheRestOfYourLife/onb.h
   src/TheRestOfYourLife/pdf.h
-  src/TheRestOfYourLife/perlin.h
-  src/TheRestOfYourLife/quad.h
-  src/TheRestOfYourLife/ray.h
-  src/TheRestOfYourLife/rtw_stb_image.h
-  src/TheRestOfYourLife/rtweekend.h
   src/TheRestOfYourLife/sphere.h
-  src/TheRestOfYourLife/texture.h
-  src/TheRestOfYourLife/vec3.h
-
   src/TheRestOfYourLife/main.cc
 )
 
-include_directories(src)
-
-# Specific compiler flags below. We're not going to add options for all possible compilers, but if
-# you're new to CMake (like we are), the following may be a helpful example if you're using a
-# different compiler or want to set different compiler options.
-
-message (STATUS "Compiler ID: " ${CMAKE_CXX_COMPILER_ID})
-
-if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_compile_options("/we 4265") # Class has virtual functions, but its non-trivial destructor is not virtual
-    add_compile_options("/w3 5038") # Data member will be initialized after [other] data member
-    add_compile_options("/we 5204") # Class has virtual functions, but its trivial destructor is not virtual
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    add_compile_options(-Wnon-virtual-dtor) # Class has virtual functions, but its destructor is not virtual
-    add_compile_options(-Wreorder) # Data member will be initialized after [other] data member
-    add_compile_options(-Wmaybe-uninitialized) # Variable improperly initialized
-    add_compile_options(-Wunused-variable) # Variable is defined but unused
-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    add_compile_options(-Wnon-virtual-dtor) # Class has virtual functions, but its destructor is not virtual
-    add_compile_options(-Wreorder) # Data member will be initialized after [other] data member
-    add_compile_options(-Wsometimes-uninitialized) # Variable improperly initialized
-    add_compile_options(-Wunused-variable) # Variable is defined but unused
-endif()
-
 # Executables
-add_executable(inOneWeekend      ${EXTERNAL} ${SOURCE_ONE_WEEKEND})
-add_executable(theNextWeek       ${EXTERNAL} ${SOURCE_NEXT_WEEK})
-add_executable(theRestOfYourLife ${EXTERNAL} ${SOURCE_REST_OF_YOUR_LIFE})
-add_executable(cos_cubed         src/TheRestOfYourLife/cos_cubed.cc         )
-add_executable(cos_density       src/TheRestOfYourLife/cos_density.cc       )
-add_executable(integrate_x_sq    src/TheRestOfYourLife/integrate_x_sq.cc    )
-add_executable(pi                src/TheRestOfYourLife/pi.cc                )
-add_executable(estimate_halfway  src/TheRestOfYourLife/estimate_halfway.cc  )
-add_executable(sphere_importance src/TheRestOfYourLife/sphere_importance.cc )
-add_executable(sphere_plot       src/TheRestOfYourLife/sphere_plot.cc       )
+add_executable(inOneWeekend      ${SOURCE_ONE_WEEKEND})
+add_executable(theNextWeek       ${SOURCE_NEXT_WEEK})
+add_executable(theRestOfYourLife ${SOURCE_REST_OF_YOUR_LIFE})
+add_executable(cos_cubed         src/TheRestOfYourLife/cos_cubed.cc         ${COMMON_ALL})
+add_executable(cos_density       src/TheRestOfYourLife/cos_density.cc       ${COMMON_ALL})
+add_executable(integrate_x_sq    src/TheRestOfYourLife/integrate_x_sq.cc    ${COMMON_ALL})
+add_executable(pi                src/TheRestOfYourLife/pi.cc                ${COMMON_ALL})
+add_executable(sphere_importance src/TheRestOfYourLife/sphere_importance.cc ${COMMON_ALL})
+add_executable(sphere_plot       src/TheRestOfYourLife/sphere_plot.cc       ${COMMON_ALL})
+
+include_directories(src/common)