mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 10:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1142 from thp/recompose

Browse Source 
gtx_matrix_decompose: Add glm::recompose() #1142
This commit is contained in:
Christophe 2023-08-18 14:55:41 +02:00 committed by GitHub
commit 99fe1c8f7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/gtx/matrix_decompose.hpp
View File

@ -40,6 +40,12 @@ namespace glm
mat<4, 4, T, Q> const& modelMatrix, mat<4, 4, T, Q> const& modelMatrix,
vec<3, T, Q> & scale, qua<T, Q> & orientation, vec<3, T, Q> & translation, vec<3, T, Q> & skew, vec<4, T, Q> & perspective); vec<3, T, Q> & scale, qua<T, Q> & orientation, vec<3, T, Q> & translation, vec<3, T, Q> & skew, vec<4, T, Q> & perspective);
// Recomposes a model matrix from a previously-decomposed matrix
template <typename T, qualifier Q>
GLM_FUNC_DECL mat<4, 4, T, Q> recompose(
vec<3, T, Q> const& scale, qua<T, Q> const& orientation, vec<3, T, Q> const& translation,
vec<3, T, Q> const& skew, vec<4, T, Q> const& perspective);
/// @} /// @}
}//namespace glm }//namespace glm

42
glm/gtx/matrix_decompose.inl
View File

@ -2,6 +2,7 @@
#include "../gtc/constants.hpp" #include "../gtc/constants.hpp"
#include "../gtc/epsilon.hpp" #include "../gtc/epsilon.hpp"
#include "../gtx/transform.hpp"
namespace glm{ namespace glm{
namespace detail namespace detail
@ -189,4 +190,45 @@ namespace detail
return true; return true;
} }
// Recomposes a model matrix from a previously-decomposed matrix
// http://www.opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
// https://stackoverflow.com/a/75573092/1047040
template <typename T, qualifier Q>
GLM_FUNC_DECL mat<4, 4, T, Q> recompose(
vec<3, T, Q> const& scale, qua<T, Q> const& orientation, vec<3, T, Q> const& translation,
vec<3, T, Q> const& skew, vec<4, T, Q> const& perspective)
{
glm::mat4 m = glm::mat4(1.f);
m[0][3] = perspective.x;
m[1][3] = perspective.y;
m[2][3] = perspective.z;
m[3][3] = perspective.w;
m *= glm::translate(translation);
m *= glm::mat4_cast(orientation);
if (skew.x) {
glm::mat4 tmp { 1.f };
tmp[2][1] = skew.x;
m *= tmp;
}
if (skew.y) {
glm::mat4 tmp { 1.f };
tmp[2][0] = skew.y;
m *= tmp;
}
if (skew.z) {
glm::mat4 tmp { 1.f };
tmp[1][0] = skew.z;
m *= tmp;
}
m *= glm::scale(scale);
return m;
}
}//namespace glm }//namespace glm

2
test/gtx/gtx_matrix_decompose.cpp
View File

@ -15,5 +15,7 @@ int main()
glm::decompose(Matrix, Scale, Orientation, Translation, Skew, Perspective); glm::decompose(Matrix, Scale, Orientation, Translation, Skew, Perspective);
glm::mat4 Out = glm::recompose(Scale, Orientation, Translation, Skew, Perspective);
return Error; return Error;
} }