mirror of
https://github.com/recp/cglm.git
synced 2026-02-17 03:39:05 +00:00
add some missing non-square matrix funcs in struct api
This commit is contained in:
@@ -11,7 +11,12 @@
|
||||
GLMS_MAT2X4_ZERO
|
||||
|
||||
Functions:
|
||||
CGLM_INLINE mat2x4s glms_mat2x4_zero(void);
|
||||
CGLM_INLINE mat2x4s glms_mat2x4_make(float * __restrict src);
|
||||
CGLM_INLINE mat2s glms_mat2x4_mul(mat2x4s m1, mat4x2s m2);
|
||||
CGLM_INLINE vec2s glms_mat2x4_mulv(mat2x4s m, vec4s v);
|
||||
CGLM_INLINE mat4x2s glms_mat2x4_transpose(mat2x4s m);
|
||||
CGLM_INLINE mat2x4s glms_mat2x4_scale(mat2x4s m, float s);
|
||||
*/
|
||||
|
||||
#ifndef cglms_mat2x4_h
|
||||
@@ -29,6 +34,19 @@
|
||||
/* for C only */
|
||||
#define GLMS_MAT2X4_ZERO ((mat2x4s)GLMS_MAT2X4_ZERO_INIT)
|
||||
|
||||
/*!
|
||||
* @brief make given matrix zero.
|
||||
*
|
||||
* @param[in, out] mat matrix
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat2x4s
|
||||
glms_mat2x4_(zero)(void) {
|
||||
mat2x4s r;
|
||||
glm_mat2x4_zero(r.raw);
|
||||
return r;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief Create mat2x4 matrix from pointer
|
||||
*
|
||||
@@ -43,4 +61,69 @@ glms_mat2x4_(make)(float * __restrict src) {
|
||||
return r;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief multiply m1 and m2 to dest
|
||||
*
|
||||
* m1, m2 and dest matrices can be same matrix, it is possible to write this:
|
||||
*
|
||||
* @code
|
||||
* glm_mat2x4_mul(m, m, m);
|
||||
* @endcode
|
||||
*
|
||||
* @param[in] m1 left matrix
|
||||
* @param[in] m2 right matrix
|
||||
* @param[out] dest destination matrix
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat2s
|
||||
glms_mat2x4_(mul)(mat2x4s m1, mat4x2s m2) {
|
||||
mat2s r;
|
||||
glm_mat2x4_mul(m1.raw, m2.raw, r.raw);
|
||||
return r;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief multiply matrix with column vector and store in dest vector
|
||||
*
|
||||
* @param[in] m matrix (left)
|
||||
* @param[in] v vector (right, column vector)
|
||||
* @param[out] dest result vector
|
||||
*/
|
||||
CGLM_INLINE
|
||||
vec2s
|
||||
glms_mat2x4_(mulv)(mat2x4s m, vec4s v) {
|
||||
vec2s r;
|
||||
glm_mat2x4_mulv(m.raw, v.raw, r.raw);
|
||||
return r;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief transpose matrix and store in dest
|
||||
*
|
||||
* @param[in] m matrix
|
||||
* @param[out] dest result
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat4x2s
|
||||
glms_mat2x4_(transpose)(mat2x4s m) {
|
||||
mat4x2s r;
|
||||
glm_mat2x4_transpose(m.raw, r.raw);
|
||||
return r;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief scale (multiply with scalar) matrix
|
||||
*
|
||||
* multiply matrix with scalar
|
||||
*
|
||||
* @param[in, out] m matrix
|
||||
* @param[in] s scalar
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat2x4s
|
||||
glms_mat2x4_(scale)(mat2x4s m, float s) {
|
||||
glm_mat2x4_scale(m.raw, s);
|
||||
return m;
|
||||
}
|
||||
|
||||
#endif /* cglms_mat2x4_h */
|
||||
|
||||
Reference in New Issue
Block a user