Various fixes to try to get the MSVC2015 build working.

Missing header files.
Hexadecimal floating-point constants converted to decimal (feh).

Issue mmp#32.

Author: mmp

CMakeLists.txt

@@ -17,6 +17,7 @@ ENDIF()
 
 IF(MSVC)
   ADD_DEFINITIONS (/D _CRT_SECURE_NO_WARNINGS)
+  ADD_DEFINITIONS (/D YY_NO_UNISTD_H)
 ENDIF()
 
 FIND_PACKAGE ( Threads )

src/core/imageio.h

@@ -42,6 +42,7 @@
 // core/imageio.h*
 #include "pbrt.h"
 #include "geometry.h"
+#include <cctype>
 
 // ImageIO Declarations
 inline bool HasExtension(const std::string &value, const std::string &ending) {

src/core/lowdiscrepancy.cpp

@@ -450,7 +450,11 @@ Float RadicalInverse(int baseIndex, uint64_t a) {
     switch (baseIndex) {
     case 0:
         // Compute base-2 radical inverse
-        return ReverseBits64(a) * 0x1p-64;
+#ifdef PBRT_IS_MSVC
+      return ReverseBits64(a) * 5.4210108624275222e-20;
+#else
+      return ReverseBits64(a) * 0x1p-64;
+#endif
     case 1:
         return RadicalInverseSpecialized<3>(a);
     case 2:

src/core/lowdiscrepancy.h

@@ -106,7 +106,11 @@ inline uint32_t ReverseMultiplyGenerator(const uint32_t *C, uint32_t a) {
 
 inline Float SampleGeneratorMatrix(const uint32_t *C, uint32_t a,
                                    uint32_t scramble = 0) {
+#ifdef PBRT_IS_MSVC
+    return (ReverseMultiplyGenerator(C, a) ^ scramble) * 2.3283064365386963e-10f);
+#else
     return (ReverseMultiplyGenerator(C, a) ^ scramble) * 0x1p-32f;
+#endif
 }
 
 inline uint32_t GrayCode(uint32_t v) { return (v >> 1) ^ v; }
@@ -115,7 +119,11 @@ inline void GrayCodeSample(const uint32_t *C, uint32_t n, uint32_t scramble,
                            Float *p) {
     uint32_t v = scramble;
     for (uint32_t i = 0; i < n; ++i) {
+#ifdef PBRT_IS_MSVC
+        p[i] = v * 2.3283064365386963e-10f; /* 1/2^32 */
+#else
         p[i] = v * 0x1p-32f; /* 1/2^32 */
+#endif
         v ^= C[31 - CountTrailingZeros(i + 1)];
     }
 }
@@ -124,8 +132,13 @@ inline void GrayCodeSample(const uint32_t *C0, const uint32_t *C1, uint32_t n,
                            const Point2i &scramble, Point2f *p) {
     uint32_t v[2] = {(uint32_t)scramble.x, (uint32_t)scramble.y};
     for (uint32_t i = 0; i < n; ++i) {
+#ifdef PBRT_IS_MSVC
+        p[i].x = v[0] * 2.3283064365386963e-10f;
+        p[i].y = v[1] * 2.3283064365386963e-10f;
+#else
         p[i].x = v[0] * 0x1p-32f;
         p[i].y = v[1] * 0x1p-32f;
+#endif
         v[0] ^= C0[31 - CountTrailingZeros(i + 1)];
         v[1] ^= C1[31 - CountTrailingZeros(i + 1)];
     }
@@ -222,7 +235,11 @@ inline float SobolSampleFloat(int64_t a, int dimension, uint32_t scramble) {
     for (int i = dimension * SobolMatrixSize + SobolMatrixSize - 1; a != 0;
          a >>= 1, --i)
         if (a & 1) v ^= SobolMatrices32[i];
+#ifdef PBRT_IS_MSVC
+    return v * 2.3283064365386963e-10f; /* 1/2^32 */
+#else
     return v * 0x1p-32f; /* 1/2^32 */
+#endif
 }
 
 inline double SobolSampleDouble(int64_t index, int dimension,

src/core/rng.h

@@ -71,7 +71,11 @@ class RNG {
         }
     }
     Float UniformFloat() {
+#ifdef PBRT_IS_MSVC
+        return std::min(OneMinusEpsilon, UniformUInt32() * 2.3283064365386963e-10f);
+#else
         return std::min(OneMinusEpsilon, UniformUInt32() * 0x1p-32f);
+#endif
     }
     template <typename Iterator>
     void Shuffle(Iterator begin, Iterator end) {

src/core/stats.h

@@ -44,6 +44,7 @@
 #include <map>
 #include <chrono>
 #include <string>
+#include <functional>
 
 // Statistics Declarations
 class StatsAccumulator;