Merge pull request #270 from suicvne/cglm-pc-fix-cmake

Switch CMAKE_BINARY_DIR to CMAKE_CURRENT_BINARY_DIR for cmake.pc

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.8.2)
 project(cglm
-  VERSION 0.8.7
+  VERSION 0.8.8
   HOMEPAGE_URL https://github.com/recp/cglm
   DESCRIPTION "OpenGL Mathematics (glm) for C"
   LANGUAGES C
@@ -159,5 +159,5 @@ install(EXPORT      ${PROJECT_NAME}
 
 configure_file(cglm.pc.in cglm.pc @ONLY)
 
-install(FILES ${CMAKE_BINARY_DIR}/cglm.pc
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cglm.pc
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

cglm.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
   # Description
   s.name         = "cglm"
-  s.version      = "0.8.4"
+  s.version      = "0.8.7"
   s.summary      = "📽 Highly Optimized Graphics Math (glm) for C"
   s.description  = <<-DESC
 cglm is math library for graphics programming for C. See the documentation or README for all features.

configure.ac

@@ -7,7 +7,7 @@
 #*****************************************************************************
 
 AC_PREREQ([2.69])
-AC_INIT([cglm], [0.8.7], [info@recp.me])
+AC_INIT([cglm], [0.8.8], [info@recp.me])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects serial-tests])
 
 # Don't use the default cflags (-O2 -g), we set ours manually in Makefile.am.

docs/source/conf.py

@@ -62,9 +62,9 @@ author = u'Recep Aslantas'
 # built documents.
 #
 # The short X.Y version.
-version = u'0.8.7'
+version = u'0.8.8'
 # The full version, including alpha/beta/rc tags.
-release = u'0.8.7'
+release = u'0.8.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/ivec2.rst

@@ -25,6 +25,7 @@ Functions:
 #. :c:func:`glm_ivec2_maxv`
 #. :c:func:`glm_ivec2_minv`
 #. :c:func:`glm_ivec2_clamp`
+#. :c:func:`glm_ivec2_abs`
 
 Functions documentation
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -161,3 +162,11 @@ Functions documentation
       | *[in, out]* **v**      vector
       | *[in]*      **minVal** minimum value
       | *[in]*      **maxVal** maximum value
+
+.. c:function:: void glm_ivec2_abs(ivec2 v, ivec2 dest)
+
+    absolute value of each vector item
+
+    Parameters:
+      | *[in]*   **v**     vector
+      | *[out]*  **dest**  destination vector

docs/source/ivec3.rst

@@ -25,6 +25,7 @@ Functions:
 #. :c:func:`glm_ivec3_maxv`
 #. :c:func:`glm_ivec3_minv`
 #. :c:func:`glm_ivec3_clamp`
+#. :c:func:`glm_ivec2_abs`
 
 Functions documentation
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -161,3 +162,11 @@ Functions documentation
       | *[in, out]* **v**      vector
       | *[in]*      **minVal** minimum value
       | *[in]*      **maxVal** maximum value
+
+.. c:function:: void glm_ivec3_abs(ivec3 v, ivec3 dest)
+
+    absolute value of each vector item
+
+    Parameters:
+      | *[in]*   **v**     vector
+      | *[out]*  **dest**  destination vector

docs/source/ivec4.rst

@@ -25,6 +25,7 @@ Functions:
 #. :c:func:`glm_ivec4_maxv`
 #. :c:func:`glm_ivec4_minv`
 #. :c:func:`glm_ivec4_clamp`
+#. :c:func:`glm_ivec4_abs`
 
 Functions documentation
 ~~~~~~~~~~~~~~~~~~~~~~~
@@ -161,3 +162,11 @@ Functions documentation
       | *[in, out]* **v**      vector
       | *[in]*      **minVal** minimum value
       | *[in]*      **maxVal** maximum value
+
+.. c:function:: void glm_ivec4_abs(ivec4 v, ivec4 dest)
+
+    absolute value of each vector item
+
+    Parameters:
+      | *[in]*   **v**     vector
+      | *[out]*  **dest**  destination vector

docs/source/vec2-ext.rst

@@ -26,6 +26,7 @@ Functions:
 #. :c:func:`glm_vec2_isinf`
 #. :c:func:`glm_vec2_isvalid`
 #. :c:func:`glm_vec2_sign`
+#. :c:func:`glm_vec2_abs`
 #. :c:func:`glm_vec2_sqrt`
 
 Functions documentation
@@ -125,6 +126,14 @@ Functions documentation
       | *[in]*   **v**     vector
       | *[out]*  **dest**  sign vector (only keeps signs as -1, 0, -1)
 
+.. c:function:: void glm_vec2_abs(vec2 v, vec2 dest)
+
+    absolute value of each vector item
+
+    Parameters:
+      | *[in]*   **v**     vector
+      | *[out]*  **dest**  destination vector
+
 .. c:function:: void glm_vec2_sqrt(vec2 v, vec2 dest)
 
     square root of each vector item

docs/source/vec3-ext.rst

@@ -27,6 +27,7 @@ Functions:
 #. :c:func:`glm_vec3_isinf`
 #. :c:func:`glm_vec3_isvalid`
 #. :c:func:`glm_vec3_sign`
+#. :c:func:`glm_vec3_abs`
 #. :c:func:`glm_vec3_sqrt`
 
 Functions documentation
@@ -134,6 +135,14 @@ Functions documentation
       | *[in]*   **v**     vector
       | *[out]*  **dest**  sign vector (only keeps signs as -1, 0, -1)
 
+.. c:function:: void glm_vec3_abs(vec3 v, vec3 dest)
+
+    absolute value of each vector item
+
+    Parameters:
+      | *[in]*   **v**     vector
+      | *[out]*  **dest**  destination vector
+
 .. c:function:: void glm_vec3_sqrt(vec3 v, vec3 dest)
 
     square root of each vector item

include/cglm/call/ivec2.h

@@ -73,6 +73,10 @@ CGLM_EXPORT
 void
 glmc_ivec2_clamp(ivec2 v, int minVal, int maxVal);
 
+CGLM_EXPORT
+void
+glmc_ivec2_abs(ivec2 v, ivec2 dest);
+
 #ifdef __cplusplus
 }
 #endif

