josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added mult() and div() to Vector

Browse Source 
git-svn-id: svn://anubis/fart/trunk@277 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2010-07-08 16:55:30 +00:00
parent 9546c8dde4
commit d0fe38566c
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
util/Vector.cc
View File

@ -86,10 +86,22 @@ Vector Vector::getPerpendicular() const
return p; return p;
} }
std::ostream & operator<<(std::ostream & out, const Vector & v) Vector Vector::mult(const Vector & v2) const
{ {
out << "[" << v[0] << ", " << v[1] << ", " << v[2] << "]"; Vector result;
return out; result[0] = m_array[0] * v2.m_array[0];
result[1] = m_array[1] * v2.m_array[1];
result[2] = m_array[2] * v2.m_array[2];
return result;
}
Vector Vector::div(const Vector & v2) const
{
Vector result;
result[0] = m_array[0] / v2.m_array[0];
result[1] = m_array[1] / v2.m_array[1];
result[2] = m_array[2] / v2.m_array[2];
return result;
} }
Vector Vector::operator-() const Vector Vector::operator-() const
@ -170,3 +182,9 @@ Vector & Vector::operator-=(const Vector & v2)
m_array[2] -= v2.m_array[2]; m_array[2] -= v2.m_array[2];
return *this; return *this;
} }
std::ostream & operator<<(std::ostream & out, const Vector & v)
{
out << "[" << v[0] << ", " << v[1] << ", " << v[2] << "]";
return out;
}

2
util/Vector.h
View File

@ -20,6 +20,8 @@ class Vector
Vector reflect(const Vector & target) const; Vector reflect(const Vector & target) const;
Vector getPerpendicular() const; Vector getPerpendicular() const;
Vector mult(const Vector & v2) const;
Vector div(const Vector & v2) const;
Vector operator-() const; Vector operator-() const;
double operator%(const Vector & v2) const; double operator%(const Vector & v2) const;
Vector operator*(const Vector & v2) const; Vector operator*(const Vector & v2) const;