josh/j3ml
1
0
Fork 1
Code Issues 12 Pull Requests Actions Packages Projects Releases 41 Wiki Activity

Implement Matrix4x4::RotateX() RotateY() RotateZ()
Some checks failed
Run tests / Explore-Gitea-Actions (push) Failing after 34s
Details
Build Docs With Doxygen / Explore-Gitea-Actions (push) Successful in 34s
Details

Browse Source
This commit is contained in:
josh
2024-05-27 11:11:07 -04:00
parent a78b8208e2
commit ee86082c84
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/J3ML/LinearAlgebra/Matrix4x4.cpp
View File

@@ -889,6 +889,49 @@ namespace J3ML::LinearAlgebra {
return Matrix4x4::Translate(translate) * Matrix4x4(rotate) * Matrix4x4::Scale(scale);
}
void Matrix4x4::SetCol3(int col, float x, float y, float z) {
// TODO: implement assertations
At(0, col) = x;
At(1, col) = y;
At(2, col) = z;
}
Matrix4x4 Matrix4x4::RotateZ(float radians) {
Matrix4x4 r;
r.SetRotatePartZ(radians);
r.SetRow(3, 0, 0, 0, 1);
r.SetCol3(3, 0, 0, 0);
return r;
}
Matrix4x4 Matrix4x4::RotateZ(float radians, const Vector3 &pointOnAxis) {
return Matrix4x4::Translate(pointOnAxis) * RotateY(radians) * Matrix4x4::Translate(-pointOnAxis);
}
Matrix4x4 Matrix4x4::RotateY(float radians) {
Matrix4x4 r;
r.SetRotatePartY(radians);
r.SetRow(3, 0, 0, 0, 1);
r.SetCol3(3, 0, 0, 0);
return r;
}
Matrix4x4 Matrix4x4::RotateY(float radians, const Vector3 &pointOnAxis) {
return Matrix4x4::Translate(pointOnAxis) * RotateY(radians) * Matrix4x4::Translate(-pointOnAxis);
}
Matrix4x4 Matrix4x4::RotateX(float radians) {
Matrix4x4 r;
r.SetRotatePartX(radians);
r.SetRow(3, 0, 0, 0, 1);
r.SetCol3(3, 0, 0, 0);
return r;
}
Matrix4x4 Matrix4x4::RotateX(float radians, const Vector3 &pointOnAxis) {
return Matrix4x4::Translate(pointOnAxis) * RotateX(radians) * Matrix4x4::Translate(-pointOnAxis);
}
Matrix4x4 Matrix4x4::Scale(const Vector3 &scale) {
Matrix4x4 m;
m.SetRow(0, scale.x, 0, 0, 0);