include/cglm/call/ivec3.h

@@ -73,6 +73,10 @@ CGLM_EXPORT
 void
 glmc_ivec3_clamp(ivec3 v, int minVal, int maxVal);
 
+CGLM_EXPORT
+void
+glmc_ivec3_abs(ivec3 v, ivec3 dest);
+
 #ifdef __cplusplus
 }
 #endif

include/cglm/call/ivec4.h

@@ -73,6 +73,10 @@ CGLM_EXPORT
 void
 glmc_ivec4_clamp(ivec4 v, int minVal, int maxVal);
 
+CGLM_EXPORT
+void
+glmc_ivec4_abs(ivec4 v, ivec4 dest);
+
 #ifdef __cplusplus
 }
 #endif

include/cglm/call/vec2.h

@@ -145,6 +145,10 @@ CGLM_EXPORT
 void
 glmc_vec2_clamp(vec2 v, float minval, float maxval);
 
+CGLM_EXPORT
+void
+glmc_vec2_abs(vec2 v, vec2 dest);
+
 CGLM_EXPORT
 void
 glmc_vec2_lerp(vec2 from, vec2 to, float t, vec2 dest);

include/cglm/common.h

@@ -18,6 +18,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <math.h>
 #include <float.h>
 #include <stdbool.h>

include/cglm/ivec2.h

@@ -22,6 +22,7 @@ FUNCTIONS:
   CGLM_INLINE void glm_ivec2_maxv(ivec2 a, ivec2 b, ivec2 dest)
   CGLM_INLINE void glm_ivec2_minv(ivec2 a, ivec2 b, ivec2 dest)
   CGLM_INLINE void glm_ivec2_clamp(ivec2 v, int minVal, int maxVal)
+  CGLM_INLINE void glm_ivec2_abs(ivec2 v, ivec2 dest)
  */
 
 #ifndef cglm_ivec2_h
@@ -239,4 +240,17 @@ glm_ivec2_clamp(ivec2 v, int minVal, int maxVal) {
     v[1] = maxVal;
 }
 
