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

updated some Vector operations and made them member functions

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

86
util/Vector.cc
View File

@ -41,15 +41,6 @@ Vector & Vector::normalize()
return *this; return *this;
} }
Vector Vector::operator-() const
{
Vector result;
result[0] = -m_array[0];
result[1] = -m_array[1];
result[2] = -m_array[2];
return result;
}
double Vector::mag() const double Vector::mag() const
{ {
return sqrt(m_array[0] * m_array[0] return sqrt(m_array[0] * m_array[0]
@ -101,54 +92,81 @@ std::ostream & operator<<(std::ostream & out, const Vector & v)
return out; return out;
} }
/* Compute the dot-product of two vectors */ Vector Vector::operator-() const
double operator%(const Vector & v1, const Vector & v2)
{ {
return v1[0] * v2[0] + v1[1] * v2[1] + v1[2] * v2[2]; Vector result;
result[0] = -m_array[0];
result[1] = -m_array[1];
result[2] = -m_array[2];
return result;
}
/* Compute the dot-product of two vectors */
double Vector::operator%(const Vector & v2) const
{
return m_array[0] * v2.m_array[0]
+ m_array[1] * v2.m_array[1]
+ m_array[2] * v2.m_array[2];
} }
/* Compute the cross-product of two vectors */ /* Compute the cross-product of two vectors */
Vector operator*(const Vector & v1, const Vector & v2) Vector Vector::operator*(const Vector & v2) const
{ {
Vector result; Vector result;
result[0] = v1[1] * v2[2] - v1[2] * v2[1]; result[0] = m_array[1] * v2.m_array[2] - m_array[2] * v2.m_array[1];
result[1] = v1[2] * v2[0] - v1[0] * v2[2]; result[1] = m_array[2] * v2.m_array[0] - m_array[0] * v2.m_array[2];
result[2] = v1[0] * v2[1] - v1[1] * v2[0]; result[2] = m_array[0] * v2.m_array[1] - m_array[1] * v2.m_array[0];
return result; return result;
} }
Vector operator+(const Vector & v1, const Vector & v2) Vector Vector::operator+(const Vector & v2) const
{ {
Vector result; Vector result;
result[0] = v1[0] + v2[0]; result[0] = m_array[0] + v2.m_array[0];
result[1] = v1[1] + v2[1]; result[1] = m_array[1] + v2.m_array[1];
result[2] = v1[2] + v2[2]; result[2] = m_array[2] + v2.m_array[2];
return result; return result;
} }
Vector operator-(const Vector & v1, const Vector & v2) Vector Vector::operator-(const Vector & v2) const
{ {
Vector result; Vector result;
result[0] = v1[0] - v2[0]; result[0] = m_array[0] - v2.m_array[0];
result[1] = v1[1] - v2[1]; result[1] = m_array[1] - v2.m_array[1];
result[2] = v1[2] - v2[2]; result[2] = m_array[2] - v2.m_array[2];
return result; return result;
} }
Vector operator*(const Vector & v1, double scale) Vector Vector::operator*(double scale) const
{ {
Vector result = v1; Vector result;
result[0] *= scale; result[0] = m_array[0] * scale;
result[1] *= scale; result[1] = m_array[1] * scale;
result[2] *= scale; result[2] = m_array[2] * scale;
return result; return result;
} }
Vector operator/(const Vector & v1, double scale) Vector Vector::operator/(double scale) const
{ {
Vector result = v1; Vector result;
result[0] /= scale; result[0] = m_array[0] / scale;
result[1] /= scale; result[1] = m_array[0] / scale;
result[2] /= scale; result[2] = m_array[0] / scale;
return result; return result;
} }
Vector & Vector::operator+=(const Vector & v2)
{
m_array[0] += v2.m_array[0];
m_array[1] += v2.m_array[1];
m_array[2] += v2.m_array[2];
return *this;
}
Vector & Vector::operator-=(const Vector & v2)
{
m_array[0] -= v2.m_array[0];
m_array[1] -= v2.m_array[1];
m_array[2] -= v2.m_array[2];
return *this;
}

17
util/Vector.h
View File

@ -12,7 +12,6 @@ class Vector
static Vector randomVector(); static Vector randomVector();
double & operator[](int idx) { return m_array[idx]; } double & operator[](int idx) { return m_array[idx]; }
double operator[](int idx) const { return m_array[idx]; } double operator[](int idx) const { return m_array[idx]; }
Vector operator-() const;
Vector & normalize(); Vector & normalize();
double mag() const; double mag() const;
double mag2() const; double mag2() const;
@ -21,17 +20,21 @@ class Vector
Vector reflect(const Vector & target) const; Vector reflect(const Vector & target) const;
Vector getPerpendicular() const; Vector getPerpendicular() const;
Vector operator-() const;
double operator%(const Vector & v2) const;
Vector operator*(const Vector & v2) const;
Vector operator+(const Vector & v2) const;
Vector operator-(const Vector & v2) const;
Vector operator*(double scale) const;
Vector operator/(double scale) const;
Vector & operator+=(const Vector & v2);
Vector & operator-=(const Vector & v2);
protected: protected:
double m_array[3]; double m_array[3];
}; };
std::ostream & operator<<(std::ostream & out, const Vector & v); std::ostream & operator<<(std::ostream & out, const Vector & v);
double operator%(const Vector & v1, const Vector & v2);
Vector operator*(const Vector & v1, const Vector & v2);
Vector operator+(const Vector & v1, const Vector & v2);
Vector operator-(const Vector & v1, const Vector & v2);
Vector operator*(const Vector & v1, double scale);
Vector operator/(const Vector & v1, double scale);
static inline Vector operator*(double d, const Vector & v) { return v * d; } static inline Vector operator*(double d, const Vector & v) { return v * d; }
static inline Vector operator/(double d, const Vector & v) { return v / d; } static inline Vector operator/(double d, const Vector & v) { return v / d; }