RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 19:27:44 +00:00
Code Issues Activity Actions

LibWeb: Fix DOMMatrix Gfx::Matrix row/column ordering

Browse source 
The matrix used in the spec is column-major but Gfx::Matrix4x4 is
row-major so we need to transpose the values. This will fix internal
operations on that matrix. Because we also transposed the readonly
matrix property getters the matrix is again transposed when reading
so the JavaScript world only sees a column-major matrix.
This commit is contained in:
Bastiaan van der Plaat 2023-08-22 09:46:02 +02:00 • committed by Jelle Raaijmakers
parent b4ae719664
commit 57a1d99cf4
3 changed files with 53 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Userland/Libraries/LibWeb/Geometry/DOMMatrixReadOnly.h
View file

@ -55,20 +55,20 @@ public:
// https://drafts.fxtf.org/geometry/#dommatrix-attributes
double m11() const { return m_matrix.elements()[0][0]; }
double m12() const { return m_matrix.elements()[0][1]; }
double m13() const { return m_matrix.elements()[0][2]; }
double m14() const { return m_matrix.elements()[0][3]; }
double m21() const { return m_matrix.elements()[1][0]; }
double m12() const { return m_matrix.elements()[1][0]; }
double m13() const { return m_matrix.elements()[2][0]; }
double m14() const { return m_matrix.elements()[3][0]; }
double m21() const { return m_matrix.elements()[0][1]; }
double m22() const { return m_matrix.elements()[1][1]; }
double m23() const { return m_matrix.elements()[1][2]; }
double m24() const { return m_matrix.elements()[1][3]; }
double m31() const { return m_matrix.elements()[2][0]; }
double m32() const { return m_matrix.elements()[2][1]; }
double m23() const { return m_matrix.elements()[2][1]; }
double m24() const { return m_matrix.elements()[3][1]; }
double m31() const { return m_matrix.elements()[0][2]; }
double m32() const { return m_matrix.elements()[1][2]; }
double m33() const { return m_matrix.elements()[2][2]; }
double m34() const { return m_matrix.elements()[2][3]; }
double m41() const { return m_matrix.elements()[3][0]; }
double m42() const { return m_matrix.elements()[3][1]; }
double m43() const { return m_matrix.elements()[3][2]; }
double m34() const { return m_matrix.elements()[3][2]; }
double m41() const { return m_matrix.elements()[0][3]; }
double m42() const { return m_matrix.elements()[1][3]; }
double m43() const { return m_matrix.elements()[2][3]; }
double m44() const { return m_matrix.elements()[3][3]; }
double a() const { return m11(); }
@ -95,7 +95,9 @@ protected:
DOMMatrixReadOnly(JS::Realm&, Optional<Variant<String, Vector<double>>> const& init);
DOMMatrixReadOnly(JS::Realm&, DOMMatrixReadOnly const& other);
// NOTE: The matrix used in the spec is column-major (https://drafts.fxtf.org/geometry/#4x4-abstract-matrix) but Gfx::Matrix4x4 is row-major so we need to transpose the values.
Gfx::DoubleMatrix4x4 m_matrix { Gfx::DoubleMatrix4x4::identity() };
bool m_is_2d { true };
private: