YourWishes/cglm
1
0
Fork 0
mirror of https://github.com/recp/cglm.git synced 2026-02-17 03:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve and add comments to matrix decompositions

Browse Source
This commit is contained in:
Recep Aslantas
2017-05-21 20:48:17 +03:00
parent ed5ffc43cb
commit eafcd1d103
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/cglm-affine.h
View File

@@ -328,6 +328,7 @@ glm_uniscaled(mat4 m) {
/*! /*!
* @brief decompose rotation matrix (mat4) and scale vector [Sx, Sy, Sz] * @brief decompose rotation matrix (mat4) and scale vector [Sx, Sy, Sz]
* DON'T pass projected matrix here
* *
* @param[in] m affine transform * @param[in] m affine transform
* @param[out] r rotation matrix * @param[out] r rotation matrix
@@ -352,18 +353,21 @@ glm_decompose_rs(mat4 m, mat4 r, vec3 s) {
glm_vec4_scale(r[1], 1.0f/s[1], r[1]); glm_vec4_scale(r[1], 1.0f/s[1], r[1]);
glm_vec4_scale(r[2], 1.0f/s[2], r[2]); glm_vec4_scale(r[2], 1.0f/s[2], r[2]);
/* Note from Apple Open Source (asume that the matrix is orthonormal):
check for a coordinate system flip. If the determinant
is -1, then negate the matrix and the scaling factors. */
glm_vec_cross(m[0], m[1], v); glm_vec_cross(m[0], m[1], v);
if (glm_vec_dot(v, m[2]) < 0.0f) { if (glm_vec_dot(v, m[2]) < 0.0f) {
glm_vec4_scale(r[0], -1.0f, r[0]); glm_vec4_flipsign(r[0]);
glm_vec4_scale(r[1], -1.0f, r[1]); glm_vec4_flipsign(r[1]);
glm_vec4_scale(r[2], -1.0f, r[2]); glm_vec4_flipsign(r[2]);
glm_vec_flipsign(s);
glm_vec_scale(s, -1.0f, s);
} }
} }
/*! /*!
* @brief decompose affine transform * @brief decompose affine transform, TODO: extract shear factors.
* DON'T pass projected matrix here
* *
* @param[in] m affine transfrom * @param[in] m affine transfrom
* @param[out] t translation vector * @param[out] t translation vector