+/*!
+ * @brief absolute value of v
+ *
+ * @param[in]	v	vector
+ * @param[out]	dest	destination
+ */
+CGLM_INLINE
+void
+glm_ivec2_abs(ivec2 v, ivec2 dest) {
+  dest[0] = abs(v[0]);
+  dest[1] = abs(v[1]);
+}
+
 #endif /* cglm_ivec2_h */

include/cglm/ivec3.h

@@ -22,6 +22,7 @@ FUNCTIONS:
   CGLM_INLINE void glm_ivec3_maxv(ivec3 a, ivec3 b, ivec3 dest)
   CGLM_INLINE void glm_ivec3_minv(ivec3 a, ivec3 b, ivec3 dest)
   CGLM_INLINE void glm_ivec3_clamp(ivec3 v, int minVal, int maxVal)
+  CGLM_INLINE void glm_ivec3_abs(ivec3 v, ivec3 dest)
  */
 
 #ifndef cglm_ivec3_h
@@ -255,4 +256,18 @@ glm_ivec3_clamp(ivec3 v, int minVal, int maxVal) {
     v[2] = maxVal;
 }
 
+/*!
+ * @brief absolute value of v
+ *
+ * @param[in]	v	vector
+ * @param[out]	dest	destination
+ */
+CGLM_INLINE
+void
+glm_ivec3_abs(ivec3 v, ivec3 dest) {
+  dest[0] = abs(v[0]);
+  dest[1] = abs(v[1]);
+  dest[2] = abs(v[2]);
+}
+
 #endif /* cglm_ivec3_h */

include/cglm/ivec4.h

@@ -22,6 +22,7 @@ FUNCTIONS:
   CGLM_INLINE void glm_ivec4_maxv(ivec4 a, ivec4 b, ivec4 dest)
   CGLM_INLINE void glm_ivec4_minv(ivec4 a, ivec4 b, ivec4 dest)
   CGLM_INLINE void glm_ivec4_clamp(ivec4 v, int minVal, int maxVal)
+  CGLM_INLINE void glm_ivec4_abs(ivec4 v, ivec4 dest)
  */
 
 #ifndef cglm_ivec4_h
@@ -272,4 +273,19 @@ glm_ivec4_clamp(ivec4 v, int minVal, int maxVal) {
     v[3] = maxVal;
 }
 
+/*!
+ * @brief absolute value of v
+ *
+ * @param[in]	v	vector
+ * @param[out]	dest	destination
+ */
+CGLM_INLINE
+void
+glm_ivec4_abs(ivec4 v, ivec4 dest) {
+  dest[0] = abs(v[0]);
+  dest[1] = abs(v[1]);
+  dest[2] = abs(v[2]);
+  dest[3] = abs(v[3]);
+}
+
 #endif /* cglm_ivec4_h */

include/cglm/vec2-ext.h

@@ -19,6 +19,7 @@
    CGLM_INLINE bool  glm_vec2_isinf(vec2 v);
    CGLM_INLINE bool  glm_vec2_isvalid(vec2 v);
    CGLM_INLINE void  glm_vec2_sign(vec2 v, vec2 dest);
+   CGLM_INLINE void  glm_vec2_abs(vec2 v, vec2 dest);
    CGLM_INLINE void  glm_vec2_sqrt(vec2 v, vec2 dest);
    CGLM_INLINE void  glm_vec2_complex_mul(vec2 a, vec2 b, vec2 dest)
    CGLM_INLINE void  glm_vec2_complex_div(vec2 a, vec2 b, vec2 dest)
@@ -176,6 +177,19 @@ glm_vec2_sign(vec2 v, vec2 dest) {
   dest[1] = glm_signf(v[1]);
 }
 
+/*!
+ * @brief absolute value of v
+ *
+ * @param[in]	v	vector
+ * @param[out]	dest	destination
+ */
+CGLM_INLINE
+void
+glm_vec2_abs(vec2 v, vec2 dest) {
+  dest[0] = fabsf(v[0]);
+  dest[1] = fabsf(v[1]);
+}
+
 /*!
  * @brief square root of each vector item
  *
@@ -237,5 +251,4 @@ glm_vec2_complex_conjugate(vec2 a, vec2 dest) {
   dest[1] = -a[1];
 }
 
-
 #endif /* cglm_vec2_ext_h */

