Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-21 14:23:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić
2017-12-02 18:15:31 -08:00
parent 90ef8970cc
commit 547d1d2b11
15 changed files with 75 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
examples/common/bounds.cpp
View File

@@ -134,12 +134,12 @@ void toAabb(Aabb& _aabb, const void* _vertices, uint32_t _numVertices, uint32_t
float xx = position[0];
float yy = position[1];
float zz = position[2];
min[0] = bx::fmin(xx, min[0]);
min[1] = bx::fmin(yy, min[1]);
min[2] = bx::fmin(zz, min[2]);
max[0] = bx::fmax(xx, max[0]);
max[1] = bx::fmax(yy, max[1]);
max[2] = bx::fmax(zz, max[2]);
min[0] = bx::min(xx, min[0]);
min[1] = bx::min(yy, min[1]);
min[2] = bx::min(zz, min[2]);
max[0] = bx::max(xx, max[0]);
max[1] = bx::max(yy, max[1]);
max[2] = bx::max(zz, max[2]);
}
_aabb.m_min[0] = min[0];
@@ -170,12 +170,12 @@ void toAabb(Aabb& _aabb, const float* _mtx, const void* _vertices, uint32_t _num
float xx = position[0];
float yy = position[1];
float zz = position[2];
min[0] = bx::fmin(xx, min[0]);
min[1] = bx::fmin(yy, min[1]);
min[2] = bx::fmin(zz, min[2]);
max[0] = bx::fmax(xx, max[0]);
max[1] = bx::fmax(yy, max[1]);
max[2] = bx::fmax(zz, max[2]);
min[0] = bx::min(xx, min[0]);
min[1] = bx::min(yy, min[1]);
min[2] = bx::min(zz, min[2]);
max[0] = bx::max(xx, max[0]);
max[1] = bx::max(yy, max[1]);
max[2] = bx::max(zz, max[2]);
}
_aabb.m_min[0] = min[0];
@@ -300,7 +300,7 @@ void calcMaxBoundingSphere(Sphere& _sphere, const void* _vertices, uint32_t _num
float zz = position[2] - center[2];
float distSq = xx*xx + yy*yy + zz*zz;
maxDistSq = bx::fmax(distSq, maxDistSq);
maxDistSq = bx::max(distSq, maxDistSq);
}
bx::vec3Move(_sphere.m_center, center);
@@ -512,8 +512,8 @@ bool intersect(const Ray& _ray, const Aabb& _aabb, Hit* _hit)
float max[3];
bx::vec3Max(max, t0, t1);
const float tmin = bx::fmax3(min[0], min[1], min[2]);
const float tmax = bx::fmin3(max[0], max[1], max[2]);
const float tmin = bx::max(min[0], min[1], min[2]);
const float tmax = bx::min(max[0], max[1], max[2]);
if (tmax < 0.0f
|| tmin > tmax)