YourWishes/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-02-17 03:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix aabb-sphere test (#179)

Browse Source
This commit is contained in:
Recep Aslantas
2021-02-28 23:12:06 +03:00
parent fec396950b
commit 4a308dcd9e
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/cglm/box.h
View File

@@ -228,6 +228,8 @@ glm_aabb_aabb(vec3 box[2], vec3 other[2]) {
* https://github.com/erich666/GraphicsGems/blob/master/gems/BoxSphere.c * https://github.com/erich666/GraphicsGems/blob/master/gems/BoxSphere.c
* Solid Box - Solid Sphere test. * Solid Box - Solid Sphere test.
* *
* Sphere Representation in cglm: [center.x, center.y, center.z, radii]
*
* @param[in] box solid bounding box * @param[in] box solid bounding box
* @param[in] s solid sphere * @param[in] s solid sphere
*/ */
@@ -237,13 +239,13 @@ glm_aabb_sphere(vec3 box[2], vec4 s) {
float dmin; float dmin;
int a, b, c; int a, b, c;
a = s[0] >= box[0][0]; a = (s[0] < box[0][0]) + (s[0] > box[1][0]);
b = s[1] >= box[0][1]; b = (s[1] < box[0][1]) + (s[1] > box[1][1]);
c = s[2] >= box[0][2]; c = (s[2] < box[0][2]) + (s[2] > box[1][2]);
dmin = glm_pow2(s[0] - box[a][0]) dmin = glm_pow2((s[0] - box[!(a - 1)][0]) * (a != 0))
+ glm_pow2(s[1] - box[b][1]) + glm_pow2((s[1] - box[!(b - 1)][1]) * (b != 0))
+ glm_pow2(s[2] - box[c][2]); + glm_pow2((s[2] - box[!(c - 1)][2]) * (c != 0));
return dmin <= glm_pow2(s[3]); return dmin <= glm_pow2(s[3]);
} }