Merge pull request #345 from telephone001/ins3_bugfix

Fixed glms_mat4_ins3 bug.
This commit is contained in:
Recep Aslantas
2023-08-30 13:03:16 +03:00
committed by GitHub

View File

@@ -25,7 +25,7 @@
CGLM_INLINE mat4s glms_mat4_zero(void); CGLM_INLINE mat4s glms_mat4_zero(void);
CGLM_INLINE mat3s glms_mat4_pick3(mat4s mat); CGLM_INLINE mat3s glms_mat4_pick3(mat4s mat);
CGLM_INLINE mat3s glms_mat4_pick3t(mat4s mat); CGLM_INLINE mat3s glms_mat4_pick3t(mat4s mat);
CGLM_INLINE mat4s glms_mat4_ins3(mat3s mat); CGLM_INLINE mat4s glms_mat4_ins3(mat3s mat, mat4s dest);
CGLM_INLINE mat4s glms_mat4_mul(mat4s m1, mat4s m2); CGLM_INLINE mat4s glms_mat4_mul(mat4s m1, mat4s m2);
CGLM_INLINE mat4s glms_mat4_mulN(mat4s * __restrict matrices[], uint32_t len); CGLM_INLINE mat4s glms_mat4_mulN(mat4s * __restrict matrices[], uint32_t len);
CGLM_INLINE vec4s glms_mat4_mulv(mat4s m, vec4s v); CGLM_INLINE vec4s glms_mat4_mulv(mat4s m, vec4s v);
@@ -183,14 +183,14 @@ glms_mat4_(pick3t)(mat4s mat) {
* @brief copy mat3 to mat4's upper-left * @brief copy mat3 to mat4's upper-left
* *
* @param[in] mat source * @param[in] mat source
* @param[in] dest destination
* @returns destination * @returns destination
*/ */
CGLM_INLINE CGLM_INLINE
mat4s mat4s
glms_mat4_(ins3)(mat3s mat) { glms_mat4_(ins3)(mat3s mat, mat4s dest) {
mat4s r; glm_mat4_ins3(mat.raw, dest.raw);
glm_mat4_ins3(mat.raw, r.raw); return dest;
return r;
} }
/*! /*!