External/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-01-01 05:06:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into proj

Browse Source
This commit is contained in:
Recep Aslantas
2018-04-03 12:30:03 +03:00
committed by GitHub
parent 63acfd681e 2513d46102
commit b16f0ded85
28 changed files with 677 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
include/cglm/box.h
View File

@@ -153,4 +153,50 @@ glm_aabb_frustum(vec3 box[2], vec4 planes[6]) {
return true;
}
/*!
* @brief invalidate AABB min and max values
*
* @param[in, out] box bounding box
*/
CGLM_INLINE
void
glm_aabb_invalidate(vec3 box[2]) {
glm_vec_broadcast(FLT_MAX, box[0]);
glm_vec_broadcast(-FLT_MAX, box[1]);
}
/*!
* @brief check if AABB is valid or not
*
* @param[in] box bounding box
*/
CGLM_INLINE
bool
glm_aabb_isvalid(vec3 box[2]) {
return glm_vec_max(box[0]) != FLT_MAX
&& glm_vec_min(box[1]) != -FLT_MAX;
}
/*!
* @brief distance between of min and max
*
* @param[in] box bounding box
*/
CGLM_INLINE
float
glm_aabb_size(vec3 box[2]) {
return glm_vec_distance(box[0], box[1]);
}
/*!
* @brief radius of sphere which surrounds AABB
*
* @param[in] box bounding box
*/
CGLM_INLINE
float
glm_aabb_radius(vec3 box[2]) {
return glm_aabb_size(box) * 0.5f;
}
#endif /* cglm_box_h */

4
include/cglm/call/euler.h
View File

@@ -21,6 +21,10 @@ CGLM_EXPORT
void
glmc_euler(vec3 angles, mat4 dest);
CGLM_EXPORT
void
glmc_euler_xyz(vec3 angles, mat4 dest);
CGLM_EXPORT
void
glmc_euler_zyx(vec3 angles, mat4 dest);

4
include/cglm/call/vec3.h
View File

@@ -104,6 +104,10 @@ CGLM_EXPORT
void
glmc_vec_minv(vec3 v1, vec3 v2, vec3 dest);
CGLM_EXPORT
void
glmc_vec_clamp(vec3 v, float minVal, float maxVal);
#ifdef __cplusplus
}
#endif

4
include/cglm/call/vec4.h
View File

@@ -85,6 +85,10 @@ CGLM_EXPORT
void
glmc_vec4_minv(vec4 v1, vec4 v2, vec4 dest);
CGLM_EXPORT
void
glmc_vec4_clamp(vec4 v, float minVal, float maxVal);
#ifdef __cplusplus
}
#endif

492
include/cglm/euler.h
View File

