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_MAT4X3_ZERO
|
||||
|
||||
Functions:
|
||||
CGLM_INLINE mat4x3s glms_mat4x3_zero(void);
|
||||
CGLM_INLINE mat4x3s glms_mat4x3_make(float * __restrict src);
|
||||
CGLM_INLINE mat4s glms_mat4x3_mul(mat4x3s m1, mat3x4s m2);
|
||||
CGLM_INLINE vec4s glms_mat4x3_mulv(mat4x3s m, vec3s v);
|
||||
CGLM_INLINE mat3x4s glms_mat4x3_transpose(mat4x3s m);
|
||||
CGLM_INLINE mat4x3s glms_mat4x3_scale(mat4x3s m, float s);
|
||||
*/
|
||||
|
||||
#ifndef cglms_mat4x3_h
|
||||
@@ -29,6 +34,19 @@
|
||||
/* for C only */
|
||||
#define GLMS_MAT4X3_ZERO ((mat4x3s)GLMS_MAT4X3_ZERO_INIT)
|
||||
|
||||
/*!
|
||||
* @brief make given matrix zero.
|
||||
*
|
||||
* @param[in, out] mat matrix
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat4x3s
|
||||
glms_mat4x3_(zero)(void) {
|
||||
mat4x3s r;
|
||||
glm_mat4x3_zero(r.raw);
|
||||
return r;
|
||||
}
|
||||
|
||||
/*!
|
||||
* @brief Create mat4x3 matrix from pointer
|
||||
*
|
||||
@@ -43,4 +61,69 @@ glms_mat4x3_(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_mat4x3_mul(m, m, m);
|
||||
* @endcode
|
||||
*
|
||||
* @param[in] m1 left matrix
|
||||
* @param[in] m2 right matrix
|
||||
* @param[out] dest destination matrix
|
||||
*/
|
||||
CGLM_INLINE
|
||||
mat4s
|
||||
glms_mat4x3_(mul)(mat4x3s m1, mat3x4s m2) {
|
||||
mat4s r;
|
||||
glm_mat4x3_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
|
||||
vec4s
|
||||
glms_mat4x3_(mulv)(mat4x3s m, vec3s v) {
|
||||
vec4s r;
|
||||
glm_mat4x3_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
|
||||
mat3x4s
|
||||
glms_mat4x3_(transpose)(mat4x3s m) {
|
||||
mat3x4s r;
|
||||
glm_mat4x3_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
|
||||
mat4x3s
|
||||
glms_mat4x3_(scale)(mat4x3s m, float s) {
|
||||
glm_mat4x3_scale(m.raw, s);
|
||||
return m;
|
||||
}
|
||||
|
||||
#endif /* cglms_mat4x3_h */
|
||||
|
||||
Reference in New Issue
Block a user