Update nanovdb to 1c306bcaf7e9f7d52525bab716202bd4f7fff5d1

CMakeLists.txt

@@ -56,7 +56,7 @@ check_ext ("Ptex" "ptex/src" 82bd326)
 check_ext ("double-conversion" "double-conversion/cmake" 9a8e518)
 check_ext ("filesystem" "filesystem/filesystem" 4efd2628)
 check_ext ("stb" "stb/tools" 1034f5)
-check_ext ("OpenVDB" "openvdb/nanovdb" d5ea9808f)
+check_ext ("OpenVDB" "openvdb/nanovdb" 1c306bcaf7e)
 check_ext ("zlib" "zlib/doc" 54d591e)
 
 if (NOT CMAKE_BUILD_TYPE MATCHES Debug)

openvdb @ 1c306bca

-Subproject commit e62f7a0bf1e27397223c61ddeaaf57edf111b77f
+Subproject commit 1c306bcaf7e9f7d52525bab716202bd4f7fff5d1

src/pbrt/media.h

@@ -608,7 +608,8 @@ class NanoVDBMediumProvider {
             return SampledSpectrum(0.f);
         nanovdb::Vec3<float> pIndex =
             densityFloatGrid->worldToIndexF(nanovdb::Vec3<float>(p.x, p.y, p.z));
-        Float temp = nanovdb::TrilinearSampler<nanovdb::FloatGrid::TreeType, false>(temperatureFloatGrid->tree())(pIndex);
+        using Sampler = nanovdb::SampleFromVoxels<nanovdb::FloatGrid::TreeType, 1, false>;
+        Float temp = Sampler(temperatureFloatGrid->tree())(pIndex);
         temp = (temp - temperatureCutoff) * temperatureScale;
         if (temp <= 100.f)
             return SampledSpectrum(0.f);
@@ -682,7 +683,8 @@ class NanoVDBMediumProvider {
     SampledSpectrum Density(const Point3f &p, const SampledWavelengths &lambda) const {
         nanovdb::Vec3<float> pIndex =
             densityFloatGrid->worldToIndexF(nanovdb::Vec3<float>(p.x, p.y, p.z));
-        Float density = nanovdb::TrilinearSampler<nanovdb::FloatGrid::TreeType, false>(densityFloatGrid->tree())(pIndex);
+        using Sampler = nanovdb::SampleFromVoxels<nanovdb::FloatGrid::TreeType, 1, false>;
+        Float density = Sampler(densityFloatGrid->tree())(pIndex);
         return SampledSpectrum(density);
     }