Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 08:10:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Mat4.createFromColumns

Browse source
This commit is contained in:
Anthony J. Thibault 2017-02-07 12:03:28 -08:00
parent 2952be5fc8
commit 7d630f6c9a
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/script-engine/src/Mat4.cpp
View file

@ -26,6 +26,10 @@ glm::mat4 Mat4::createFromScaleRotAndTrans(const glm::vec3& scale, const glm::qu
return createMatFromScaleQuatAndPos(scale, rot, trans); return createMatFromScaleQuatAndPos(scale, rot, trans);
} }
glm::mat4 Mat4::createFromColumns(const glm::vec4& col0, const glm::vec4& col1, const glm::vec4& col2, const glm::vec4& col3) const {
return glm::mat4(col0, col1, col2, col3);
}
glm::vec3 Mat4::extractTranslation(const glm::mat4& m) const { glm::vec3 Mat4::extractTranslation(const glm::mat4& m) const {
return ::extractTranslation(m); return ::extractTranslation(m);
} }

2
libraries/script-engine/src/Mat4.h
View file

@ -23,8 +23,10 @@ class Mat4 : public QObject {
public slots: public slots:
glm::mat4 multiply(const glm::mat4& m1, const glm::mat4& m2) const; glm::mat4 multiply(const glm::mat4& m1, const glm::mat4& m2) const;
glm::mat4 createFromRotAndTrans(const glm::quat& rot, const glm::vec3& trans) const; glm::mat4 createFromRotAndTrans(const glm::quat& rot, const glm::vec3& trans) const;
glm::mat4 createFromScaleRotAndTrans(const glm::vec3& scale, const glm::quat& rot, const glm::vec3& trans) const; glm::mat4 createFromScaleRotAndTrans(const glm::vec3& scale, const glm::quat& rot, const glm::vec3& trans) const;
glm::mat4 createFromColumns(const glm::vec4& col0, const glm::vec4& col1, const glm::vec4& col2, const glm::vec4& col3) const;
glm::vec3 extractTranslation(const glm::mat4& m) const; glm::vec3 extractTranslation(const glm::mat4& m) const;
glm::quat extractRotation(const glm::mat4& m) const; glm::quat extractRotation(const glm::mat4& m) const;