From 0dd60837873e8d3d7b41275f7460425726096cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 2 Sep 2017 19:30:40 -0700 Subject: [PATCH] Cleanup. --- examples/02-metaballs/metaballs.cpp | 6 +++--- examples/23-vectordisplay/vectordisplay.cpp | 4 ++-- examples/common/bounds.cpp | 4 ++-- examples/common/debugdraw/debugdraw.cpp | 4 ++-- tools/texturev/texturev.cpp | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/02-metaballs/metaballs.cpp b/examples/02-metaballs/metaballs.cpp index 34d224133..c14c3df0f 100644 --- a/examples/02-metaballs/metaballs.cpp +++ b/examples/02-metaballs/metaballs.cpp @@ -375,7 +375,7 @@ float vertLerp(float* __restrict _result, float _iso, uint32_t _idx0, float _v0, const float* __restrict edge0 = s_cube[_idx0]; const float* __restrict edge1 = s_cube[_idx1]; - if (bx::fabsolute(_iso-_v1) < 0.00001f) + if (bx::fabs(_iso-_v1) < 0.00001f) { _result[0] = edge1[0]; _result[1] = edge1[1]; @@ -383,8 +383,8 @@ float vertLerp(float* __restrict _result, float _iso, uint32_t _idx0, float _v0, return 1.0f; } - if (bx::fabsolute(_iso-_v0) < 0.00001f - || bx::fabsolute(_v0-_v1) < 0.00001f) + if (bx::fabs(_iso-_v0) < 0.00001f + || bx::fabs(_v0-_v1) < 0.00001f) { _result[0] = edge0[0]; _result[1] = edge0[1]; diff --git a/examples/23-vectordisplay/vectordisplay.cpp b/examples/23-vectordisplay/vectordisplay.cpp index 4019cd2d3..c9b677619 100644 --- a/examples/23-vectordisplay/vectordisplay.cpp +++ b/examples/23-vectordisplay/vectordisplay.cpp @@ -343,8 +343,8 @@ void VectorDisplay::endDraw() Line* lines = (Line*)alloca(nlines * sizeof(Line) ); float t = effectiveThickness(); - int first_last_same = bx::fabsolute(m_pendingPoints[0].x - m_pendingPoints[m_pendingPoints.size() - 1].x) < 0.1 - && bx::fabsolute(m_pendingPoints[0].y - m_pendingPoints[m_pendingPoints.size() - 1].y) < 0.1; + int first_last_same = bx::fabs(m_pendingPoints[0].x - m_pendingPoints[m_pendingPoints.size() - 1].x) < 0.1 + && bx::fabs(m_pendingPoints[0].y - m_pendingPoints[m_pendingPoints.size() - 1].y) < 0.1; // compute basics for (size_t i = 1; i < m_pendingPoints.size(); i++) diff --git a/examples/common/bounds.cpp b/examples/common/bounds.cpp index 4bff1a47f..7ba949146 100644 --- a/examples/common/bounds.cpp +++ b/examples/common/bounds.cpp @@ -543,7 +543,7 @@ bool intersect(const Ray& _ray, const Cylinder& _cylinder, bool _capsule, Inters bx::vec3Cross(normal, _ray.m_dir, axis); const float len = bx::vec3Norm(normal, normal); - const float dist = bx::fabsolute(bx::vec3Dot(rc, normal) ); + const float dist = bx::fabs(bx::vec3Dot(rc, normal) ); if (dist > _cylinder.m_radius) { @@ -559,7 +559,7 @@ bool intersect(const Ray& _ray, const Cylinder& _cylinder, bool _capsule, Inters const float rsq = bx::fsq(_cylinder.m_radius); const float ddoto = bx::vec3Dot(_ray.m_dir, vo); - const float ss = t0 - bx::fabsolute(bx::fsqrt(rsq - bx::fsq(dist) ) / ddoto); + const float ss = t0 - bx::fabs(bx::fsqrt(rsq - bx::fsq(dist) ) / ddoto); float point[3]; getPointAt(point, _ray, ss); diff --git a/examples/common/debugdraw/debugdraw.cpp b/examples/common/debugdraw/debugdraw.cpp index 06d35683c..7295e5d18 100644 --- a/examples/common/debugdraw/debugdraw.cpp +++ b/examples/common/debugdraw/debugdraw.cpp @@ -137,8 +137,8 @@ static void squircle(float* _out, float _angle) { float sa = bx::fsin(_angle); float ca = bx::fcos(_angle); - _out[0] = bx::fsqrt(bx::fabsolute(sa) ) * bx::fsign(sa); - _out[1] = bx::fsqrt(bx::fabsolute(ca) ) * bx::fsign(ca); + _out[0] = bx::fsqrt(bx::fabs(sa) ) * bx::fsign(sa); + _out[1] = bx::fsqrt(bx::fabs(ca) ) * bx::fsign(ca); } uint32_t genSphere(uint8_t _subdiv0, void* _pos0 = NULL, uint16_t _posStride0 = 0, void* _normals0 = NULL, uint16_t _normalStride0 = 0) diff --git a/tools/texturev/texturev.cpp b/tools/texturev/texturev.cpp index efd9ee31e..4f62b49e7 100644 --- a/tools/texturev/texturev.cpp +++ b/tools/texturev/texturev.cpp @@ -1600,8 +1600,8 @@ int _main_(int _argc, char** _argv) float wh[3] = { float(view.m_info.width), float(view.m_info.height), 0.0f }; float result[3]; bx::vec3MulMtx(result, wh, orientation); - result[0] = bx::fround(bx::fabsolute(result[0]) ); - result[1] = bx::fround(bx::fabsolute(result[1]) ); + result[0] = bx::fround(bx::fabs(result[0]) ); + result[1] = bx::fround(bx::fabs(result[1]) ); scale.set(bx::fmin(float(width) / result[0] , float(height) / result[1])