diff -r f6a72eb99631 -r 9d66d323c354 include/matrix.h --- a/include/matrix.h Tue Apr 29 23:31:08 2008 +0200 +++ b/include/matrix.h Fri May 02 13:27:47 2008 +0200 @@ -3,7 +3,7 @@ * * This file is part of Pyrit Ray Tracer. * - * Copyright 2006, 2007 Radek Brich + * Copyright 2006, 2007, 2008 Radek Brich * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -98,9 +98,9 @@ friend Matrix operator*(const Float &f, Matrix &m) { return m * f; }; // product of matrix and vector - Vector3 operator*(const Vector3 &v) + Vector operator*(const Vector &v) { - Vector3 u = Vector3(); + Vector u = Vector(); u.x = data[0][0] * v.x + data[0][1] * v.y + data[0][2] * v.z + data[0][3] * v.w; u.y = data[1][0] * v.x + data[1][1] * v.y + data[1][2] * v.z + data[1][3] * v.w; u.z = data[2][0] * v.x + data[2][1] * v.y + data[2][2] * v.z + data[2][3] * v.w; @@ -108,7 +108,7 @@ return u; } - friend Matrix operator*(const Vector3 &v, Matrix &m) { return m * v; }; + friend Matrix operator*(const Vector &v, Matrix &m) { return m * v; }; }; #endif