AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Qualified use of abs() as it was causing problems on OS X

Browse Source
This commit is contained in:
David Williams 2014-07-30 23:43:26 +02:00
parent e1cdf0ca06
commit 37757da98c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/PolyVoxCore/include/PolyVoxCore/MarchingCubesSurfaceExtractor.h
View File

@ -74,14 +74,14 @@ namespace PolyVox
float vz = normal.getZ(); float vz = normal.getZ();
// Project the sphere onto the octahedron, and then onto the xy plane // Project the sphere onto the octahedron, and then onto the xy plane
float px = vx * (1.0f / (abs(vx) + abs(vy) + abs(vz))); float px = vx * (1.0f / (std::abs(vx) + std::abs(vy) + std::abs(vz)));
float py = vy * (1.0f / (abs(vx) + abs(vy) + abs(vz))); float py = vy * (1.0f / (std::abs(vx) + std::abs(vy) + std::abs(vz)));
// Reflect the folds of the lower hemisphere over the diagonals. // Reflect the folds of the lower hemisphere over the diagonals.
if (vz <= 0.0f) if (vz <= 0.0f)
{ {
float refx = ((1.0f - abs(py)) * (px >= 0.0f ? +1.0f : -1.0f)); float refx = ((1.0f - std::abs(py)) * (px >= 0.0f ? +1.0f : -1.0f));
float refy = ((1.0f - abs(px)) * (py >= 0.0f ? +1.0f : -1.0f)); float refy = ((1.0f - std::abs(px)) * (py >= 0.0f ? +1.0f : -1.0f));
px = refx; px = refx;
py = refy; py = refy;
} }
@ -120,12 +120,12 @@ namespace PolyVox
// of Listing 2 of http://jcgt.org/published/0003/02/01/ // of Listing 2 of http://jcgt.org/published/0003/02/01/
float vx = ex; float vx = ex;
float vy = ey; float vy = ey;
float vz = 1.0f - abs(ex) - abs(ey); float vz = 1.0f - std::abs(ex) - std::abs(ey);
if (vz < 0.0f) if (vz < 0.0f)
{ {
float refX = ((1.0f - abs(vy)) * (vx >= 0.0f ? +1.0f : -1.0f)); float refX = ((1.0f - std::abs(vy)) * (vx >= 0.0f ? +1.0f : -1.0f));
float refY = ((1.0f - abs(vx)) * (vy >= 0.0f ? +1.0f : -1.0f)); float refY = ((1.0f - std::abs(vx)) * (vy >= 0.0f ? +1.0f : -1.0f));
vx = refX; vx = refX;
vy = refY; vy = refY;
} }