eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Convert Vector3 to use Doubles

Browse source
This commit is contained in:
Eryn Wells 2014-07-22 20:46:10 -07:00
parent 1d22e27d81
commit d69d708b31
2 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/basics.cc
View file

@ -35,7 +35,7 @@ Vector3::Vector3()
* *
* Constructor. Create a vector consisting of the given coordinates. * Constructor. Create a vector consisting of the given coordinates.
*/ */
Vector3::Vector3(float _x, float _y, float _z) Vector3::Vector3(Double _x, Double _y, Double _z)
: x(_x), y(_y), z(_z) : x(_x), y(_y), z(_z)
{ } { }
@ -65,7 +65,7 @@ Vector3::operator=(const Vector3 &v)
* a reference to this vector is returned. * a reference to this vector is returned.
*/ */
Vector3 & Vector3 &
Vector3::operator*=(const float &rhs) Vector3::operator*=(const Double &rhs)
{ {
x *= rhs; x *= rhs;
y *= rhs; y *= rhs;
@ -74,7 +74,7 @@ Vector3::operator*=(const float &rhs)
} }
Vector3 & Vector3 &
Vector3::operator/=(const float &rhs) Vector3::operator/=(const Double &rhs)
{ {
return *this *= (1.0f / rhs); return *this *= (1.0f / rhs);
} }
@ -104,14 +104,14 @@ Vector3::operator-=(const Vector3 &rhs)
* Perform the corresponding operation on a copy of this vector. Return a new vector. * Perform the corresponding operation on a copy of this vector. Return a new vector.
*/ */
Vector3 Vector3
Vector3::operator*(const float &rhs) Vector3::operator*(const Double &rhs)
const const
{ {
return Vector3(*this) *= rhs; return Vector3(*this) *= rhs;
} }
Vector3 Vector3
Vector3::operator/(const float &rhs) Vector3::operator/(const Double &rhs)
const const
{ {
return Vector3(*this) /= rhs; return Vector3(*this) /= rhs;
@ -171,7 +171,7 @@ Vector3::operator!=(const Vector3 &rhs)
* *
* Compute and return the length-squared of this vector. * Compute and return the length-squared of this vector.
*/ */
float Double
Vector3::length2() Vector3::length2()
const const
{ {
@ -184,11 +184,11 @@ Vector3::length2()
* *
* Compute and return the length of this vector. * Compute and return the length of this vector.
*/ */
float Double
Vector3::length() Vector3::length()
const const
{ {
return sqrtf(length2()); return sqrt(length2());
} }
@ -197,7 +197,7 @@ Vector3::length()
* *
* Compute and return the dot product of this and the given vectors. * Compute and return the dot product of this and the given vectors.
*/ */
float Double
Vector3::dot(const Vector3 &v) Vector3::dot(const Vector3 &v)
const const
{ {
@ -237,7 +237,7 @@ Vector3::normalize()
* Multiply the given float by the given vector. Return a new vector. * Multiply the given float by the given vector. Return a new vector.
*/ */
const Vector3 const Vector3
operator*(const float &lhs, const Vector3 &rhs) operator*(const Double &lhs, const Vector3 &rhs)
{ {
return rhs * lhs; return rhs * lhs;
} }
@ -253,9 +253,9 @@ operator<<(std::ostream &os, const Vector3 &v)
Vector3 Vector3
LinearCombination(const double k1, const Vector3& v1, LinearCombination(const Double k1, const Vector3& v1,
const double k2, const Vector3& v2, const Double k2, const Vector3& v2,
const double k3, const Vector3& v3) const Double k3, const Vector3& v3)
{ {
return Vector3(k1 * v1.x + k2 * v2.x + k3 * v3.x, return Vector3(k1 * v1.x + k2 * v2.x + k3 * v3.x,
k1 * v1.y + k2 * v2.y + k3 * v3.y, k1 * v1.y + k2 * v2.y + k3 * v3.y,

34
src/basics.h
View file

@ -14,19 +14,27 @@
#include <iostream> #include <iostream>
#include "types.hh"
/*
* XXX: THIS SHOULD NOT BE HERE. REMOVE IT WHEN MOVING TO CHARLES NAMESPACE IS
* DONE.
*/
using charles::Double;
struct Vector3 struct Vector3
{ {
Vector3(); Vector3();
Vector3(float x, float y, float z); Vector3(Double x, Double y, Double z);
Vector3 &operator=(const Vector3 &v); Vector3 &operator=(const Vector3 &v);
Vector3 &operator*=(const float &rhs); Vector3 &operator*=(const Double &rhs);
Vector3 &operator/=(const float &rhs); Vector3 &operator/=(const Double &rhs);
Vector3 &operator+=(const Vector3 &rhs); Vector3 &operator+=(const Vector3 &rhs);
Vector3 &operator-=(const Vector3 &rhs); Vector3 &operator-=(const Vector3 &rhs);
Vector3 operator*(const float &rhs) const; Vector3 operator*(const Double &rhs) const;
Vector3 operator/(const float &rhs) const; Vector3 operator/(const Double &rhs) const;
Vector3 operator+(const Vector3 &rhs) const; Vector3 operator+(const Vector3 &rhs) const;
Vector3 operator-(const Vector3 &rhs) const; Vector3 operator-(const Vector3 &rhs) const;
Vector3 operator-() const; Vector3 operator-() const;
@ -34,9 +42,9 @@ struct Vector3
bool operator==(const Vector3 &rhs) const; bool operator==(const Vector3 &rhs) const;
bool operator!=(const Vector3 &rhs) const; bool operator!=(const Vector3 &rhs) const;
float length2() const; Double length2() const;
float length() const; Double length() const;
float dot(const Vector3 &v) const; Double dot(const Vector3 &v) const;
Vector3 cross(const Vector3 &v) const; Vector3 cross(const Vector3 &v) const;
Vector3 &normalize(); Vector3 &normalize();
@ -45,16 +53,16 @@ struct Vector3
// Unit vectors in each of the three cartesian directions. // Unit vectors in each of the three cartesian directions.
static const Vector3 X, Y, Z; static const Vector3 X, Y, Z;
float x, y, z; Double x, y, z;
}; };
const Vector3 operator*(const float &lhs, const Vector3 &rhs); const Vector3 operator*(const Double &lhs, const Vector3 &rhs);
std::ostream &operator<<(std::ostream &os, const Vector3 &v); std::ostream &operator<<(std::ostream &os, const Vector3 &v);
Vector3 LinearCombination(const double k1, const Vector3& v1, Vector3 LinearCombination(const Double k1, const Vector3& v1,
const double k2, const Vector3& v2, const Double k2, const Vector3& v2,
const double k3, const Vector3& v3); const Double k3, const Vector3& v3);
struct Ray struct Ray