include/cglm/version.h

@@ -10,6 +10,6 @@
 
 #define CGLM_VERSION_MAJOR 0
 #define CGLM_VERSION_MINOR 8
-#define CGLM_VERSION_PATCH 7
+#define CGLM_VERSION_PATCH 8
 
 #endif /* cglm_version_h */

meson.build

@@ -1,5 +1,5 @@
 project('cglm', 'c',
-    version : '0.8.7',
+    version : '0.8.8',
     license : 'mit',
     default_options : [
         'c_std=c11',

src/ivec2.c

@@ -97,3 +97,10 @@ void
 glmc_ivec2_clamp(ivec2 v, int minVal, int maxVal) {
   glm_ivec2_clamp(v, minVal, maxVal);
 }
+
+CGLM_EXPORT
+void
+glmc_ivec2_abs(ivec2 v, ivec2 dest) {
+  glm_ivec2_abs(v, dest);
+}
+

src/ivec3.c

@@ -97,3 +97,10 @@ void
 glmc_ivec3_clamp(ivec3 v, int minVal, int maxVal) {
   glm_ivec3_clamp(v, minVal, maxVal);
 }
+
+CGLM_EXPORT
+void
+glmc_ivec3_abs(ivec3 v, ivec3 dest) {
+  glm_ivec3_abs(v, dest);
+}
+

src/ivec4.c

@@ -97,3 +97,10 @@ void
 glmc_ivec4_clamp(ivec4 v, int minVal, int maxVal) {
   glm_ivec4_clamp(v, minVal, maxVal);
 }
+
+CGLM_EXPORT
+void
+glmc_ivec4_abs(ivec4 v, ivec4 dest) {
+  glm_ivec4_abs(v, dest);
+}
+

src/vec2.c

@@ -206,6 +206,12 @@ glmc_vec2_clamp(vec2 v, float minval, float maxval) {
   glm_vec2_clamp(v, minval, maxval);
 }
 
+CGLM_EXPORT
+void
+glmc_vec2_abs(vec2 v, vec2 dest) {
+  glm_vec2_abs(v, dest);
+}
+
 CGLM_EXPORT
 void
 glmc_vec2_lerp(vec2 from, vec2 to, float t, vec2 dest) {

test/src/test_clamp.c

@@ -11,21 +11,21 @@ TEST_IMPL(clamp) {
   vec3 v3 = {15.07f, 0.4f, 17.3f};
   vec4 v4 = {5.07f,  2.3f, 1.3f, 1.4f};
 
-  ASSERT(glm_clamp(1.6f, 0.0f, 1.0f)  == 1.0f)
+  ASSERT(glm_eq(glm_clamp(1.6f, 0.0f, 1.0f),  1.0f))
-  ASSERT(glm_clamp(-1.6f, 0.0f, 1.0f) == 0.0f)
+  ASSERT(glm_eq(glm_clamp(-1.6f, 0.0f, 1.0f), 0.0f))
-  ASSERT(glm_clamp(0.6f, 0.0f, 1.0f)  == 0.6f)
+  ASSERT(glm_eq(glm_clamp(0.6f, 0.0f, 1.0f),  0.6f))
 
   glm_vec3_clamp(v3, 0.0, 1.0);
   glm_vec4_clamp(v4, 1.5, 3.0);
 
-  ASSERT(v3[0] == 1.0f)
+  ASSERT(glm_eq(v3[0], 1.0f))
-  ASSERT(v3[1] == 0.4f)
+  ASSERT(glm_eq(v3[1], 0.4f))
-  ASSERT(v3[2] == 1.0f)
+  ASSERT(glm_eq(v3[2], 1.0f))
 
-  ASSERT(v4[0] == 3.0f)
+  ASSERT(glm_eq(v4[0], 3.0f))
-  ASSERT(v4[1] == 2.3f)
+  ASSERT(glm_eq(v4[1], 2.3f))
-  ASSERT(v4[2] == 1.5f)
+  ASSERT(glm_eq(v4[2], 1.5f))
-  ASSERT(v4[3] == 1.5f)
+  ASSERT(glm_eq(v4[3], 1.5f))
   
   TEST_SUCCESS
 }

test/src/test_ivec2.h

@@ -187,3 +187,18 @@ TEST_IMPL(GLM_PREFIX, ivec2_clamp) {
 
   TEST_SUCCESS
 }
+
+TEST_IMPL(GLM_PREFIX, ivec2_abs) {
+  ivec2  v1 = {2, -3}, v2 = {-12, -31};
+  ivec2  v3, v4;
+
+  GLM(ivec2_abs)(v1, v3);
+  GLM(ivec2_abs)(v2, v4);
+
+  ASSERT(v3[0] == 2)
+  ASSERT(v3[1] == 3)
+  ASSERT(v4[0] == 12)
+  ASSERT(v4[1] == 31)
+
+  TEST_SUCCESS
+}

test/src/test_ivec3.h

@@ -197,3 +197,20 @@ TEST_IMPL(GLM_PREFIX, ivec3_clamp) {
 
   TEST_SUCCESS
 }
+
+TEST_IMPL(GLM_PREFIX, ivec3_abs) {
+  ivec3  v1 = {2, -3, 4}, v2 = {-12, -31, -42};
+  ivec3  v3, v4;
+
+  GLM(ivec3_abs)(v1, v3);
+  GLM(ivec3_abs)(v2, v4);
+
+  ASSERT(v3[0] == 2)
+  ASSERT(v3[1] == 3)
+  ASSERT(v3[2] == 4)
+  ASSERT(v4[0] == 12)
+  ASSERT(v4[1] == 31)
+  ASSERT(v4[2] == 42)
+
+  TEST_SUCCESS
+}

test/src/test_ivec4.h

@@ -212,3 +212,22 @@ TEST_IMPL(GLM_PREFIX, ivec4_clamp) {
 
   TEST_SUCCESS
 }
+
+TEST_IMPL(GLM_PREFIX, ivec4_abs) {
+  ivec4  v1 = {2, -3, 4, -5}, v2 = {-12, -31, -42, -50};
+  ivec4  v3, v4;
+
+  GLM(ivec4_abs)(v1, v3);
+  GLM(ivec4_abs)(v2, v4);
+
+  ASSERT(v3[0] == 2)
+  ASSERT(v3[1] == 3)
+  ASSERT(v3[2] == 4)
+  ASSERT(v3[3] == 5)
+  ASSERT(v4[0] == 12)
+  ASSERT(v4[1] == 31)
+  ASSERT(v4[2] == 42)
+  ASSERT(v4[3] == 50)
+
+  TEST_SUCCESS
+}

test/src/test_vec2.h

@@ -579,6 +579,20 @@ TEST_IMPL(GLM_PREFIX, vec2_clamp) {
   TEST_SUCCESS
 }
 
+TEST_IMPL(GLM_PREFIX, vec2_abs) {
+  vec2  v1 = {2, -3}, v2 = {-12, -31};
+  vec2  v3, v4;
+  vec2  v5 = {2, 3}, v6 = {12, 31};
+
+  GLM(vec2_abs)(v1, v3);
+  GLM(vec2_abs)(v2, v4);
+
+  ASSERTIFY(test_assert_vec2_eq(v3, v5))
+  ASSERTIFY(test_assert_vec2_eq(v4, v6))
+
+  TEST_SUCCESS
+}
+
 TEST_IMPL(GLM_PREFIX, vec2_lerp) {
   vec2 v1 = {-100.0f, -200.0f};
   vec2 v2 = {100.0f, 200.0f};

test/tests.h

@@ -379,6 +379,7 @@ TEST_DECLARE(glm_vec2_distance)
 TEST_DECLARE(glm_vec2_maxv)
 TEST_DECLARE(glm_vec2_minv)
 TEST_DECLARE(glm_vec2_clamp)
+TEST_DECLARE(glm_vec2_abs)
 TEST_DECLARE(glm_vec2_lerp)
 TEST_DECLARE(glm_vec2_complex_mul)
 TEST_DECLARE(glm_vec2_complex_div)
@@ -416,6 +417,7 @@ TEST_DECLARE(glmc_vec2_distance)
 TEST_DECLARE(glmc_vec2_maxv)
 TEST_DECLARE(glmc_vec2_minv)
 TEST_DECLARE(glmc_vec2_clamp)
+TEST_DECLARE(glmc_vec2_abs)
 TEST_DECLARE(glmc_vec2_lerp)
 TEST_DECLARE(glmc_vec2_complex_mul)
 TEST_DECLARE(glmc_vec2_complex_div)
@@ -746,6 +748,7 @@ TEST_DECLARE(glm_ivec2_distance)
 TEST_DECLARE(glm_ivec2_maxv)
 TEST_DECLARE(glm_ivec2_minv)
 TEST_DECLARE(glm_ivec2_clamp)
+TEST_DECLARE(glm_ivec2_abs)
 
 TEST_DECLARE(glmc_ivec2)
 TEST_DECLARE(glmc_ivec2_copy)
@@ -762,6 +765,7 @@ TEST_DECLARE(glmc_ivec2_distance)
 TEST_DECLARE(glmc_ivec2_maxv)
 TEST_DECLARE(glmc_ivec2_minv)
 TEST_DECLARE(glmc_ivec2_clamp)
+TEST_DECLARE(glmc_ivec2_abs)
 
 /* ivec3 */
 TEST_DECLARE(glm_ivec3)
@@ -812,6 +816,7 @@ TEST_DECLARE(glm_ivec4_distance)
 TEST_DECLARE(glm_ivec4_maxv)
 TEST_DECLARE(glm_ivec4_minv)
 TEST_DECLARE(glm_ivec4_clamp)
+TEST_DECLARE(glm_ivec4_abs)
 
 TEST_DECLARE(glmc_ivec4)
 TEST_DECLARE(glmc_ivec4_copy)
@@ -828,6 +833,7 @@ TEST_DECLARE(glmc_ivec4_distance)
 TEST_DECLARE(glmc_ivec4_maxv)
 TEST_DECLARE(glmc_ivec4_minv)
 TEST_DECLARE(glmc_ivec4_clamp)
+TEST_DECLARE(glmc_ivec4_abs)
 
 /* structs */
 TEST_DECLARE(mat3s_identity_init)
@@ -1244,6 +1250,7 @@ TEST_LIST {
   TEST_ENTRY(glmc_vec2_maxv)
   TEST_ENTRY(glmc_vec2_minv)
   TEST_ENTRY(glmc_vec2_clamp)
+  TEST_ENTRY(glmc_vec2_abs)
   TEST_ENTRY(glmc_vec2_lerp)
   TEST_ENTRY(glmc_vec2_complex_mul)
   TEST_ENTRY(glmc_vec2_complex_div)
@@ -1573,6 +1580,7 @@ TEST_LIST {
   TEST_ENTRY(glm_ivec2_maxv)
   TEST_ENTRY(glm_ivec2_minv)
   TEST_ENTRY(glm_ivec2_clamp)
+  TEST_ENTRY(glm_ivec2_abs)
 
   TEST_ENTRY(glmc_ivec2)
   TEST_ENTRY(glmc_ivec2_copy)
@@ -1589,6 +1597,7 @@ TEST_LIST {
   TEST_ENTRY(glmc_ivec2_maxv)
   TEST_ENTRY(glmc_ivec2_minv)
   TEST_ENTRY(glmc_ivec2_clamp)
+  TEST_ENTRY(glmc_ivec2_abs)
 
   /* ivec3 */
   TEST_ENTRY(glm_ivec3)
@@ -1655,6 +1664,7 @@ TEST_LIST {
   TEST_ENTRY(glmc_ivec4_maxv)
   TEST_ENTRY(glmc_ivec4_minv)
   TEST_ENTRY(glmc_ivec4_clamp)
+  TEST_ENTRY(glmc_ivec4_abs)
 
   /* structs */
   TEST_ENTRY(mat3s_identity_init)