mirror of
https://github.com/recp/cglm.git
synced 2026-01-01 05:06:13 +00:00
mat4x3: add tables to docs & fix comments
Signed-off-by: Vincent Davis Jr <vince@underview.tech>
This commit is contained in:
Vincent Davis Jr
@@ -15,11 +15,11 @@ extern "C" {
|
||||
|
||||
CGLM_EXPORT
|
||||
void
|
||||
glmc_mat4x3_copy(mat4x3 mat, mat4x3 dest);
|
||||
glmc_mat4x3_copy(mat4x3 src, mat4x3 dest);
|
||||
|
||||
CGLM_EXPORT
|
||||
void
|
||||
glmc_mat4x3_zero(mat4x3 mat);
|
||||
glmc_mat4x3_zero(mat4x3 m);
|
||||
|
||||
CGLM_EXPORT
|
||||
void
|
||||
@@ -35,7 +35,7 @@ glmc_mat4x3_mulv(mat4x3 m, vec4 v, vec3 dest);
|
||||
|
||||
CGLM_EXPORT
|
||||
void
|
||||
glmc_mat4x3_transpose(mat4x3 m, mat3x4 dest);
|
||||
glmc_mat4x3_transpose(mat4x3 src, mat3x4 dest);
|
||||
|
||||
CGLM_EXPORT
|
||||
void
|
||||
|
||||
@@ -11,12 +11,12 @@
|
||||
GLM_MAT4X3_ZERO
|
||||
|
||||
Functions:
|
||||
CGLM_INLINE void glm_mat4x3_copy(mat4x3 mat, mat4x3 dest);
|
||||
CGLM_INLINE void glm_mat4x3_zero(mat4x3 mat);
|
||||
CGLM_INLINE void glm_mat4x3_copy(mat4x3 src, mat4x3 dest);
|
||||
CGLM_INLINE void glm_mat4x3_zero(mat4x3 m);
|
||||
CGLM_INLINE void glm_mat4x3_make(const float * __restrict src, mat4x3 dest);
|
||||
CGLM_INLINE void glm_mat4x3_mul(mat4x3 m1, mat3x4 m2, mat3 dest);
|
||||
CGLM_INLINE void glm_mat4x3_mulv(mat4x3 m, vec4 v, vec3 dest);
|
||||
CGLM_INLINE void glm_mat4x3_transpose(mat4x3 m, mat3x4 dest);
|
||||
CGLM_INLINE void glm_mat4x3_transpose(mat4x3 src, mat3x4 dest);
|
||||
CGLM_INLINE void glm_mat4x3_scale(mat4x3 m, float s);
|
||||
*/
|
||||
|
||||
@@ -32,48 +32,37 @@
|
||||
#define GLM_MAT4X3_ZERO GLM_MAT4X3_ZERO_INIT
|
||||
|
||||
/*!
|
||||
* @brief copy all members of [mat] to [dest]
|
||||
* @brief Copy mat4x3 (src) to mat4x3 (dest).
|
||||
*
|
||||
* @param[in] mat source
|
||||
* @param[out] dest destination
|
||||
* @param[in] src mat4x3 (left)
|
||||
* @param[out] dest destination (result, mat4x3)
|
||||
*/
|
||||
CGLM_INLINE
|
||||
void
|
||||
glm_mat4x3_copy(mat4x3 mat, mat4x3 dest) {
|
||||
dest[0][0] = mat[0][0];
|
||||
dest[0][1] = mat[0][1];
|
||||
dest[0][2] = mat[0][2];
|
||||
|
||||
dest[1][0] = mat[1][0];
|
||||
dest[1][1] = mat[1][1];
|
||||
dest[1][2] = mat[1][2];
|
||||
|
||||
dest[2][0] = mat[2][0];
|
||||
dest[2][1] = mat[2][1];
|
||||
dest[2][2] = mat[2][2];
|
||||
|
||||
dest[3][0] = mat[3][0];
|
||||
dest[3][1] = mat[3][1];
|
||||
dest[3][2] = mat[3][2];
|
||||
glm_mat4x3_copy(mat4x3 src, mat4x3 dest) {
|
||||
glm_vec3_copy(src[0], dest[0]);
|
||||
glm_vec3_copy(src[1], dest[1]);
|
||||
glm_vec3_copy(src[2], dest[2]);
|
||||
glm_vec3_copy(src[3], dest[3]);
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief make given matrix zero.
|
||||
* @brief Zero out the mat4x3 (m).
|
||||
*
|
||||
* @param[in, out] mat matrix
|
||||
* @param[in, out] mat4x3 (src, dest)
|
||||
*/
|
||||
CGLM_INLINE
|
||||
void
|
||||
glm_mat4x3_zero(mat4x3 mat) {
|
||||
glm_mat4x3_zero(mat4x3 m) {
|
||||
CGLM_ALIGN_MAT mat4x3 t = GLM_MAT4X3_ZERO_INIT;
|
||||
glm_mat4x3_copy(t, mat);
|
||||
glm_mat4x3_copy(t, m);
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief Create mat4x3 matrix from pointer
|
||||
* @brief Create mat4x3 (dest) from pointer (src).
|
||||
*
|
||||
* @param[in] src pointer to an array of floats
|
||||
* @param[out] dest matrix
|
||||
* @param[in] src pointer to an array of floats (left)
|
||||
* @param[out] dest destination (result, mat4x3)
|
||||
*/
|
||||
CGLM_INLINE
|
||||
void
|
||||
@@ -96,15 +85,15 @@ glm_mat4x3_make(const float * __restrict src, mat4x3 dest) {
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief multiply m1 and m2 to dest
|
||||
* @brief Multiply mat4x3 (m1) by mat3x4 (m2) and store in mat3 (dest).
|
||||
*
|
||||
* @code
|
||||
* glm_mat4x3_mul(mat4x3, mat3x4, mat3);
|
||||
* @endcode
|
||||
*
|
||||
* @param[in] m1 left matrix (mat4x3)
|
||||
* @param[in] m2 right matrix (mat3x4)
|
||||
* @param[out] dest destination matrix (mat3)
|
||||
* @param[in] m1 mat4x3 (left)
|
||||
* @param[in] m2 mat3x4 (right)
|
||||
* @param[out] dest destination (result, mat3)
|
||||
*/
|
||||
CGLM_INLINE
|
||||
void
|
||||
@@ -132,11 +121,11 @@ glm_mat4x3_mul(mat4x3 m1, mat3x4 m2, mat3 dest) {
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief multiply matrix with column vector and store in dest column vector
|
||||
* @brief Multiply mat4x3 (m) by vec4 (v) and store in vec3 (dest).
|
||||
*
|
||||
* @param[in] m matrix (left)
|
||||
* @param[in] v vector (right, column vector)
|
||||
* @param[out] dest result vector
|
||||
* @param[in] m mat4x3 (left)
|
||||
* @param[in] v vec3 (right, column vector)
|
||||
* @param[out] dest destination (result, column vector)
|
||||
*/
|
||||
CGLM_INLINE
|
||||
void
|
||||
@@ -149,37 +138,24 @@ glm_mat4x3_mulv(mat4x3 m, vec4 v, vec3 dest) {
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief transpose matrix and store in dest
|
||||
* @brief Transpose mat4x3 (src) and store in mat3x4 (dest).
|
||||
*
|
||||
* @param[in] m matrix
|
||||
* @param[out] dest result
|
||||
* @param[in] src mat4x3 (left)
|
||||
* @param[out] dest destination (result, mat3x4)
|
||||
*/
|
||||
CGLM_INLINE
|
||||
void
|
||||
glm_mat4x3_transpose(mat4x3 m, mat3x4 dest) {
|
||||
dest[0][0] = m[0][0];
|
||||
dest[0][1] = m[1][0];
|
||||
dest[0][2] = m[2][0];
|
||||
dest[0][3] = m[3][0];
|
||||
|
||||
dest[1][0] = m[0][1];
|
||||
dest[1][1] = m[1][1];
|
||||
dest[1][2] = m[2][1];
|
||||
dest[1][3] = m[3][1];
|
||||
|
||||
dest[2][0] = m[0][2];
|
||||
dest[2][1] = m[1][2];
|
||||
dest[2][2] = m[2][2];
|
||||
dest[2][3] = m[3][2];
|
||||
glm_mat4x3_transpose(mat4x3 src, mat3x4 dest) {
|
||||
dest[0][0] = src[0][0]; dest[0][1] = src[1][0]; dest[0][2] = src[2][0]; dest[0][3] = src[3][0];
|
||||
dest[1][0] = src[0][1]; dest[1][1] = src[1][1]; dest[1][2] = src[2][1]; dest[1][3] = src[3][1];
|
||||
dest[2][0] = src[0][2]; dest[2][1] = src[1][2]; dest[2][2] = src[2][2]; dest[2][3] = src[3][2];
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief scale (multiply with scalar) matrix
|
||||
* @brief Multiply mat4x3 (m) by scalar constant (s).
|
||||
*
|
||||
* multiply matrix with scalar
|
||||
*
|
||||
* @param[in, out] m matrix
|
||||
* @param[in] s scalar
|
||||
* @param[in, out] m (src, dest)
|
||||
* @param[in] s float (scalar)
|
||||
*/
|
||||
CGLM_INLINE
|
||||
void
|
||||
@@ -189,4 +165,4 @@ glm_mat4x3_scale(mat4x3 m, float s) {
|
||||
m[2][2] *= s; m[3][0] *= s; m[3][1] *= s; m[3][2] *= s;
|
||||
}
|
||||
|
||||
#endif
|
||||
#endif /* cglm_mat4x3_h */
|
||||
|
||||
@@ -35,87 +35,85 @@
|
||||
#define GLMS_MAT4X3_ZERO ((mat4x3s)GLMS_MAT4X3_ZERO_INIT)
|
||||
|
||||
/*!
|
||||
* @brief make given matrix zero.
|
||||
* @brief Zero out the mat4x3s (dest).
|
||||
*
|
||||
* @param[in, out] mat matrix
|
||||
* @return[out] dest constructed mat4x3s from raw pointer
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat4x3s
|
||||
glms_mat4x3_(zero)(void) {
|
||||
mat4x3s r;
|
||||
glm_mat4x3_zero(r.raw);
|
||||
return r;
|
||||
mat4x3s dest;
|
||||
glm_mat4x3_zero(dest.raw);
|
||||
return dest;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief Create mat4x3 matrix from pointer
|
||||
* @brief Create mat4x3s (dest) from pointer (src).
|
||||
*
|
||||
* @param[in] src pointer to an array of floats
|
||||
* @return constructed matrix from raw pointer
|
||||
* @param[in] src pointer to an array of floats
|
||||
* @return[out] dest constructed mat4x3s from raw pointer
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat4x3s
|
||||
glms_mat4x3_(make)(const float * __restrict src) {
|
||||
mat4x3s r;
|
||||
glm_mat4x3_make(src, r.raw);
|
||||
return r;
|
||||
mat4x3s dest;
|
||||
glm_mat4x3_make(src, dest.raw);
|
||||
return dest;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief multiply m1 and m2 to dest
|
||||
* @brief Multiply mat4x3s (m1) by mat3x4s (m2) and store in mat3s (dest).
|
||||
*
|
||||
* @code
|
||||
* r = glms_mat4x3_mul(mat4x3s, mat3x4s);
|
||||
* @endcode
|
||||
*
|
||||
* @param[in] m1 left matrix (mat4x3s)
|
||||
* @param[in] m2 right matrix (mat3x4s)
|
||||
* @returns destination matrix (mat3s)
|
||||
* @param[in] m1 mat4x3s (left)
|
||||
* @param[in] m2 mat3x4s (right)
|
||||
* @return[out] dest constructed mat3s from raw pointers
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat3s
|
||||
glms_mat4x3_(mul)(mat4x3s m1, mat3x4s m2) {
|
||||
mat3s r;
|
||||
glm_mat4x3_mul(m1.raw, m2.raw, r.raw);
|
||||
return r;
|
||||
mat3s dest;
|
||||
glm_mat4x3_mul(m1.raw, m2.raw, dest.raw);
|
||||
return dest;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief multiply matrix with column vector and store in dest vector
|
||||
* @brief Multiply mat4x3s (m) by vec4s (v) and store in vec3s (dest).
|
||||
*
|
||||
* @param[in] m matrix (left)
|
||||
* @param[in] v vector (right, column vector)
|
||||
* @returns destination vector (vec3s)
|
||||
* @param[in] m mat4x3s (left)
|
||||
* @param[in] v vec4s (right, column vector)
|
||||
* @return[out] dest constructed vec3s from raw pointers
|
||||
*/
|
||||
CGLM_INLINE
|
||||
vec3s
|
||||
glms_mat4x3_(mulv)(mat4x3s m, vec4s v) {
|
||||
vec3s r;
|
||||
glm_mat4x3_mulv(m.raw, v.raw, r.raw);
|
||||
return r;
|
||||
vec3s dest;
|
||||
glm_mat4x3_mulv(m.raw, v.raw, dest.raw);
|
||||
return dest;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief transpose matrix and store in dest
|
||||
* @brief Transpose mat4x3s (m) and store in mat3x4s (dest).
|
||||
*
|
||||
* @param[in] m matrix
|
||||
* @param[out] dest result
|
||||
* @param[in] m mat4x3s (left)
|
||||
* @return[out] dest constructed mat3x4s from raw pointers
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat3x4s
|
||||
glms_mat4x3_(transpose)(mat4x3s m) {
|
||||
mat3x4s r;
|
||||
glm_mat4x3_transpose(m.raw, r.raw);
|
||||
return r;
|
||||
mat3x4s dest;
|
||||
glm_mat4x3_transpose(m.raw, dest.raw);
|
||||
return dest;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief scale (multiply with scalar) matrix
|
||||
* @brief Multiply mat4x3s (m) by scalar constant (s).
|
||||
*
|
||||
* multiply matrix with scalar
|
||||
*
|
||||
* @param[in, out] m matrix
|
||||
* @param[in] s scalar
|
||||
* @param[in, out] m mat4x3s (src, dest)
|
||||
* @param[in] s float (scalar)
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat4x3s
|
||||
|
||||
Reference in New Issue
Block a user