Sat, 24 Mar 2018 16:11:42 +0200
some python cleanup
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
1 | /* |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
2 | * LDForge: LDraw parts authoring CAD |
1326 | 3 | * Copyright (C) 2013 - 2018 Teemu Piippo |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
4 | * |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
5 | * This program is free software: you can redistribute it and/or modify |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
6 | * it under the terms of the GNU General Public License as published by |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
7 | * the Free Software Foundation, either version 3 of the License, or |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
8 | * (at your option) any later version. |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
9 | * |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
10 | * This program is distributed in the hope that it will be useful, |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
13 | * GNU General Public License for more details. |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
14 | * |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
15 | * You should have received a copy of the GNU General Public License |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
17 | */ |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
18 | |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
19 | #include "../basics.h" |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
20 | #include "../format.h" |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
21 | #include "matrix.h" |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
22 | |
1070
292c64cb2a75
Moved the identity matrix constant into Matrix's namespace
Teemu Piippo <teemu@hecknology.net>
parents:
1069
diff
changeset
|
23 | const Matrix Matrix::identity {1, 0, 0, 0, 1, 0, 0, 0, 1}; |
292c64cb2a75
Moved the identity matrix constant into Matrix's namespace
Teemu Piippo <teemu@hecknology.net>
parents:
1069
diff
changeset
|
24 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
25 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
26 | * Default-constructor for a matrix |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
27 | */ |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
28 | Matrix::Matrix() : |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
29 | m_values{0} {} |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
30 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
31 | /* |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
32 | * Constructs a matrix from a single fill value. |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
33 | */ |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
34 | Matrix::Matrix (double fillvalue) : |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
35 | m_values {fillvalue} {} |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
36 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
37 | /* |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
38 | * Constructs a matrix from an initializer list. |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
39 | * Note: the initializer list must have exactly 9 values. |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
40 | */ |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
41 | Matrix::Matrix (const std::initializer_list<double>& values) |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
42 | { |
1069
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
43 | int i = 0; |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
44 | |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
45 | for (double value : values) |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
46 | { |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
47 | if (i < 9) |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
48 | m_values[i++] = value; |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
49 | else |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
50 | break; |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
51 | } |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
52 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
53 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
54 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
55 | * Returns a string representation of the matrix |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
56 | */ |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
57 | QString Matrix::toString() const |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
58 | { |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
59 | QString val; |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
60 | |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
61 | for (int i = 0; i < 9; ++i) |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
62 | { |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
63 | if (i > 0) |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
64 | val += ' '; |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
65 | |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
66 | val += QString::number (m_values[i]); |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
67 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
68 | |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
69 | return val; |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
70 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
71 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
72 | /* |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
73 | * Fills the matrix with zeros |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
74 | */ |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
75 | void Matrix::zero() |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
76 | { |
1069
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
77 | for (double& value : m_values) |
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
78 | value = 0; |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
79 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
80 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
81 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
82 | * Performs matrix multiplication. |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
83 | * Note: A*B is not equivalent to B*A! |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
84 | */ |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
85 | Matrix Matrix::multiply (const Matrix& other) const |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
86 | { |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
87 | Matrix result; |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
88 | |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
89 | for (int i = 0; i < 3; ++i) |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
90 | for (int j = 0; j < 3; ++j) |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
91 | for (int k = 0; k < 3; ++k) |
1069
220cde0fa2d9
Removed the dangerous C-array constructor from the matrix - no need for it anyway since the matrix already is an array of doubles.
Teemu Piippo <teemu@hecknology.net>
parents:
1068
diff
changeset
|
92 | result(i, j) += (*this)(i, k) * other(k, j); |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
93 | |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
94 | return result; |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
95 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
96 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
97 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
98 | * Returns the matrix's determinant |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
99 | */ |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
100 | double Matrix::determinant() const |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
101 | { |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
102 | return (value (0) * value (4) * value (8)) + |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
103 | (value (1) * value (5) * value (6)) + |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
104 | (value (2) * value (3) * value (7)) - |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
105 | (value (2) * value (4) * value (6)) - |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
106 | (value (1) * value (3) * value (8)) - |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
107 | (value (0) * value (5) * value (7)); |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
108 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
109 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
110 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
111 | * Returns a value in matrix value (index math must be done manually) |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
112 | */ |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
113 | double& Matrix::value(int index) |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
114 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
115 | return m_values[index]; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
116 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
117 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
118 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
119 | * Returns a value in matrix value (index math must be done manually) |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
120 | */ |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
121 | const double& Matrix::value(int index) const |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
122 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
123 | return m_values[index]; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
124 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
125 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
126 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
127 | * Performs matrix multiplication |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
128 | */ |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
129 | Matrix Matrix::operator*(const Matrix &other) const |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
130 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
131 | return multiply(other); |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
132 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
133 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
134 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
135 | * Returns a row of the matrix |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
136 | */ |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
137 | Matrix::RowView Matrix::operator[](int row) |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
138 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
139 | return RowView {*this, row}; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
140 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
141 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
142 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
143 | * Returns a row of the matrix |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
144 | */ |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
145 | Matrix::ConstRowView Matrix::operator[](int row) const |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
146 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
147 | return ConstRowView {*this, row}; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
148 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
149 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
150 | /* |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
151 | * Checks whether the two matrices are equal |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
152 | */ |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
153 | bool Matrix::operator==(const Matrix& other) const |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
154 | { |
1065
c8ecddbd99e9
Actually, let's call it countof(). Makes more sense.
Teemu Piippo <teemu@hecknology.net>
parents:
1063
diff
changeset
|
155 | for (int i = 0; i < countof(m_values); ++i) |
1037
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
156 | { |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
157 | if (not qFuzzyCompare(m_values[i], other.m_values[i])) |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
158 | return false; |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
159 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
160 | return true; |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
161 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
162 | |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
163 | /** |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
164 | * @brief Matrix::operator != |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
165 | * @param other |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
166 | * @return whether the two matrices are not equal |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
167 | */ |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
168 | bool Matrix::operator!=(const Matrix& other) const |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
169 | { |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
170 | return not operator==(other); |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
171 | } |
4a9185e94d78
Moved matrix into new source/header pair in types/
Teemu Piippo <teemu@compsta2.com>
parents:
diff
changeset
|
172 | |
1068
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
173 | double& Matrix::operator()(int row, int column) |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
174 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
175 | return m_values[row * 3 + column]; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
176 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
177 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
178 | const double& Matrix::operator()(int row, int column) const |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
179 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
180 | return m_values[row * 3 + column]; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
181 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
182 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
183 | double* Matrix::begin() |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
184 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
185 | return m_values; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
186 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
187 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
188 | const double* Matrix::begin() const |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
189 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
190 | return m_values; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
191 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
192 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
193 | double* Matrix::end() |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
194 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
195 | return m_values + countof(m_values); |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
196 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
197 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
198 | const double* Matrix::end() const |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
199 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
200 | return m_values + countof(m_values); |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
201 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
202 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
203 | Matrix::RowView::RowView(Matrix &matrix, int row) : |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
204 | _matrix {matrix}, |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
205 | _row {row} {} |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
206 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
207 | double& Matrix::RowView::operator[](int column) |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
208 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
209 | return _matrix.value(_row * 3 + column); |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
210 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
211 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
212 | Matrix& Matrix::RowView::matrix() const |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
213 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
214 | return _matrix; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
215 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
216 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
217 | int Matrix::RowView::row() |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
218 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
219 | return _row; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
220 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
221 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
222 | Matrix::ConstRowView::ConstRowView(const Matrix &matrix, int row) : |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
223 | _matrix {matrix}, |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
224 | _row {row} {} |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
225 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
226 | const double& Matrix::ConstRowView::operator[](int column) |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
227 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
228 | return _matrix.value(_row * 3 + column); |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
229 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
230 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
231 | const Matrix& Matrix::ConstRowView::matrix() const |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
232 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
233 | return _matrix; |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
234 | } |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
235 | |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
236 | int Matrix::ConstRowView::row() |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
237 | { |
283de3bd8b0e
Reworked the Matrix interface so that less index math is involved
Teemu Piippo <teemu@hecknology.net>
parents:
1065
diff
changeset
|
238 | return _row; |
1151
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
239 | } |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
240 | |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
241 | Matrix Matrix::fromRotationMatrix(const GLRotationMatrix& rotationMatrix) |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
242 | { |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
243 | Matrix result; |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
244 | |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
245 | for (int i = 0; i < 3; ++i) |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
246 | for (int j = 0; j < 3; ++j) |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
247 | result(i, j) = rotationMatrix(i, j); |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
248 | |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
249 | return result; |
0eddb5bcf25b
Made fixed cameras matrix-based. This simplifies some math.
Teemu Piippo <teemu@hecknology.net>
parents:
1072
diff
changeset
|
250 | } |