@@ -5,6 +5,14 @@
* Full license can be found in the LICENSE file
*/
/*
NOTE:
angles must be passed as [X-Angle, Y-Angle, Z-angle] order
For instance you don't pass angles as [Z-Angle, X-Angle, Y-angle] to
glm_euler_zxy funciton, All RELATED functions accept angles same order
which is [X, Y, Z].
*/
/*
Types:
enum glm_euler_sq
@@ -61,253 +69,283 @@ glm_euler_order(int ord[3]) {
CGLM_INLINE
void
glm_euler_angles(mat4 m, vec3 dest) {
if (m[0][2] < 1.0f) {
if (m[0][2] > -1.0f) {
vec3 a[2];
float cy1, cy2;
int path;
float m00, m01, m10, m11, m20, m21, m22;
float thetaX, thetaY, thetaZ;
a[0][1] = asinf(-m[0][2]);
a[1][1] = CGLM_PI - a[0][1];
m00 = m[0][0]; m10 = m[1][0]; m20 = m[2][0];
m01 = m[0][1]; m11 = m[1][1]; m21 = m[2][1];
m22 = m[2][2];
cy1 = cosf(a[0][1]);
cy2 = cosf(a[1][1]);
a[0][0] = atan2f(m[1][2] / cy1, m[2][2] / cy1);
a[1][0] = atan2f(m[1][2] / cy2, m[2][2] / cy2);
a[0][2] = atan2f(m[0][1] / cy1, m[0][0] / cy1);
a[1][2] = atan2f(m[0][1] / cy2, m[0][0] / cy2);
path = (fabsf(a[0][0]) + fabsf(a[0][1]) + fabsf(a[0][2])) >=
(fabsf(a[1][0]) + fabsf(a[1][1]) + fabsf(a[1][2]));
glm_vec_copy(a[path], dest);
} else {
dest[0] = atan2f(m[1][0], m[2][0]);
dest[1] = CGLM_PI_2;
dest[2] = 0.0f;
if (m20 < 1.0f) {
if (m20 > -1.0f) {
thetaY = asinf(m20);
thetaX = atan2f(-m21, m22);
thetaZ = atan2f(-m10, m00);
} else { /* m20 == -1 */
/* Not a unique solution */
thetaY = -CGLM_PI_2;
thetaX = -atan2f(m01, m11);
thetaZ = 0.0f;
}
} else {
dest[0] = atan2f(-m[1][0], -m[2][0]);
dest[1] =-CGLM_PI_2;
dest[2] = 0.0f;
} else { /* m20 == +1 */
thetaY = CGLM_PI_2;
thetaX = atan2f(m01, m11);
thetaZ = 0.0f;
}
dest[0] = thetaX;
dest[1] = thetaY;
dest[2] = thetaZ;
}
/*!
* @brief build rotation matrix from euler angles
*
* @param[in] angles angles as vector [Ex, Ey, Ez]
* @param[in] angles angles as vector [Xangle, Yangle, Zangle]
* @param[out] dest rotation matrix
*/
CGLM_INLINE
void
glm_euler_xyz(vec3 angles, mat4 dest) {
float cx, cy, cz,
sx, sy, sz, czsx, cxcz, sysz;
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
czsx = cz * sx;
cxcz = cx * cz;
sysz = sy * sz;
dest[0][0] = cy * cz;
dest[0][1] = czsx * sy + cx * sz;
dest[0][2] = -cxcz * sy + sx * sz;
dest[1][0] = -cy * sz;
dest[1][1] = cxcz - sx * sysz;
dest[1][2] = czsx + cx * sysz;
dest[2][0] = sy;
dest[2][1] = -cy * sx;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles
*
* @param[in] angles angles as vector [Xangle, Yangle, Zangle]
* @param[out] dest rotation matrix
*/
CGLM_INLINE
void
glm_euler(vec3 angles, mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
dest[0][0] = cy * cz;
dest[0][1] = cy * sz;
dest[0][2] =-sy;
dest[1][0] = cz * sx * sy - cx * sz;
dest[1][1] = cx * cz + sx * sy * sz;
dest[1][2] = cy * sx;
dest[2][0] = cx * cz * sy + sx * sz;
dest[2][1] =-cz * sx + cx * sy * sz;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
glm_euler_xyz(angles, dest);
}
/*!
* @brief build rotation matrix from euler angles
*
* @param[in] angles angles as vector [Ez, Ey, Ex]
* @param[in] angles angles as vector [Xangle, Yangle, Zangle]
* @param[out] dest rotation matrix
*/
CGLM_INLINE
void
glm_euler_zyx(vec3 angles,
mat4 dest) {
glm_euler_xzy(vec3 angles, mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
sx, sy, sz, sxsy, cysx, cxsy, cxcy;
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
dest[0][0] = cy * cz;
dest[0][1] = cz * sx * sy + cx * sz;
dest[0][2] =-cx * cz * sy + sx * sz;
dest[1][0] =-cy * sz;
dest[1][1] = cx * cz - sx * sy * sz;
dest[1][2] = cz * sx + cx * sy * sz;
dest[2][0] = sy;
dest[2][1] =-cy * sx;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
sxsy = sx * sy;
cysx = cy * sx;
cxsy = cx * sy;
cxcy = cx * cy;
dest[0][0] = cy * cz;
dest[0][1] = sxsy + cxcy * sz;
dest[0][2] = -cxsy + cysx * sz;
dest[1][0] = -sz;
dest[1][1] = cx * cz;
dest[1][2] = cz * sx;
dest[2][0] = cz * sy;
dest[2][1] = -cysx + cxsy * sz;
dest[2][2] = cxcy + sxsy * sz;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles
*
* @param[in] angles angles as vector [Ez, Ex, Ey]
* @param[in] angles angles as vector [Xangle, Yangle, Zangle]
* @param[out] dest rotation matrix
*/
CGLM_INLINE
void
glm_euler_zxy(vec3 angles,
mat4 dest) {
glm_euler_yxz(vec3 angles, mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
sx, sy, sz, cycz, sysz, czsy, cysz;
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
dest[0][0] = cy * cz + sx * sy * sz;
dest[0][1] = cx * sz;
dest[0][2] =-cz * sy + cy * sx * sz;
dest[1][0] = cz * sx * sy - cy * sz;
dest[1][1] = cx * cz;
dest[1][2] = cy * cz * sx + sy * sz;
dest[2][0] = cx * sy;
dest[2][1] =-sx;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
cycz = cy * cz;
sysz = sy * sz;
czsy = cz * sy;
cysz = cy * sz;
dest[0][0] = cycz + sx * sysz;
dest[0][1] = cx * sz;
dest[0][2] = -czsy + cysz * sx;
dest[1][0] = -cysz + czsy * sx;
dest[1][1] = cx * cz;
dest[1][2] = cycz * sx + sysz;
dest[2][0] = cx * sy;
dest[2][1] = -sx;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles
*
* @param[in] angles angles as vector [Ex, Ez, Ey]
* @param[in] angles angles as vector [Xangle, Yangle, Zangle]
* @param[out] dest rotation matrix
*/
CGLM_INLINE
void
glm_euler_xzy(vec3 angles,
mat4 dest) {
glm_euler_yzx(vec3 angles, mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
sx, sy, sz, sxsy, cxcy, cysx, cxsy;
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
dest[0][0] = cy * cz;
dest[0][1] = sz;
dest[0][2] =-cz * sy;
dest[1][0] = sx * sy - cx * cy * sz;
dest[1][1] = cx * cz;
dest[1][2] = cy * sx + cx * sy * sz;
dest[2][0] = cx * sy + cy * sx * sz;
dest[2][1] =-cz * sx;
dest[2][2] = cx * cy - sx * sy * sz;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
sxsy = sx * sy;
cxcy = cx * cy;
cysx = cy * sx;
cxsy = cx * sy;
dest[0][0] = cy * cz;
dest[0][1] = sz;
dest[0][2] = -cz * sy;
dest[1][0] = sxsy - cxcy * sz;
dest[1][1] = cx * cz;
dest[1][2] = cysx + cxsy * sz;
dest[2][0] = cxsy + cysx * sz;
dest[2][1] = -cz * sx;
dest[2][2] = cxcy - sxsy * sz;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles
*
* @param[in] angles angles as vector [Ey, Ez, Ex]
* @param[in] angles angles as vector [Xangle, Yangle, Zangle]
* @param[out] dest rotation matrix
*/
CGLM_INLINE
void
glm_euler_yzx(vec3 angles,
mat4 dest) {
glm_euler_zxy(vec3 angles, mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
sx, sy, sz, cycz, sxsy, cysz;
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
dest[0][0] = cy * cz;
dest[0][1] = sx * sy + cx * cy * sz;
dest[0][2] =-cx * sy + cy * sx * sz;
dest[1][0] =-sz;
dest[1][1] = cx * cz;
dest[1][2] = cz * sx;
dest[2][0] = cz * sy;
dest[2][1] =-cy * sx + cx * sy * sz;
dest[2][2] = cx * cy + sx * sy * sz;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
cycz = cy * cz;
sxsy = sx * sy;
cysz = cy * sz;
dest[0][0] = cycz - sxsy * sz;
dest[0][1] = cz * sxsy + cysz;
dest[0][2] = -cx * sy;
dest[1][0] = -cx * sz;
dest[1][1] = cx * cz;
dest[1][2] = sx;
dest[2][0] = cz * sy + cysz * sx;
dest[2][1] = -cycz * sx + sy * sz;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles
*
* @param[in] angles angles as vector [Ey, Ex, Ez]
* @param[in] angles angles as vector [Xangle, Yangle, Zangle]
* @param[out] dest rotation matrix
*/
CGLM_INLINE
void
glm_euler_yxz(vec3 angles,
mat4 dest) {
glm_euler_zyx(vec3 angles, mat4 dest) {
float cx, cy, cz,
sx, sy, sz;
sx, sy, sz, czsx, cxcz, sysz;
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
sx = sinf(angles[0]); cx = cosf(angles[0]);
sy = sinf(angles[1]); cy = cosf(angles[1]);
sz = sinf(angles[2]); cz = cosf(angles[2]);
dest[0][0] = cy * cz - sx * sy * sz;
dest[0][1] = cz * sx * sy + cy * sz;
dest[0][2] =-cx * sy;
dest[1][0] =-cx * sz;
dest[1][1] = cx * cz;
dest[1][2] = sx;
dest[2][0] = cz * sy + cy * sx * sz;
dest[2][1] =-cy * cz * sx + sy * sz;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
czsx = cz * sx;
cxcz = cx * cz;
sysz = sy * sz;
dest[0][0] = cy * cz;
dest[0][1] = cy * sz;
dest[0][2] = -sy;
dest[1][0] = czsx * sy - cx * sz;
dest[1][1] = cxcz + sx * sysz;
dest[1][2] = cy * sx;
dest[2][0] = cxcz * sy + sx * sz;
dest[2][1] = -czsx + cx * sysz;
dest[2][2] = cx * cy;
dest[0][3] = 0.0f;
dest[1][3] = 0.0f;
dest[2][3] = 0.0f;
dest[3][0] = 0.0f;
dest[3][1] = 0.0f;
dest[3][2] = 0.0f;
dest[3][3] = 1.0f;
}
/*!
* @brief build rotation matrix from euler angles
*
* @param[in] angles angles as vector (ord parameter spceifies angles order)
* @param[in] angles angles as vector [Xangle, Yangle, Zangle]
* @param[in] ord euler order
* @param[out] dest rotation matrix
*/
@@ -332,71 +370,71 @@ glm_euler_by_order(vec3 angles, glm_euler_sq ord, mat4 dest) {
sysz = sy * sz;
switch (ord) {
case GLM_EULER_XYZ:
dest[0][0] = cycz;
dest[0][1] = cysz;
dest[0][2] =-sy;
dest[1][0] = czsx * sy - cxsz;
dest[1][1] = cxcz + sx * sysz;
dest[1][2] = cysx;
dest[2][0] = cx * czsy + sx * sz;
dest[2][1] =-czsx + cx * sysz;
dest[2][2] = cxcy;
break;
case GLM_EULER_XZY:
dest[0][0] = cycz;
dest[0][1] = sz;
dest[0][2] =-czsy;
dest[1][0] = sx * sy - cx * cysz;
dest[1][1] = cxcz;
dest[1][2] = cysx + cx * sysz;
dest[2][0] = cx * sy + cysx * sz;
dest[2][1] =-czsx;
dest[2][2] = cxcy - sx * sysz;
dest[0][0] = cycz;
dest[0][1] = sx * sy + cx * cysz;
dest[0][2] = -cx * sy + cysx * sz;
dest[1][0] = -sz;
dest[1][1] = cxcz;
dest[1][2] = czsx;
dest[2][0] = czsy;
dest[2][1] = -cysx + cx * sysz;
dest[2][2] = cxcy + sx * sysz;
break;
case GLM_EULER_ZXY:
dest[0][0] = cycz + sx * sysz;
dest[0][1] = cxsz;
dest[0][2] =-czsy + cysx * sz;
dest[1][0] = czsx * sy - cysz;
dest[1][1] = cxcz;
dest[1][2] = cycz * sx + sysz;
dest[2][0] = cx * sy;
dest[2][1] =-sx;
dest[2][2] = cxcy;
break;
case GLM_EULER_ZYX:
dest[0][0] = cycz;
dest[0][1] = czsx * sy + cxsz;
dest[0][2] =-cx * czsy + sx * sz;
dest[1][0] =-cysz;
dest[1][1] = cxcz - sx * sysz;
dest[1][2] = czsx + cx * sysz;
dest[2][0] = sy;
dest[2][1] =-cysx;
dest[2][2] = cxcy;
case GLM_EULER_XYZ:
dest[0][0] = cycz;
dest[0][1] = czsx * sy + cxsz;
dest[0][2] = -cx * czsy + sx * sz;
dest[1][0] = -cysz;
dest[1][1] = cxcz - sx * sysz;
dest[1][2] = czsx + cx * sysz;
dest[2][0] = sy;
dest[2][1] = -cysx;
dest[2][2] = cxcy;
break;
case GLM_EULER_YXZ:
dest[0][0] = cycz - sx * sysz;
dest[0][1] = czsx * sy + cysz;
dest[0][2] =-cx * sy;
dest[1][0] =-cxsz;
dest[1][1] = cxcz;
dest[1][2] = sx;
dest[2][0] = czsy + cysx * sz;
dest[2][1] =-cycz * sx + sysz;
dest[2][2] = cxcy;
dest[0][0] = cycz + sx * sysz;
dest[0][1] = cxsz;
dest[0][2] = -czsy + cysx * sz;
dest[1][0] = czsx * sy - cysz;
dest[1][1] = cxcz;
dest[1][2] = cycz * sx + sysz;
dest[2][0] = cx * sy;
dest[2][1] = -sx;
dest[2][2] = cxcy;
break;
case GLM_EULER_YZX:
dest[0][0] = cycz;
dest[0][1] = sx * sy + cx * cysz;
dest[0][2] =-cx * sy + cysx * sz;
dest[1][0] =-sz;
dest[1][1] = cxcz;
dest[1][2] = czsx;
dest[2][0] = czsy;
dest[2][1] =-cysx + cx * sysz;
dest[2][2] = cxcy + sx * sysz;
dest[0][0] = cycz;
dest[0][1] = sz;
dest[0][2] = -czsy;
dest[1][0] = sx * sy - cx * cysz;
dest[1][1] = cxcz;
dest[1][2] = cysx + cx * sysz;
dest[2][0] = cx * sy + cysx * sz;
dest[2][1] = -czsx;
dest[2][2] = cxcy - sx * sysz;
break;
case GLM_EULER_ZXY:
dest[0][0] = cycz - sx * sysz;
dest[0][1] = czsx * sy + cysz;
dest[0][2] = -cx * sy;
dest[1][0] = -cxsz;
dest[1][1] = cxcz;
dest[1][2] = sx;
dest[2][0] = czsy + cysx * sz;
dest[2][1] = -cycz * sx + sysz;
dest[2][2] = cxcy;
break;
case GLM_EULER_ZYX:
dest[0][0] = cycz;
dest[0][1] = cysz;
dest[0][2] = -sy;
dest[1][0] = czsx * sy - cxsz;
dest[1][1] = cxcz + sx * sysz;
dest[1][2] = cysx;
dest[2][0] = cx * czsy + sx * sz;
dest[2][1] = -czsx + cx * sysz;
dest[2][2] = cxcy;
break;
}

29
include/cglm/io.h
View File

@@ -171,4 +171,33 @@ glm_versor_print(versor vec,
#undef m
}
CGLM_INLINE
void
glm_aabb_print(vec3 bbox[2],
const char * __restrict tag,
FILE * __restrict ostream) {
int i, j;
#define m 3
fprintf(ostream, "AABB (%s):\n", tag ? tag: "float");
for (i = 0; i < 2; i++) {
fprintf(ostream, "\t|");
for (j = 0; j < m; j++) {
fprintf(ostream, "%0.4f", bbox[i][j]);
if (j != m - 1)
fprintf(ostream, "\t");
}
fprintf(ostream, "|\n");
}
fprintf(ostream, "\n");
#undef m
}
#endif /* cglm_io_h */

30
include/cglm/util.h
View File

@@ -21,7 +21,9 @@
#include "common.h"
/*!
* @brief get sign of 32 bit integer as +1 or -1
* @brief get sign of 32 bit integer as +1, -1, 0
*
* Important: It returns 0 for zero input
*
* @param val integer value
*/
@@ -31,6 +33,19 @@ glm_sign(int val) {
return ((val >> 31) - (-val >> 31));
}
/*!
* @brief get sign of 32 bit float as +1, -1, 0
*
* Important: It returns 0 for zero/NaN input
*
* @param val float value
*/
CGLM_INLINE
float
glm_signf(float val) {
return (val > 0.0f) - (val < 0.0f);
}
/*!
* @brief convert degree to radians
*
@@ -115,4 +130,17 @@ glm_max(float a, float b) {
return b;
}
/*!
* @brief clamp a number between min and max
*
* @param[in] val value to clamp
* @param[in] minVal minimum value
* @param[in] maxVal maximum value
*/
CGLM_INLINE
float
glm_clamp(float val, float minVal, float maxVal) {
return glm_min(glm_max(val, minVal), maxVal);
}
#endif /* cglm_util_h */

16
include/cglm/vec3.h
View File

@@ -46,6 +46,7 @@
CGLM_INLINE void glm_vec_maxv(vec3 v1, vec3 v2, vec3 dest);
CGLM_INLINE void glm_vec_minv(vec3 v1, vec3 v2, vec3 dest);
CGLM_INLINE void glm_vec_ortho(vec3 v, vec3 dest);
CGLM_INLINE void glm_vec_clamp(vec3 v, float minVal, float maxVal);
Convenient:
CGLM_INLINE void glm_cross(vec3 a, vec3 b, vec3 d);
@@ -478,6 +479,21 @@ glm_vec_ortho(vec3 v, vec3 dest) {
dest[2] = v[0] - v[1];
}
/*!
* @brief clamp vector's individual members between min and max values
*
* @param[in, out] v vector
* @param[in] minVal minimum value
* @param[in] maxVal maximum value
*/
CGLM_INLINE
void
glm_vec_clamp(vec3 v, float minVal, float maxVal) {
v[0] = glm_clamp(v[0], minVal, maxVal);
v[1] = glm_clamp(v[1], minVal, maxVal);
v[2] = glm_clamp(v[2], minVal, maxVal);
}
/*!
* @brief vec3 cross product
*

17
include/cglm/vec4.h
View File

@@ -40,6 +40,7 @@
CGLM_INLINE float glm_vec4_distance(vec4 v1, vec4 v2);
CGLM_INLINE void glm_vec4_maxv(vec4 v1, vec4 v2, vec4 dest);
CGLM_INLINE void glm_vec4_minv(vec4 v1, vec4 v2, vec4 dest);
CGLM_INLINE void glm_vec4_clamp(vec4 v, float minVal, float maxVal);
*/
#ifndef cglm_vec4_h
@@ -373,4 +374,20 @@ glm_vec4_minv(vec4 v1, vec4 v2, vec4 dest) {
dest[3] = glm_min(v1[3], v2[3]);
}
/*!
* @brief clamp vector's individual members between min and max values
*
* @param[in, out] v vector
* @param[in] minVal minimum value
* @param[in] maxVal maximum value
*/
CGLM_INLINE
void
glm_vec4_clamp(vec4 v, float minVal, float maxVal) {
v[0] = glm_clamp(v[0], minVal, maxVal);
v[1] = glm_clamp(v[1], minVal, maxVal);
v[2] = glm_clamp(v[2], minVal, maxVal);
v[3] = glm_clamp(v[3], minVal, maxVal);
}
#endif /* cglm_vec4_h */

2
include/cglm/version.h
View File

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