mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix fast-math kd-tree building problem on windows

metadata
Wenzel Jakob 2010-10-19 19:19:12 +02:00
parent 7a319e6cc4
commit f531af3e2d
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/mitsuba/render/gkdtree.h
View File

@ -430,6 +430,10 @@ private:
size_t m_bufferSize; size_t m_bufferSize;
}; };
#if defined(WIN32)
#pragma float_control(precise, on)
#endif
/** /**
* \brief SAH KD-tree acceleration data structure for fast ray-object * \brief SAH KD-tree acceleration data structure for fast ray-object
* intersection computations. * intersection computations.
@ -2694,7 +2698,7 @@ protected:
/* Floating-point arithmetic.. - use both absolute and relative /* Floating-point arithmetic.. - use both absolute and relative
epsilons when looking for intersections in the subinterval */ epsilons when looking for intersections in the subinterval */
#if defined(SINGLE_PRECISION) #if defined(SINGLE_PRECISION)
const Float eps = 1e-3; const Float eps = 1e-3f;
#else #else
const Float eps = 1e-5; const Float eps = 1e-5;
#endif #endif
@ -2825,7 +2829,7 @@ protected:
} }
#if defined(SINGLE_PRECISION) #if defined(SINGLE_PRECISION)
const Float eps = 1e-3; const Float eps = 1e-3f;
#else #else
const Float eps = 1e-5; const Float eps = 1e-5;
#endif #endif
@ -3082,9 +3086,9 @@ template <typename Derived> void GenericKDTree<Derived>::findCosts(
Point p2 = bsphere.center + squareToSphere(sample2) * bsphere.radius; Point p2 = bsphere.center + squareToSphere(sample2) * bsphere.radius;
Ray ray(p1, normalize(p2-p1)); Ray ray(p1, normalize(p2-p1));
Float mint, maxt, t; Float mint, maxt, t;
if (ray.mint > mint) mint = ray.mint;
if (ray.maxt < maxt) maxt = ray.maxt;
if (m_aabb.rayIntersect(ray, mint, maxt)) { if (m_aabb.rayIntersect(ray, mint, maxt)) {
if (ray.mint > mint) mint = ray.mint;
if (ray.maxt < maxt) maxt = ray.maxt;
if (EXPECT_TAKEN(maxt > mint)) { if (EXPECT_TAKEN(maxt > mint)) {
boost::tuple<bool, uint32_t, uint32_t, uint64_t> statistics = boost::tuple<bool, uint32_t, uint32_t, uint64_t> statistics =
rayIntersectHavranCollectStatistics(ray, mint, maxt, t, temp); rayIntersectHavranCollectStatistics(ray, mint, maxt, t, temp);
@ -3159,6 +3163,11 @@ template <typename Derived> const Class *GenericKDTree<Derived>::getClass() cons
return m_theClass; return m_theClass;
} }
#if defined(WIN32)
#pragma float_control(precise, off)
#endif
MTS_NAMESPACE_END MTS_NAMESPACE_END
#endif /* __KDTREE_GENERIC_H */ #endif /* __KDTREE_GENERIC_H */