Better naming algorithm for objects in scene export

[libs/gl.git] / source / matrix.cpp

diff --git a/source/matrix.cpp b/source/matrix.cpp
index ddc0cdf58c8ac64c72e1d830e6226f0edc2dcfa7..a4c36a022a9ecb338406a496760f12c1d0655540 100644 (file)
--- a/source/matrix.cpp
+++ b/source/matrix.cpp
@@ -22,12 +22,6 @@ Matrix::Matrix(const LinAl::Matrix<float, 4, 4> &other):
        Base(other)
 { }
 
-Matrix &Matrix::multiply(const Matrix &other)
-{
-       *this = *this*other;
-       return *this;
-}
-
 Matrix &Matrix::translate(const Vector3 &t)
 {
        return multiply(translation(t));
@@ -43,26 +37,6 @@ Matrix &Matrix::scale(const Vector3 &s)
        return multiply(scaling(s));
 }
 
-Matrix Matrix::operator*(const Matrix &other) const
-{
-       return static_cast<const Base &>(*this)*static_cast<const Base &>(other);
-}
-
-Matrix &Matrix::operator*=(const Matrix &other)
-{
-       return multiply(other);
-}
-
-Vector4 Matrix::operator*(const Vector4 &vec) const
-{
-       return static_cast<const Base &>(*this)*LinAl::Vector<float, 4>(vec);
-}
-
-Vector3 Matrix::operator*(const Vector3 &vec) const
-{
-       return ((*this)*compose(vec, 1.0f)).slice<3>(0);
-}
-
 float Matrix::operator[](unsigned i) const
 {
        if(i>=16)