Fix quaternion access to matrix elements

This commit is contained in:
rexy712 2020-09-26 15:46:53 -07:00
parent 180922c6fc
commit 41780c24f0

View File

@ -229,15 +229,15 @@ namespace math{
value_type yw = m_data[2] * m_data[0];
value_type zw = m_data[3] * m_data[0];
m[0] = 1 - 2 * (yy + zz);
m[1] = 2 * (xy + zw);
m[2] = 2 * (xz - yw);
m[3] = 2 * (xy - zw);
m[4] = 1 - 2 * (xx + zz);
m[5] = 2 * (yz + xw);
m[6] = 2 * (xz + yw);
m[7] = 2 * (yz - xw);
m[8] = 1 - 2 * (xx + yy);
m.get(0) = 1 - 2 * (yy + zz);
m.get(1) = 2 * (xy + zw);
m.get(2) = 2 * (xz - yw);
m.get(3) = 2 * (xy - zw);
m.get(4) = 1 - 2 * (xx + zz);
m.get(5) = 2 * (yz + xw);
m.get(6) = 2 * (xz + yw);
m.get(7) = 2 * (yz - xw);
m.get(8) = 1 - 2 * (xx + yy);
return m;
}
template<typename T>
@ -255,22 +255,22 @@ namespace math{
value_type yw = m_data[2] * m_data[0];
value_type zw = m_data[3] * m_data[0];
m[0] = 1 - 2 * (yy + zz);
m[1] = 2 * (xy + zw);
m[2] = 2 * (xz - yw);
m[3] = 0;
m[4] = 2 * (xy - zw);
m[5] = 1 - 2 * (xx + zz);
m[6] = 2 * (yz + xw);
m[7] = 0;
m[8] = 2 * (xz + yw);
m[9] = 2 * (yz - xw);
m[10] = 1 - 2 * (xx + yy);
m[11] = 0;
m[12] = 0;
m[13] = 0;
m[14] = 0;
m[15] = 1;
m.get(0) = 1 - 2 * (yy + zz);
m.get(1) = 2 * (xy + zw);
m.get(2) = 2 * (xz - yw);
m.get(3) = 0;
m.get(4) = 2 * (xy - zw);
m.get(5) = 1 - 2 * (xx + zz);
m.get(6) = 2 * (yz + xw);
m.get(7) = 0;
m.get(8) = 2 * (xz + yw);
m.get(9) = 2 * (yz - xw);
m.get(10) = 1 - 2 * (xx + yy);
m.get(11) = 0;
m.get(12) = 0;
m.get(13) = 0;
m.get(14) = 0;
m.get(15) = 1;
return m;
}
template<typename T>