gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Implement missing matrix operations

This commit is contained in:
Eduardo Bart 2013-01-19 12:21:00 -02:00
parent 8e9d137608
commit 0f9cacdde5
1 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/framework/util/matrix.h
View File

@ -33,6 +33,7 @@ class Matrix
{ {
public: public:
Matrix() { setIdentity(); } Matrix() { setIdentity(); }
Matrix(int) {} // construct without initializing identity matrix
Matrix(const Matrix<N,M,T>& other) = default; Matrix(const Matrix<N,M,T>& other) = default;
template<typename U> template<typename U>
Matrix(const std::initializer_list<U>& values) { *this = values; } Matrix(const std::initializer_list<U>& values) { *this = values; }
@ -65,7 +66,6 @@ public:
bool operator!=(const Matrix<N,M,T>& other) const; bool operator!=(const Matrix<N,M,T>& other) const;
private: private:
Matrix(int) {} // construct without initializing identity matrix
T m[N][M]; T m[N][M];
}; };
@ -176,10 +176,10 @@ bool Matrix<N,M,T>::operator!=(const Matrix<N,M,T>& other) const
template<int N, int M, typename T> template<int N, int M, typename T>
std::ostream& operator<<(std::ostream& out, const Matrix<N,M,T>& mat) std::ostream& operator<<(std::ostream& out, const Matrix<N,M,T>& mat)
{ {
for(int i=0;i<N;++i) { for(int i=1;i<=N;++i) {
for(int j=0;j<M;++j) { for(int j=1;j<=M;++j) {
out << mat(i,j); out << mat(i,j);
if(j+1 != M) if(j != M)
out << " "; out << " ";
} }
out << "\n"; out << "\n";
@ -207,6 +207,34 @@ inline bool Matrix<3,3,float>::operator==(const Matrix<3,3,float>& other) const
m[2][2] == other.m[2][2]; m[2][2] == other.m[2][2];
} }
template<int M, int N, int P, int Q, typename T>
Matrix<M, Q, T> operator*(const Matrix<M,N,T>& a, const Matrix<P,Q,T>& b)
{
static_assert(N==P, "N==P");
Matrix<M,Q,T> c(1);
for(int i=1;i<=M;++i) {
for(int j=1;j<=Q;++j) {
T sum = 0;
for(int k=1;k<=N;++k)
sum += a(i,k) * b(k,j);
c(i,j) = sum;
}
}
return c;
}
template<int M, int N, typename T>
Matrix<M, N, T> operator+(const Matrix<M,N,T>& a, const Matrix<M,N,T>& b) { Matrix<M,N,T> c(a); c += b; return c; }
template<int M, int N, typename T>
Matrix<M, N, T> operator-(const Matrix<M,N,T>& a, const Matrix<M,N,T>& b) { Matrix<M,N,T> c(a); c -= b; return c; }
template<int M, int N, typename T>
Matrix<M, N, T> operator*(const Matrix<M,N,T>& a, float b) { Matrix<M,N,T> c(a); c *= b; return c; }
template<int M, int N, typename T>
Matrix<M, N, T> operator/(const Matrix<M,N,T>& a, float b) { Matrix<M,N,T> c = a; c /= b; return c; }
typedef Matrix<4,4> Matrix4x4; typedef Matrix<4,4> Matrix4x4;
typedef Matrix<3,3> Matrix3x3; typedef Matrix<3,3> Matrix3x3;
typedef Matrix<2,2> Matrix2x2; typedef Matrix<2,2> Matrix2x2;