Merge pull request #373 from BeeverFeever/master

ivec += and -= functions
This commit is contained in:
Recep Aslantas
2023-12-25 10:34:10 +03:00
committed by GitHub
14 changed files with 2291 additions and 1 deletions

View File

@@ -53,6 +53,70 @@ CGLM_EXPORT
void
glmc_ivec2_scale(ivec2 v, int s, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_addadd(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_addadds(ivec2 a, int s, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_subadd(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_subadds(ivec2 a, int s, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_muladd(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_muladds(ivec2 a, int s, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_maxadd(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_minadd(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_subsub(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_subsubs(ivec2 a, int s, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_addsub(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_addsubs(ivec2 a, int s, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_mulsub(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_mulsubs(ivec2 a, int s, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_maxsub(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
void
glmc_ivec2_minsub(ivec2 a, ivec2 b, ivec2 dest);
CGLM_EXPORT
int
glmc_ivec2_distance2(ivec2 a, ivec2 b);

View File

@@ -53,6 +53,70 @@ CGLM_EXPORT
void
glmc_ivec3_scale(ivec3 v, int s, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_addadd(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_addadds(ivec3 a, int s, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_subadd(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_subadds(ivec3 a, int s, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_muladd(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_muladds(ivec3 a, int s, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_maxadd(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_minadd(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_subsub(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_subsubs(ivec3 a, int s, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_addsub(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_addsubs(ivec3 a, int s, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_mulsub(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_mulsubs(ivec3 a, int s, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_maxsub(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
void
glmc_ivec3_minsub(ivec3 a, ivec3 b, ivec3 dest);
CGLM_EXPORT
int
glmc_ivec3_distance2(ivec3 a, ivec3 b);

View File

@@ -53,6 +53,70 @@ CGLM_EXPORT
void
glmc_ivec4_scale(ivec4 v, int s, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_addadd(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_addadds(ivec4 a, int s, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_subadd(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_subadds(ivec4 a, int s, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_muladd(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_muladds(ivec4 a, int s, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_maxadd(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_minadd(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_subsub(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_subsubs(ivec4 a, int s, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_addsub(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_addsubs(ivec4 a, int s, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_mulsub(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_mulsubs(ivec4 a, int s, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_maxsub(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
void
glmc_ivec4_minsub(ivec4 a, ivec4 b, ivec4 dest);
CGLM_EXPORT
int
glmc_ivec4_distance2(ivec4 a, ivec4 b);

View File

@@ -23,6 +23,22 @@
CGLM_INLINE void glm_ivec2_subs(ivec2 v, int s, ivec2 dest)
CGLM_INLINE void glm_ivec2_mul(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_scale(ivec2 v, int s, ivec2 dest)
CGLM_INLINE void glm_ivec2_addadd(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_addadds(ivec2 a, int s, ivec2 dest)
CGLM_INLINE void glm_ivec2_subadd(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_subadds(ivec2 a, int s, ivec2 dest)
CGLM_INLINE void glm_ivec2_muladd(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_muladds(ivec2 a, int s, ivec2 dest)
CGLM_INLINE void glm_ivec2_maxadd(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_minadd(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_subsub(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_subsubs(ivec2 a, int s, ivec2 dest)
CGLM_INLINE void glm_ivec2_addsub(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_addsubs(ivec2 a, int s, ivec2 dest)
CGLM_INLINE void glm_ivec2_mulsub(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_mulsubs(ivec2 a, int s, ivec2 dest)
CGLM_INLINE void glm_ivec2_maxsub(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE void glm_ivec2_minsub(ivec2 a, ivec2 b, ivec2 dest)
CGLM_INLINE int glm_ivec2_distance2(ivec2 a, ivec2 b)
CGLM_INLINE float glm_ivec2_distance(ivec2 a, ivec2 b)
CGLM_INLINE void glm_ivec2_fill(ivec2 v, int val);
@@ -38,6 +54,7 @@
#define cglm_ivec2_h
#include "common.h"
#include "util.h"
#define GLM_IVEC2_ONE_INIT {1, 1}
#define GLM_IVEC2_ZERO_INIT {0, 0}
@@ -177,6 +194,262 @@ glm_ivec2_scale(ivec2 v, int s, ivec2 dest) {
dest[1] = v[1] * s;
}
/*!
* @brief add vector [a] with vector [b] and add result to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a + b)
*/
CGLM_INLINE
void
glm_ivec2_addadd(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] += a[0] + b[0];
dest[1] += a[1] + b[1];
}
/*!
* @brief add scalar [s] onto vector [a] and add result to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest += (a + s)
*/
CGLM_INLINE
void
glm_ivec2_addadds(ivec2 a, int s, ivec2 dest) {
dest[0] += a[0] + s;
dest[1] += a[1] + s;
}
/*!
* @brief subtract vector [a] from vector [b] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a - b)
*/
CGLM_INLINE
void
glm_ivec2_subadd(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] += a[0] - b[0];
dest[1] += a[1] - b[1];
}
/*!
* @brief subtract scalar [s] from vector [a] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first
* @param[in] s scalar
* @param[out] dest dest += (a - s)
*/
CGLM_INLINE
void
glm_ivec2_subadds(ivec2 a, int s, ivec2 dest) {
dest[0] += a[0] - s;
dest[1] += a[1] - s;
}
/*!
* @brief multiply vector [a] with vector [b] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a * b)
*/
CGLM_INLINE
void
glm_ivec2_muladd(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] += a[0] * b[0];
dest[1] += a[1] * b[1];
}
/*!
* @brief multiply vector [a] with scalar [s] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest += (a * s)
*/
CGLM_INLINE
void
glm_ivec2_muladds(ivec2 a, int s, ivec2 dest) {
dest[0] += a[0] * s;
dest[1] += a[1] * s;
}
/*!
* @brief add maximum of vector [a] and vector [b] to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += max(a, b)
*/
CGLM_INLINE
void
glm_ivec2_maxadd(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] += glm_imax(a[0], b[0]);
dest[1] += glm_imax(a[1], b[1]);
}
/*!
* @brief add minimum of vector [a] and vector [b] to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += min(a, b)
*/
CGLM_INLINE
void
glm_ivec2_minadd(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] += glm_imin(a[0], b[0]);
dest[1] += glm_imin(a[1], b[1]);
}
/*!
* @brief subtract vector [a] from vector [b] and subtract result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= (a - b)
*/
CGLM_INLINE
void
glm_ivec2_subsub(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] -= a[0] - b[0];
dest[1] -= a[1] - b[1];
}
/*!
* @brief subtract scalar [s] from vector [a] and subtract result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a - s)
*/
CGLM_INLINE
void
glm_ivec2_subsubs(ivec2 a, int s, ivec2 dest) {
dest[0] -= a[0] - s;
dest[1] -= a[1] - s;
}
/*!
* @brief add vector [a] to vector [b] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a + b)
*/
CGLM_INLINE
void
glm_ivec2_addsub(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] -= a[0] + b[0];
dest[1] -= a[1] + b[1];
}
/*!
* @brief add scalar [s] to vector [a] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a + b)
*/
CGLM_INLINE
void
glm_ivec2_addsubs(ivec2 a, int s, ivec2 dest) {
dest[0] -= a[0] + s;
dest[1] -= a[1] + s;
}
/*!
* @brief multiply vector [a] and vector [b] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a * b)
*/
CGLM_INLINE
void
glm_ivec2_mulsub(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] -= a[0] * b[0];
dest[1] -= a[1] * b[1];
}
/*!
* @brief multiply vector [a] with scalar [s] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a * s)
*/
CGLM_INLINE
void
glm_ivec2_mulsubs(ivec2 a, int s, ivec2 dest) {
dest[0] -= a[0] * s;
dest[1] -= a[1] * s;
}
/*!
* @brief subtract maximum of vector [a] and vector [b] from vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= max(a, b)
*/
CGLM_INLINE
void
glm_ivec2_maxsub(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] -= glm_imax(a[0], b[0]);
dest[1] -= glm_imax(a[1], b[1]);
}
/*!
* @brief subtract minimum of vector [a] and vector [b] from vector [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= min(a, b)
*/
CGLM_INLINE
void
glm_ivec2_minsub(ivec2 a, ivec2 b, ivec2 dest) {
dest[0] -= glm_imin(a[0], b[0]);
dest[1] -= glm_imin(a[1], b[1]);
}
/*!
* @brief squared distance between two vectors
*

View File

@@ -23,6 +23,22 @@
CGLM_INLINE void glm_ivec3_subs(ivec3 v, int s, ivec3 dest)
CGLM_INLINE void glm_ivec3_mul(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_scale(ivec3 v, int s, ivec3 dest)
CGLM_INLINE void glm_ivec3_addadd(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_addadds(ivec3 a, int s, ivec3 dest)
CGLM_INLINE void glm_ivec3_subadd(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_subadds(ivec3 a, int s, ivec3 dest)
CGLM_INLINE void glm_ivec3_muladd(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_muladds(ivec3 a, int s, ivec3 dest)
CGLM_INLINE void glm_ivec3_maxadd(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_minadd(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_subsub(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_subsubs(ivec3 a, int s, ivec3 dest)
CGLM_INLINE void glm_ivec3_addsub(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_addsubs(ivec3 a, int s, ivec3 dest)
CGLM_INLINE void glm_ivec3_mulsub(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_mulsubs(ivec3 a, int s, ivec3 dest)
CGLM_INLINE void glm_ivec3_maxsub(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE void glm_ivec3_minsub(ivec3 a, ivec3 b, ivec3 dest)
CGLM_INLINE int glm_ivec3_distance2(ivec3 a, ivec3 b)
CGLM_INLINE float glm_ivec3_distance(ivec3 a, ivec3 b)
CGLM_INLINE void glm_ivec3_fill(ivec3 v, int val);
@@ -38,6 +54,7 @@
#define cglm_ivec3_h
#include "common.h"
#include "util.h"
#define GLM_IVEC3_ONE_INIT {1, 1, 1}
#define GLM_IVEC3_ZERO_INIT {0, 0, 0}
@@ -185,6 +202,278 @@ glm_ivec3_scale(ivec3 v, int s, ivec3 dest) {
dest[2] = v[2] * s;
}
/*!
* @brief add vector [a] with vector [b] and add result to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a + b)
*/
CGLM_INLINE
void
glm_ivec3_addadd(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] += a[0] + b[0];
dest[1] += a[1] + b[1];
dest[2] += a[2] + b[2];
}
/*!
* @brief add scalar [s] onto vector [a] and add result to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest += (a + s)
*/
CGLM_INLINE
void
glm_ivec3_addadds(ivec3 a, int s, ivec3 dest) {
dest[0] += a[0] + s;
dest[1] += a[1] + s;
dest[2] += a[2] + s;
}
/*!
* @brief subtract vector [a] from vector [b] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a - b)
*/
CGLM_INLINE
void
glm_ivec3_subadd(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] += a[0] - b[0];
dest[1] += a[1] - b[1];
dest[2] += a[2] - b[2];
}
/*!
* @brief subtract scalar [s] from vector [a] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first
* @param[in] s scalar
* @param[out] dest dest += (a - s)
*/
CGLM_INLINE
void
glm_ivec3_subadds(ivec3 a, int s, ivec3 dest) {
dest[0] += a[0] - s;
dest[1] += a[1] - s;
dest[2] += a[2] - s;
}
/*!
* @brief multiply vector [a] with vector [b] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a * b)
*/
CGLM_INLINE
void
glm_ivec3_muladd(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] += a[0] * b[0];
dest[1] += a[1] * b[1];
dest[2] += a[2] * b[2];
}
/*!
* @brief multiply vector [a] with scalar [s] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest += (a * s)
*/
CGLM_INLINE
void
glm_ivec3_muladds(ivec3 a, int s, ivec3 dest) {
dest[0] += a[0] * s;
dest[1] += a[1] * s;
dest[2] += a[2] * s;
}
/*!
* @brief add maximum of vector [a] and vector [b] to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += max(a, b)
*/
CGLM_INLINE
void
glm_ivec3_maxadd(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] += glm_imax(a[0], b[0]);
dest[1] += glm_imax(a[1], b[1]);
dest[2] += glm_imax(a[2], b[2]);
}
/*!
* @brief add minimum of vector [a] and vector [b] to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += min(a, b)
*/
CGLM_INLINE
void
glm_ivec3_minadd(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] += glm_imin(a[0], b[0]);
dest[1] += glm_imin(a[1], b[1]);
dest[2] += glm_imin(a[2], b[2]);
}
/*!
* @brief subtract vector [a] from vector [b] and subtract result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= (a - b)
*/
CGLM_INLINE
void
glm_ivec3_subsub(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] -= a[0] - b[0];
dest[1] -= a[1] - b[1];
dest[2] -= a[2] - b[2];
}
/*!
* @brief subtract scalar [s] from vector [a] and subtract result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a - s)
*/
CGLM_INLINE
void
glm_ivec3_subsubs(ivec3 a, int s, ivec3 dest) {
dest[0] -= a[0] - s;
dest[1] -= a[1] - s;
dest[2] -= a[2] - s;
}
/*!
* @brief add vector [a] to vector [b] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a + b)
*/
CGLM_INLINE
void
glm_ivec3_addsub(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] -= a[0] + b[0];
dest[1] -= a[1] + b[1];
dest[2] -= a[2] + b[2];
}
/*!
* @brief add scalar [s] to vector [a] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a + b)
*/
CGLM_INLINE
void
glm_ivec3_addsubs(ivec3 a, int s, ivec3 dest) {
dest[0] -= a[0] + s;
dest[1] -= a[1] + s;
dest[2] -= a[2] + s;
}
/*!
* @brief multiply vector [a] and vector [b] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a * b)
*/
CGLM_INLINE
void
glm_ivec3_mulsub(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] -= a[0] * b[0];
dest[1] -= a[1] * b[1];
dest[2] -= a[2] * b[2];
}
/*!
* @brief multiply vector [a] with scalar [s] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a * s)
*/
CGLM_INLINE
void
glm_ivec3_mulsubs(ivec3 a, int s, ivec3 dest) {
dest[0] -= a[0] * s;
dest[1] -= a[1] * s;
dest[2] -= a[2] * s;
}
/*!
* @brief subtract maximum of vector [a] and vector [b] from vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= max(a, b)
*/
CGLM_INLINE
void
glm_ivec3_maxsub(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] -= glm_imax(a[0], b[0]);
dest[1] -= glm_imax(a[1], b[1]);
dest[2] -= glm_imax(a[2], b[2]);
}
/*!
* @brief subtract minimum of vector [a] and vector [b] from vector [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= min(a, b)
*/
CGLM_INLINE
void
glm_ivec3_minsub(ivec3 a, ivec3 b, ivec3 dest) {
dest[0] -= glm_imin(a[0], b[0]);
dest[1] -= glm_imin(a[1], b[1]);
dest[2] -= glm_imin(a[2], b[2]);
}
/*!
* @brief squared distance between two vectors
*

View File

@@ -23,6 +23,22 @@
CGLM_INLINE void glm_ivec4_subs(ivec4 v, int s, ivec4 dest)
CGLM_INLINE void glm_ivec4_mul(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_scale(ivec4 v, int s, ivec4 dest)
CGLM_INLINE void glm_ivec4_addadd(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_addadds(ivec4 a, int s, ivec4 dest)
CGLM_INLINE void glm_ivec4_subadd(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_subadds(ivec4 a, int s, ivec4 dest)
CGLM_INLINE void glm_ivec4_muladd(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_muladds(ivec4 a, int s, ivec4 dest)
CGLM_INLINE void glm_ivec4_maxadd(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_minadd(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_subsub(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_subsubs(ivec4 a, int s, ivec4 dest)
CGLM_INLINE void glm_ivec4_addsub(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_addsubs(ivec4 a, int s, ivec4 dest)
CGLM_INLINE void glm_ivec4_mulsub(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_mulsubs(ivec4 a, int s, ivec4 dest)
CGLM_INLINE void glm_ivec4_maxsub(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE void glm_ivec4_minsub(ivec4 a, ivec4 b, ivec4 dest)
CGLM_INLINE int glm_ivec4_distance2(ivec4 a, ivec4 b)
CGLM_INLINE float glm_ivec4_distance(ivec4 a, ivec4 b)
CGLM_INLINE void glm_ivec4_maxv(ivec4 a, ivec4 b, ivec4 dest)
@@ -35,6 +51,7 @@
#define cglm_ivec4_h
#include "common.h"
#include "util.h"
#define GLM_IVEC4_ONE_INIT {1, 1, 1, 1}
#define GLM_IVEC4_ZERO_INIT {0, 0, 0, 0}
@@ -191,6 +208,294 @@ glm_ivec4_scale(ivec4 v, int s, ivec4 dest) {
dest[3] = v[3] * s;
}
/*!
* @brief add vector [a] with vector [b] and add result to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a + b)
*/
CGLM_INLINE
void
glm_ivec4_addadd(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] += a[0] + b[0];
dest[1] += a[1] + b[1];
dest[2] += a[2] + b[2];
dest[3] += a[3] + b[3];
}
/*!
* @brief add scalar [s] onto vector [a] and add result to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest += (a + s)
*/
CGLM_INLINE
void
glm_ivec4_addadds(ivec4 a, int s, ivec4 dest) {
dest[0] += a[0] + s;
dest[1] += a[1] + s;
dest[2] += a[2] + s;
dest[3] += a[3] + s;
}
/*!
* @brief subtract vector [a] from vector [b] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a - b)
*/
CGLM_INLINE
void
glm_ivec4_subadd(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] += a[0] - b[0];
dest[1] += a[1] - b[1];
dest[2] += a[2] - b[2];
dest[3] += a[3] - b[3];
}
/*!
* @brief subtract scalar [s] from vector [a] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first
* @param[in] s scalar
* @param[out] dest dest += (a - s)
*/
CGLM_INLINE
void
glm_ivec4_subadds(ivec4 a, int s, ivec4 dest) {
dest[0] += a[0] - s;
dest[1] += a[1] - s;
dest[2] += a[2] - s;
dest[3] += a[3] - s;
}
/*!
* @brief multiply vector [a] with vector [b] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += (a * b)
*/
CGLM_INLINE
void
glm_ivec4_muladd(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] += a[0] * b[0];
dest[1] += a[1] * b[1];
dest[2] += a[2] * b[2];
dest[3] += a[3] * b[3];
}
/*!
* @brief multiply vector [a] with scalar [s] and add result to [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest += (a * s)
*/
CGLM_INLINE
void
glm_ivec4_muladds(ivec4 a, int s, ivec4 dest) {
dest[0] += a[0] * s;
dest[1] += a[1] * s;
dest[2] += a[2] * s;
dest[3] += a[3] * s;
}
/*!
* @brief add maximum of vector [a] and vector [b] to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += max(a, b)
*/
CGLM_INLINE
void
glm_ivec4_maxadd(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] += glm_imax(a[0], b[0]);
dest[1] += glm_imax(a[1], b[1]);
dest[2] += glm_imax(a[2], b[2]);
dest[3] += glm_imax(a[3], b[3]);
}
/*!
* @brief add minimum of vector [a] and vector [b] to vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest += min(a, b)
*/
CGLM_INLINE
void
glm_ivec4_minadd(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] += glm_imin(a[0], b[0]);
dest[1] += glm_imin(a[1], b[1]);
dest[2] += glm_imin(a[2], b[2]);
dest[3] += glm_imin(a[3], b[3]);
}
/*!
* @brief subtract vector [a] from vector [b] and subtract result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= (a - b)
*/
CGLM_INLINE
void
glm_ivec4_subsub(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] -= a[0] - b[0];
dest[1] -= a[1] - b[1];
dest[2] -= a[2] - b[2];
dest[3] -= a[3] - b[3];
}
/*!
* @brief subtract scalar [s] from vector [a] and subtract result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a - s)
*/
CGLM_INLINE
void
glm_ivec4_subsubs(ivec4 a, int s, ivec4 dest) {
dest[0] -= a[0] - s;
dest[1] -= a[1] - s;
dest[2] -= a[2] - s;
dest[3] -= a[3] - s;
}
/*!
* @brief add vector [a] to vector [b] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a + b)
*/
CGLM_INLINE
void
glm_ivec4_addsub(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] -= a[0] + b[0];
dest[1] -= a[1] + b[1];
dest[2] -= a[2] + b[2];
dest[3] -= a[3] + b[3];
}
/*!
* @brief add scalar [s] to vector [a] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a + b)
*/
CGLM_INLINE
void
glm_ivec4_addsubs(ivec4 a, int s, ivec4 dest) {
dest[0] -= a[0] + s;
dest[1] -= a[1] + s;
dest[2] -= a[2] + s;
dest[3] -= a[3] + s;
}
/*!
* @brief multiply vector [a] and vector [b] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a * b)
*/
CGLM_INLINE
void
glm_ivec4_mulsub(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] -= a[0] * b[0];
dest[1] -= a[1] * b[1];
dest[2] -= a[2] * b[2];
dest[3] -= a[3] * b[3];
}
/*!
* @brief multiply vector [a] with scalar [s] and subtract the result from [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a vector
* @param[in] s scalar
* @param[out] dest dest -= (a * s)
*/
CGLM_INLINE
void
glm_ivec4_mulsubs(ivec4 a, int s, ivec4 dest) {
dest[0] -= a[0] * s;
dest[1] -= a[1] * s;
dest[2] -= a[2] * s;
dest[3] -= a[3] * s;
}
/*!
* @brief subtract maximum of vector [a] and vector [b] from vector [dest]
*
* applies += operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= max(a, b)
*/
CGLM_INLINE
void
glm_ivec4_maxsub(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] -= glm_imax(a[0], b[0]);
dest[1] -= glm_imax(a[1], b[1]);
dest[2] -= glm_imax(a[2], b[2]);
dest[3] -= glm_imax(a[3], b[3]);
}
/*!
* @brief subtract minimum of vector [a] and vector [b] from vector [dest]
*
* applies -= operator so dest must be initialized
*
* @param[in] a first vector
* @param[in] b second vector
* @param[out] dest dest -= min(a, b)
*/
CGLM_INLINE
void
glm_ivec4_minsub(ivec4 a, ivec4 b, ivec4 dest) {
dest[0] -= glm_imin(a[0], b[0]);
dest[1] -= glm_imin(a[1], b[1]);
dest[2] -= glm_imin(a[2], b[2]);
dest[3] -= glm_imin(a[3], b[3]);
}
/*!
* @brief squared distance between two vectors
*

View File

@@ -147,6 +147,38 @@ glm_max(float a, float b) {
return b;
}
/*!
* @brief find minimum of given two values
*
* @param[in] a number 1
* @param[in] b number 2
*
* @return smallest of the two values
*/
CGLM_INLINE
int
glm_imin(int a, int b) {
if (a < b)
return a;
return b;
}
/*!
* @brief find maximum of given two values
*
* @param[in] a number 1
* @param[in] b number 2
*
* @return largest of the two values
*/
CGLM_INLINE
int
glm_imax(int a, int b) {
if (a > b)
return a;
return b;
}
/*!
* @brief clamp a number between min and max
*