diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-08-21 16:56:11 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-08-23 19:56:41 +0200 |
| commit | 7fe7f30521503559dc8aee9f3127e11111f8ccc4 (patch) | |
| tree | f4a75f563e89957d43cef93253bfc300ecf57339 /src/server/collision/BoundingIntervalHierarchy.cpp | |
| parent | f5f9df0483fbf847eb9ee4e6ec4ecc6cf66d3a47 (diff) | |
Core/Misc: Fix some -Wconversion warnings
Diffstat (limited to 'src/server/collision/BoundingIntervalHierarchy.cpp')
| -rw-r--r-- | src/server/collision/BoundingIntervalHierarchy.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp index d90009c03f3..c933fc8f4e3 100644 --- a/src/server/collision/BoundingIntervalHierarchy.cpp +++ b/src/server/collision/BoundingIntervalHierarchy.cpp @@ -72,11 +72,11 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat axis = d.primaryAxis(); split = 0.5f * (gridBox.lo[axis] + gridBox.hi[axis]); // partition L/R subsets - clipL = -G3D::inf(); - clipR = G3D::inf(); + clipL = -G3D::finf(); + clipR = G3D::finf(); rightOrig = right; // save this for later - float nodeL = G3D::inf(); - float nodeR = -G3D::inf(); + float nodeL = G3D::finf(); + float nodeR = -G3D::finf(); for (int i = left; i <= right;) { int obj = dat.indices[i]; @@ -187,13 +187,13 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat stats.updateInner(); tempTree[nodeIndex + 0] = (prevAxis << 30) | nextIndex; tempTree[nodeIndex + 1] = floatToRawIntBits(prevClip); - tempTree[nodeIndex + 2] = floatToRawIntBits(G3D::inf()); + tempTree[nodeIndex + 2] = floatToRawIntBits(G3D::finf()); } else { // create a node with a right child // write leaf node stats.updateInner(); tempTree[nodeIndex + 0] = (prevAxis << 30) | (nextIndex - 3); - tempTree[nodeIndex + 1] = floatToRawIntBits(-G3D::inf()); + tempTree[nodeIndex + 1] = floatToRawIntBits(-G3D::finf()); tempTree[nodeIndex + 2] = floatToRawIntBits(prevClip); } // count stats for the unused leaf |