Skip to content

Commit 6f3bdeb

Browse files
authored
Merge pull request #218 from RobLoach/matrix
Fix Matrix constructor order
2 parents eb70b07 + 78c7a2f commit 6f3bdeb

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

include/Matrix.hpp

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,26 @@ namespace raylib {
1515
*/
1616
class Matrix : public ::Matrix {
1717
public:
18-
Matrix(const ::Matrix& mat) {
19-
set(mat);
18+
Matrix(const ::Matrix& mat) : ::Matrix{
19+
mat.m0, mat.m4, mat.m8, mat.m12,
20+
mat.m1, mat.m5, mat.m9, mat.m13,
21+
mat.m2, mat.m6, mat.m10, mat.m14,
22+
mat.m3, mat.m7, mat.m11, mat.m15} {
23+
// Nothing.
2024
}
2125

22-
// TODO: Fix the ordering of the Matrix properties.
2326
Matrix(
24-
float m0 = 0, float m1 = 0, float m2 = 0, float m3 = 0, float m4 = 0, float m5 = 0,
25-
float m6 = 0, float m7 = 0, float m8 = 0, float m9 = 0, float m10 = 0, float m11 = 0,
26-
float m12 = 0, float m13 = 0, float m14 = 0,
27-
float m15 = 0) : ::Matrix{m0, m1, m2, m3, m4, m5, m6, m7, m8, m9, m10, m11, m12, m13, m14, m15} {}
27+
float m0 = 0, float m4 = 0, float m8 = 0, float m12 = 0,
28+
float m1 = 0, float m5 = 0, float m9 = 0, float m13 = 0,
29+
float m2 = 0, float m6 = 0, float m10 = 0, float m14 = 0,
30+
float m3 = 0, float m7 = 0, float m11 = 0, float m15 = 0) :
31+
::Matrix{
32+
m0, m4, m8, m12,
33+
m1, m5, m9, m13,
34+
m2, m6, m10, m14,
35+
m3, m7, m11, m15} {
36+
// Nothing.
37+
}
2838

2939
GETTERSETTER(float, M0, m0)
3040
GETTERSETTER(float, M1, m1)

0 commit comments

Comments
 (0)