godzil/dorayme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the cross product to Tuple instead of just vector (to ease some stuff later, but this is invalid on Points)

Browse Source
This commit is contained in:
Godzil
2020-02-17 13:53:30 +00:00
parent a1087a9871
commit 17aebe6538
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/include/tuple.h
View File

@@ -41,6 +41,8 @@ public:
double magnitude(); double magnitude();
Tuple normalise(); Tuple normalise();
double dot(const Tuple &b); double dot(const Tuple &b);
Tuple cross(const Tuple &b) const;
}; };
class Point: public Tuple class Point: public Tuple
@@ -53,7 +55,6 @@ class Vector: public Tuple
{ {
public: public:
Vector(double x, double y, double z) : Tuple(x, y, z, 0.0) {}; Vector(double x, double y, double z) : Tuple(x, y, z, 0.0) {};
Vector cross(const Vector &b) const;
}; };
#endif /*DORAYME_TUPLE_H*/ #endif /*DORAYME_TUPLE_H*/

7
source/tuple.cpp
View File

@@ -27,9 +27,10 @@ double Tuple::dot(const Tuple &b)
return this->x * b.x + this->y * b.y + this->z * b.z + this->w * b.w; return this->x * b.x + this->y * b.y + this->z * b.z + this->w * b.w;
} }
Vector Vector::cross(const Vector &b) const Tuple Tuple::cross(const Tuple &b) const
{ {
return Vector(this->y * b.z - this->z * b.y, return Tuple(this->y * b.z - this->z * b.y,
this->z * b.x - this->x * b.z, this->z * b.x - this->x * b.z,
this->x * b.y - this->y * b.x); this->x * b.y - this->y * b.x,
0);
} }