Skip to content

Commit f457ab3

Browse files
committed
- remove Quaternion mentioning
1 parent 8b17fd2 commit f457ab3

File tree

2 files changed

+0
-90
lines changed

2 files changed

+0
-90
lines changed

math/Matrix.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
#include "Vector.h"
1212

13-
struct Quaternion;
14-
1513
template <class T>
1614
struct TMat2 // Matrix2x2
1715
{
@@ -81,8 +79,6 @@ struct TMat3 // Matrix3x3
8179
: rows{ {m00, m01, m02}, {m10, m11, m12}, {m20, m21, m22} }
8280
{}
8381

84-
TMat3<T>(const Quaternion &q);
85-
8682
T* toRaw() {return (T *) rows;}
8783

8884
T& operator () (int row, int col) const { return rows[row][col]; }
@@ -140,8 +136,6 @@ struct TMat4 // Matrix4x4
140136
{
141137
}
142138

143-
TMat4<T>(const Quaternion &q);
144-
145139
TMat4<T>(const TVec3D<T> &axis, const float angle)
146140
{
147141
float sinA,cosA;

math/Matrix.inl

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -68,45 +68,6 @@ inline TMat2<T> operator ! (const TMat2<T> &m)
6868

6969
/* --------------------------------------------------------------------------------- */
7070

71-
template <typename T>
72-
TMat3<T>::TMat3(const Quaternion &q)
73-
{
74-
float wx, wy, wz, xx, yy, yz, xy, xz, zz, x2, y2, z2;
75-
76-
x2 = q.x + q.x; y2 = q.y + q.y; z2 = q.z + q.z;
77-
78-
xx = q.x * x2; xy = q.x * y2; xz = q.x * z2;
79-
yy = q.y * y2; yz = q.y * z2; zz = q.z * z2;
80-
wx = q.w * x2; wy = q.w * y2; wz = q.w * z2;
81-
82-
rows[0] = TVec3D<T>( 1.0f - (yy + zz),
83-
xy + wz,
84-
xz - wy);
85-
86-
rows[1] = TVec3D<T>( xy - wz,
87-
1.0f - (xx + zz),
88-
yz + wx);
89-
90-
rows[2] = TVec3D<T>( xz + wy,
91-
yz - wx,
92-
1.0f - (xx + yy));
93-
94-
//------------------------------------------------------------
95-
/*
96-
rows[0] = TVec3D<T>( 1 - 2 * q.y * q.y - 2 * q.z * q.z,
97-
2 * q.x * q.y - 2 * q.w * q.z,
98-
2 * q.x * q.y - 2 * q.w * q.z);
99-
100-
rows[1] = TVec3D<T>( 2 * q.x * q.y + 2 * q.w * q.z,
101-
1 - 2 * q.x * q.x - 2 * q.z * q.z,
102-
2 * q.y * q.z - 2 * q.w * q.x);
103-
104-
rows[2] = TVec3D<T>( 2 * q.x * q.z - 2 * q.w * q.y,
105-
2 * q.y * q.z + 2 * q.w * q.x,
106-
1 - 2 * q.x * q.x - 2 * q.y * q.y);
107-
*/
108-
}
109-
11071
template <typename T>
11172
inline TMat3<T> operator + (const TMat3<T> &m, const TMat3<T> &n)
11273
{
@@ -166,51 +127,6 @@ inline TMat3<T> operator ! (const TMat3<T> &m)
166127

167128
/* --------------------------------------------------------------------------------- */
168129

169-
template <typename T>
170-
TMat4<T>::TMat4(const Quaternion &q)
171-
{
172-
float wx, wy, wz, xx, yy, yz, xy, xz, zz, x2, y2, z2;
173-
174-
x2 = q.x + q.x; y2 = q.y + q.y; z2 = q.z + q.z;
175-
176-
xx = q.x * x2; xy = q.x * y2; xz = q.x * z2;
177-
yy = q.y * y2; yz = q.y * z2; zz = q.z * z2;
178-
wx = q.w * x2; wy = q.w * y2; wz = q.w * z2;
179-
180-
rows[0] = TVec4D<T>( 1.0f - (yy + zz),
181-
xy + wz,
182-
xz - wy,
183-
0.0f);
184-
185-
rows[1] = TVec4D<T>( xy - wz,
186-
1.0f - (xx + zz),
187-
yz + wx,
188-
0.0f);
189-
190-
rows[2] = TVec4D<T>( xz + wy,
191-
yz - wx,
192-
1.0f - (xx + yy),
193-
0.0f);
194-
195-
196-
/*
197-
rows[0] = TVec4D<T>( 1 - 2 * q.y * q.y - 2 * q.z * q.z,
198-
2 * q.x * q.y - 2 * q.w * q.z,
199-
2 * q.x * q.y - 2 * q.w * q.z,
200-
0);
201-
202-
rows[1] = TVec4D<T>( 2 * q.x * q.y + 2 * q.w * q.z,
203-
1 - 2 * q.x * q.x - 2 * q.z * q.z,
204-
2 * q.y * q.z - 2 * q.w * q.x,
205-
0);
206-
207-
rows[2] = TVec4D<T>( 2 * q.x * q.z - 2 * q.w * q.y,
208-
2 * q.y * q.z + 2 * q.w * q.x,
209-
1 - 2 * q.x * q.x - 2 * q.y * q.y,
210-
0);
211-
*/
212-
rows[3] = TVec4D<T>(0, 0, 0, 1);
213-
}
214130

215131
template <typename T>
216132
inline const TVec3D<T>& TMat4<T>::getTranslationComponent() const

0 commit comments

Comments
 (0)