@@ -129,9 +129,9 @@ class Matrix3X3
129129 * @param rhs
130130 * @return
131131 */
132- Matrix3X3 & multiplyInPlace (SelfType& rhs)
132+ SelfType & multiplyInPlace (SelfType& rhs)
133133 {
134- Matrix3X3 outMat;
134+ SelfType outMat;
135135 outMat[0 ] = m_Data[0 ] * rhs[0 ] + m_Data[1 ] * rhs[3 ] + m_Data[2 ] * rhs[6 ];
136136 outMat[1 ] = m_Data[0 ] * rhs[1 ] + m_Data[1 ] * rhs[4 ] + m_Data[2 ] * rhs[7 ];
137137 outMat[2 ] = m_Data[0 ] * rhs[2 ] + m_Data[1 ] * rhs[5 ] + m_Data[2 ] * rhs[8 ];
@@ -150,9 +150,9 @@ class Matrix3X3
150150 * @param rhs
151151 * @param outMat
152152 */
153- Matrix3X3 operator +(const Matrix3X3& rhs) const
153+ SelfType operator +(const Matrix3X3& rhs) const
154154 {
155- Matrix3X3 outMat;
155+ SelfType outMat;
156156 outMat[0 ] = m_Data[0 ] + rhs[0 ];
157157 outMat[1 ] = m_Data[1 ] + rhs[1 ];
158158 outMat[2 ] = m_Data[2 ] + rhs[2 ];
@@ -170,9 +170,9 @@ class Matrix3X3
170170 * @param rhs
171171 * @param outMat
172172 */
173- Matrix3X3 operator -(const Matrix3X3 & rhs) const
173+ SelfType operator -(const SelfType & rhs) const
174174 {
175- Matrix3X3 outMat;
175+ SelfType outMat;
176176 outMat[0 ] = m_Data[0 ] - rhs[0 ];
177177 outMat[1 ] = m_Data[1 ] - rhs[1 ];
178178 outMat[2 ] = m_Data[2 ] - rhs[2 ];
@@ -217,7 +217,7 @@ class Matrix3X3
217217 * @brief Multiplies each element of a 3x1 matrix by a scalar value and returns the result
218218 * @param scalar to multiply each element by.
219219 */
220- Matrix3X3 operator *(T scalar)
220+ SelfType operator *(T scalar)
221221 {
222222 return {
223223 m_Data[0 ] * scalar, m_Data[1 ] * scalar, m_Data[2 ] * scalar, m_Data[3 ] * scalar, m_Data[4 ] * scalar, m_Data[5 ] * scalar, m_Data[6 ] * scalar, m_Data[7 ] * scalar, m_Data[8 ] * scalar,
@@ -230,9 +230,9 @@ class Matrix3X3
230230 * @param outMat
231231 */
232232
233- Matrix3X3 transpose () const
233+ SelfType transpose () const
234234 {
235- Matrix3X3 outMat;
235+ SelfType outMat;
236236 outMat[0 ] = m_Data[0 ];
237237 outMat[1 ] = m_Data[3 ];
238238 outMat[2 ] = m_Data[6 ];
@@ -249,7 +249,7 @@ class Matrix3X3
249249 * @brief Inverts the 3x3 matrix and returns the result
250250 * @return outMat
251251 */
252- void invert ()
252+ SelfType invert ()
253253 {
254254 SelfType adjoint = this ->adjoint ();
255255 T oneOverDeterminant = 1.0 / this ->determinant ();
@@ -261,7 +261,7 @@ class Matrix3X3
261261 * @return outMat
262262 */
263263
264- void adjoint ()
264+ SelfType adjoint ()
265265 {
266266 SelfType temp = this ->cofactor ();
267267 return temp.transpose ();
@@ -274,7 +274,7 @@ class Matrix3X3
274274
275275 SelfType cofactor () const
276276 {
277- SelfType temp = this ->minors3X3 ();
277+ SelfType temp = this ->minors ();
278278 SelfType outMat;
279279
280280 // Row 0
@@ -292,14 +292,14 @@ class Matrix3X3
292292 return outMat;
293293 }
294294
295- /* *
295+ /* *b
296296 * @brief Calculates the matrix of minors of the 3x3 matrix and places the result into outMat
297297 * @return outMat
298298 */
299299
300- Matrix3X3 minors ()
300+ SelfType minors () const
301301 {
302- Matrix3X3 outMat;
302+ SelfType outMat;
303303 outMat[0 ] = m_Data[4 ] * m_Data[8 ] - m_Data[7 ] * m_Data[5 ];
304304 outMat[1 ] = m_Data[3 ] * m_Data[8 ] - m_Data[6 ] * m_Data[5 ];
305305 outMat[2 ] = m_Data[3 ] * m_Data[7 ] - m_Data[6 ] * m_Data[4 ];
@@ -329,7 +329,7 @@ class Matrix3X3
329329 * @param g
330330 */
331331
332- Matrix3X3 identity ()
332+ SelfType identity ()
333333 {
334334 return {1 .0f , 0 .0f , 0 .0f , 0 .0f , 1 .0f , 0 .0f , 0 .0f , 0 .0f , 1 .0f };
335335 }
@@ -339,7 +339,7 @@ class Matrix3X3
339339 * @param g
340340 */
341341
342- Matrix3X3 normalize () const
342+ SelfType normalize () const
343343 {
344344 T denom = m_Data[0 ] * m_Data[0 ] + m_Data[3 ] * m_Data[3 ] + m_Data[6 ] * m_Data[6 ];
345345 if (denom == 0.0 )
0 commit comments