thunderbrewhq/typhoon
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/typhoon.git synced 2025-12-12 02:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(matrix): add C44Matrix::RotateAroundZ

Browse source
This commit is contained in:
fallenoak 2020-11-30 17:28:07 -06:00
parent 269c9b9a86
commit f3fe0b6bbe
No known key found for this signature in database
GPG key ID: 7628F8E61AEA070D
3 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tempest/matrix/C44Matrix.cpp
View file

@ -60,6 +60,10 @@ C44Matrix C44Matrix::Inverse(float det) const {
return this->Adjoint() * (1.0f / det); return this->Adjoint() * (1.0f / det);
} }
void C44Matrix::RotateAroundZ(float angle) {
*this = C44Matrix::RotationAroundZ(angle) * *this;
}
C44Matrix operator*(const C44Matrix& l, float a) { C44Matrix operator*(const C44Matrix& l, float a) {
float a0 = l.a0 * a; float a0 = l.a0 * a;
float a1 = l.a1 * a; float a1 = l.a1 * a;

1
tempest/matrix/C44Matrix.hpp
View file

@ -46,6 +46,7 @@ class C44Matrix {
C44Matrix Adjoint() const; C44Matrix Adjoint() const;
float Determinant() const; float Determinant() const;
C44Matrix Inverse(float det) const; C44Matrix Inverse(float det) const;
void RotateAroundZ(float angle);
}; };
C44Matrix operator*(const C44Matrix& l, float a); C44Matrix operator*(const C44Matrix& l, float a);

23
test/Matrix.cpp
View file

@ -235,6 +235,29 @@ TEST_CASE("C44Matrix::Inverse", "[matrix]") {
} }
} }
TEST_CASE("C44Matrix::RotateAroundZ", "[matrix]") {
SECTION("rotates around z-axis by given angle") {
auto matrix = C44Matrix(1.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, -1.0f, 0.0f, 1.0f, -1.0f, 1.0f, 0.0f, 20.0f, 30.0f, 40.0f, 1.0f);
matrix.RotateAroundZ(3.1415927f);
CHECK(matrix.a0 == Approx(-1.0f));
CHECK(matrix.a1 == Approx(-1.0f));
CHECK(matrix.a2 == Approx(-1.0f));
CHECK(matrix.a3 == 0.0f);
CHECK(matrix.b0 == Approx(-1.0f));
CHECK(matrix.b1 == Approx(-1.0f));
CHECK(matrix.b2 == Approx(1.0f));
CHECK(matrix.b3 == 0.0f);
CHECK(matrix.c0 == Approx(1.0f));
CHECK(matrix.c1 == Approx(-1.0f));
CHECK(matrix.c2 == Approx(1.0f));
CHECK(matrix.c3 == 0.0f);
CHECK(matrix.d0 == 20.0f);
CHECK(matrix.d1 == 30.0f);
CHECK(matrix.d2 == 40.0f);
CHECK(matrix.d3 == 1.0f);
}
}
TEST_CASE("C44Matrix global operators", "[matrix]") { TEST_CASE("C44Matrix global operators", "[matrix]") {
SECTION("C44Matrix * float") { SECTION("C44Matrix * float") {
auto matrix1 = C44Matrix(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f); auto matrix1 = C44Matrix(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f, 16.0f);