Update from book source. No functional changes.

src/pbrt/base/medium.h

@@ -75,7 +75,7 @@ class RayMajorantIterator
 // Medium Definition
 class Medium
     : public TaggedPointer<  // Medium Types
-          HomogeneousMedium, CloudMedium, GridMedium, RGBGridMedium, NanoVDBMedium
+          HomogeneousMedium, GridMedium, RGBGridMedium, CloudMedium, NanoVDBMedium
 
           > {
   public:

src/pbrt/bxdfs.cpp

@@ -859,16 +859,13 @@ std::string Tensor::ToString() const {
 // MeasuredBxDFData Definition
 struct MeasuredBxDFData {
     // MeasuredBxDFData Public Members
-    using Warp2D3 = PiecewiseLinear2D<3>;
-    Warp2D3 spectra;
     pstd::vector<float> wavelengths;
-    using Warp2D0 = PiecewiseLinear2D<0>;
-    using Warp2D2 = PiecewiseLinear2D<2>;
-    Warp2D0 ndf;
-    Warp2D2 vndf;
-    Warp2D0 sigma;
+    PiecewiseLinear2D<3> spectra;
+    PiecewiseLinear2D<0> ndf;
+    PiecewiseLinear2D<2> vndf;
+    PiecewiseLinear2D<0> sigma;
     bool isotropic;
-    Warp2D2 luminance;
+    PiecewiseLinear2D<2> luminance;
     MeasuredBxDFData(Allocator alloc)
         : ndf(alloc),
           sigma(alloc),
@@ -948,24 +945,24 @@ MeasuredBxDFData *MeasuredBxDFData::Create(const std::string &filename, Allocato
     }
 
     /* Construct NDF interpolant data structure */
-    brdf->ndf = Warp2D0(alloc, (float *)ndf.data.get(), ndf.shape[1], ndf.shape[0], {},
-                        {}, false, false);
+    brdf->ndf = PiecewiseLinear2D<0>(alloc, (float *)ndf.data.get(), ndf.shape[1],
+                                     ndf.shape[0], {}, {}, false, false);
 
     /* Construct projected surface area interpolant data structure */
-    brdf->sigma = Warp2D0(alloc, (float *)sigma.data.get(), sigma.shape[1],
-                          sigma.shape[0], {}, {}, false, false);
+    brdf->sigma = PiecewiseLinear2D<0>(alloc, (float *)sigma.data.get(), sigma.shape[1],
+                                       sigma.shape[0], {}, {}, false, false);
 
     /* Construct VNDF warp data structure */
-    brdf->vndf =
-        Warp2D2(alloc, (float *)vndf.data.get(), vndf.shape[3], vndf.shape[2],
-                {{(int)phi_i.shape[0], (int)theta_i.shape[0]}},
-                {{(const float *)phi_i.data.get(), (const float *)theta_i.data.get()}});
+    brdf->vndf = PiecewiseLinear2D<2>(
+        alloc, (float *)vndf.data.get(), vndf.shape[3], vndf.shape[2],
+        {{(int)phi_i.shape[0], (int)theta_i.shape[0]}},
+        {{(const float *)phi_i.data.get(), (const float *)theta_i.data.get()}});
 
     /* Construct Luminance warp data structure */
-    brdf->luminance =
-        Warp2D2(alloc, (float *)luminance.data.get(), luminance.shape[3],
-                luminance.shape[2], {{(int)phi_i.shape[0], (int)theta_i.shape[0]}},
-                {{(const float *)phi_i.data.get(), (const float *)theta_i.data.get()}});
+    brdf->luminance = PiecewiseLinear2D<2>(
+        alloc, (float *)luminance.data.get(), luminance.shape[3], luminance.shape[2],
+        {{(int)phi_i.shape[0], (int)theta_i.shape[0]}},
+        {{(const float *)phi_i.data.get(), (const float *)theta_i.data.get()}});
 
     /* Copy wavelength information */
     size_t size = wavelengths.shape[0];
@@ -974,12 +971,12 @@ MeasuredBxDFData *MeasuredBxDFData::Create(const std::string &filename, Allocato
         brdf->wavelengths[i] = ((const float *)wavelengths.data.get())[i];
 
     /* Construct spectral interpolant */
-    brdf->spectra =
-        Warp2D3(alloc, (float *)spectra.data.get(), spectra.shape[4], spectra.shape[3],
-                {{(int)phi_i.shape[0], (int)theta_i.shape[0], (int)wavelengths.shape[0]}},
-                {{(const float *)phi_i.data.get(), (const float *)theta_i.data.get(),
-                  (const float *)wavelengths.data.get()}},
-                false, false);
+    brdf->spectra = PiecewiseLinear2D<3>(
+        alloc, (float *)spectra.data.get(), spectra.shape[4], spectra.shape[3],
+        {{(int)phi_i.shape[0], (int)theta_i.shape[0], (int)wavelengths.shape[0]}},
+        {{(const float *)phi_i.data.get(), (const float *)theta_i.data.get(),
+          (const float *)wavelengths.data.get()}},
+        false, false);
 
     measuredBRDFBytes += sizeof(MeasuredBxDFData) + 4 * brdf->wavelengths.size() +
                          brdf->ndf.BytesUsed() + brdf->sigma.BytesUsed() +
@@ -1018,13 +1015,13 @@ SampledSpectrum MeasuredBxDF::f(Vector3f wo, Vector3f wi, TransportMode mode) co
     Float theta_m = SphericalTheta(wm), phi_m = std::atan2(wm.y, wm.x);
     Point2f u_wo(theta2u(theta_o), phi2u(phi_o));
     Point2f u_wm(theta2u(theta_m), phi2u(brdf->isotropic ? (phi_m - phi_o) : phi_m));
-    u_wm.y = u_wm.y - pstd::floor(u_wm.y);
+    u_wm[1] = u_wm[1] - pstd::floor(u_wm[1]);
 
     // Evaluate inverse parameterization $R^{-1}$
     PLSample ui = brdf->vndf.Invert(u_wm, phi_o, theta_o);
 
     // Evaluate spectral 5D interpolant
-    SampledSpectrum fr(0);
+    SampledSpectrum fr;
     for (int i = 0; i < NSpectrumSamples; ++i)
         fr[i] =
             std::max<Float>(0, brdf->spectra.Evaluate(ui.p, phi_o, theta_o, lambda[i]));

src/pbrt/bxdfs.h

@@ -174,14 +174,10 @@ class DielectricBxDF {
 
     PBRT_CPU_GPU
     BxDFFlags Flags() const {
-        if (eta == 1)
-            return BxDFFlags::Transmission |
-                   (mfDistrib.EffectivelySmooth() ? BxDFFlags::Specular
-                                                  : BxDFFlags::Glossy);
-        else
-            return BxDFFlags::Reflection | BxDFFlags::Transmission |
-                   (mfDistrib.EffectivelySmooth() ? BxDFFlags::Specular
-                                                  : BxDFFlags::Glossy);
+        BxDFFlags flags = (eta == 1) ? BxDFFlags::Transmission
+                                     : (BxDFFlags::Reflection | BxDFFlags::Transmission);
+        return flags |
+               (mfDistrib.EffectivelySmooth() ? BxDFFlags::Specular : BxDFFlags::Glossy);
     }
 
     PBRT_CPU_GPU

src/pbrt/cameras.h

@@ -252,7 +252,7 @@ class ProjectiveCamera : public CameraBase {
     std::string BaseToString() const;
 
     ProjectiveCamera(CameraBaseParameters baseParameters,
-                     const Transform &screenFromCamera, const Bounds2f &screenWindow,
+                     const Transform &screenFromCamera, Bounds2f screenWindow,
                      Float lensRadius, Float focalDistance)
         : CameraBase(baseParameters),
           screenFromCamera(screenFromCamera),
@@ -282,10 +282,10 @@ class ProjectiveCamera : public CameraBase {
 class OrthographicCamera : public ProjectiveCamera {
   public:
     // OrthographicCamera Public Methods
-    OrthographicCamera(CameraBaseParameters baseParameters, const Bounds2f &screenWindow,
-                       Float lensRadius, Float focalDistance)
+    OrthographicCamera(CameraBaseParameters baseParameters, Bounds2f screenWindow,
+                       Float lensRadius, Float focalDist)
         : ProjectiveCamera(baseParameters, Orthographic(0, 1), screenWindow, lensRadius,
-                           focalDistance) {
+                           focalDist) {
         // Compute differential changes in origin for orthographic camera rays
         dxCamera = cameraFromRaster(Vector3f(1, 0, 0));
         dyCamera = cameraFromRaster(Vector3f(0, 1, 0));
@@ -340,9 +340,9 @@ class PerspectiveCamera : public ProjectiveCamera {
   public:
     // PerspectiveCamera Public Methods
     PerspectiveCamera(CameraBaseParameters baseParameters, Float fov,
-                      const Bounds2f &screenWindow, Float lensRadius, Float focalDistance)
+                      Bounds2f screenWindow, Float lensRadius, Float focalDist)
         : ProjectiveCamera(baseParameters, Perspective(fov, 1e-2f, 1000.f), screenWindow,
-                           lensRadius, focalDistance) {
+                           lensRadius, focalDist) {
         // Compute differential changes in origin for perspective camera rays
         dxCamera =
             cameraFromRaster(Point3f(1, 0, 0)) - cameraFromRaster(Point3f(0, 0, 0));

src/pbrt/util/math.h

@@ -204,19 +204,13 @@ struct CompensatedFloat {
 
 template <int N>
 class SquareMatrix;
+PBRT_CPU_GPU inline Float SinXOverX(Float x);
 
 // Math Inline Functions
 PBRT_CPU_GPU inline Float Lerp(Float x, Float a, Float b) {
     return (1 - x) * a + x * b;
 }
 
-// http://www.plunk.org/~hatch/rightway.html
-PBRT_CPU_GPU inline Float SinXOverX(Float x) {
-    if (1 + x * x == 1)
-        return 1;
-    return std::sin(x) / x;
-}
-
 template <typename T>
 inline PBRT_CPU_GPU typename std::enable_if_t<std::is_integral<T>::value, T> FMA(T a, T b,
                                                                                  T c) {
@@ -342,6 +336,13 @@ PBRT_CPU_GPU inline constexpr Float EvaluatePolynomial(Float t, C c, Args... cRe
     return FMA(t, EvaluatePolynomial(t, cRemaining...), c);
 }
 
+// http://www.plunk.org/~hatch/rightway.html
+PBRT_CPU_GPU inline Float SinXOverX(Float x) {
+    if (1 + x * x == 1)
+        return 1;
+    return std::sin(x) / x;
+}
+
 PBRT_CPU_GPU inline float SafeASin(float x) {
     DCHECK(x >= -1.0001 && x <= 1.0001);
     return std::asin(Clamp(x, -1, 1));