Merge pull request #180 from recp/aabb-sphere-fix

fix aabb-sphere test (#179)
fix aabb-sphere test (#179 )
2026-02-17 03:39:05 +00:00 · 2021-03-01 10:48:04 +03:00 · 2021-02-28 23:12:06 +03:00 · 2021-02-22 10:31:06 +03:00 · 2021-02-22 04:46:22 +02:00 · 2021-01-25 20:05:58 +03:00
5 changed files with 19 additions and 16 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ else(CGLM_STATIC)
 endif()

 if(CGLM_USE_C99)
-  set(C_STANDARD 99)
+  set(CMAKE_C_STANDARD 99)
 endif()

 if(MSVC)
@@ -117,6 +117,7 @@ export(TARGETS ${PROJECT_NAME}
 )

 install(EXPORT      ${PROJECT_NAME}
+        FILE        "${PROJECT_NAME}Config.cmake"
        NAMESPACE   ${PROJECT_NAME}::
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/cmake)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})

--- a/include/cglm/affine.h
+++ b/include/cglm/affine.h
@@ -455,7 +455,7 @@ glm_decompose_rs(mat4 m, mat4 r, vec3 s) {
  glm_vec4_scale(r[1], 1.0f/s[1], r[1]);
  glm_vec4_scale(r[2], 1.0f/s[2], r[2]);

-  /* Note from Apple Open Source (asume that the matrix is orthonormal):
+  /* Note from Apple Open Source (assume that the matrix is orthonormal):
     check for a coordinate system flip.  If the determinant
     is -1, then negate the matrix and the scaling factors. */
  glm_vec3_cross(m[0], m[1], v);
--- a/include/cglm/box.h
+++ b/include/cglm/box.h
@@ -228,6 +228,8 @@ glm_aabb_aabb(vec3 box[2], vec3 other[2]) {
 * https://github.com/erich666/GraphicsGems/blob/master/gems/BoxSphere.c
 * Solid Box - Solid Sphere test.
 *
+ * Sphere Representation in cglm: [center.x, center.y, center.z, radii]
+ *
 * @param[in]   box    solid bounding box
 * @param[in]   s      solid sphere
 */
@@ -237,13 +239,13 @@ glm_aabb_sphere(vec3 box[2], vec4 s) {
  float dmin;
  int   a, b, c;

-  a = s[0] >= box[0][0];
-  b = s[1] >= box[0][1];
-  c = s[2] >= box[0][2];
+  a = (s[0] < box[0][0]) + (s[0] > box[1][0]);
+  b = (s[1] < box[0][1]) + (s[1] > box[1][1]);
+  c = (s[2] < box[0][2]) + (s[2] > box[1][2]);

-  dmin  = glm_pow2(s[0] - box[a][0])
-        + glm_pow2(s[1] - box[b][1])
-        + glm_pow2(s[2] - box[c][2]);
+  dmin  = glm_pow2((s[0] - box[!(a - 1)][0]) * (a != 0))
+        + glm_pow2((s[1] - box[!(b - 1)][1]) * (b != 0))
+        + glm_pow2((s[2] - box[!(c - 1)][2]) * (c != 0));

  return dmin <= glm_pow2(s[3]);
 }
--- a/include/cglm/vec3-ext.h
+++ b/include/cglm/vec3-ext.h
@@ -237,9 +237,9 @@ glm_vec3_abs(vec3 v, vec3 dest) {
 CGLM_INLINE
 void
 glm_vec3_fract(vec3 v, vec3 dest) {
-  dest[0] = fminf(v[0] - floorf(v[0]), 0x1.fffffep-1f);
-  dest[1] = fminf(v[1] - floorf(v[1]), 0x1.fffffep-1f);
-  dest[2] = fminf(v[2] - floorf(v[2]), 0x1.fffffep-1f);
+  dest[0] = fminf(v[0] - floorf(v[0]), 0.999999940395355224609375f);
+  dest[1] = fminf(v[1] - floorf(v[1]), 0.999999940395355224609375f);
+  dest[2] = fminf(v[2] - floorf(v[2]), 0.999999940395355224609375f);
 }

 /*!
--- a/include/cglm/vec4-ext.h
+++ b/include/cglm/vec4-ext.h
@@ -268,10 +268,10 @@ glm_vec4_abs(vec4 v, vec4 dest) {
 CGLM_INLINE
 void
 glm_vec4_fract(vec4 v, vec4 dest) {
-  dest[0] = fminf(v[0] - floorf(v[0]), 0x1.fffffep-1f);
-  dest[1] = fminf(v[1] - floorf(v[1]), 0x1.fffffep-1f);
-  dest[2] = fminf(v[2] - floorf(v[2]), 0x1.fffffep-1f);
-  dest[3] = fminf(v[3] - floorf(v[3]), 0x1.fffffep-1f);
+  dest[0] = fminf(v[0] - floorf(v[0]), 0.999999940395355224609375f);
+  dest[1] = fminf(v[1] - floorf(v[1]), 0.999999940395355224609375f);
+  dest[2] = fminf(v[2] - floorf(v[2]), 0.999999940395355224609375f);
+  dest[3] = fminf(v[3] - floorf(v[3]), 0.999999940395355224609375f);
 }

 /*!
Author	SHA1	Message	Date
Recep Aslantas	1b0322e51c	Merge pull request #180 from recp/aabb-sphere-fix fix aabb-sphere test (#179)	2021-03-01 10:48:04 +03:00
Recep Aslantas	4a308dcd9e	fix aabb-sphere test (#179 )	2021-02-28 23:12:06 +03:00
Recep Aslantas	fec396950b	Merge pull request #178 from gaurapanasenko/master Fixed cmake config install path	2021-02-22 10:31:06 +03:00
Yehor Panasenko	981af0565e	Fixed cmake config install path Now you can use library with ```cmake find_package(cglm REQUIRED) target_link_libraries(${PROJECT_NAME} PRIVATE ${CGLM_LIBRARY}) ```	2021-02-22 04:46:22 +02:00
Recep Aslantas	1d215ef5f3	Merge pull request #177 from Winter091/master remove wrong c standard bug	2021-01-25 20:05:58 +03:00
winter091	2b7cfde64f	remove wrong c standard bug	2021-01-25 15:50:18 +03:00
Recep Aslantas	c783c42101	Merge pull request #174 from timgates42/bugfix_typo_assume docs: fix simple typo, asume -> assume	2020-12-12 09:18:09 +03:00
Tim Gates	bddcfedead	docs: fix simple typo, asume -> assume There is a small typo in include/cglm/affine.h. Should read `assume` rather than `asume`.	2020-12-12 12:13:48 +11:00
Recep Aslantas	34e7438271	Merge pull request #172 from SanderMertens/master Replace hex floating point literals	2020-12-04 13:00:07 +03:00
Sander Mertens	485ff6bc46	Replace hex floating point literals	2020-12-01 21:49:35 -08:00