diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2019-11-05 00:31:50 +0100 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2019-11-05 12:29:42 +0100 |
| commit | 5e771f17372919724e00dc12895dc9a8f3cbf79a (patch) | |
| tree | 5ee249ef7d8c93ff3055461435562d30b7682a0b /src/math/Vector.h | |
| parent | Merge pull request #265 from erorcun/erorcun (diff) | |
| download | re3-5e771f17372919724e00dc12895dc9a8f3cbf79a.tar re3-5e771f17372919724e00dc12895dc9a8f3cbf79a.tar.gz re3-5e771f17372919724e00dc12895dc9a8f3cbf79a.tar.bz2 re3-5e771f17372919724e00dc12895dc9a8f3cbf79a.tar.lz re3-5e771f17372919724e00dc12895dc9a8f3cbf79a.tar.xz re3-5e771f17372919724e00dc12895dc9a8f3cbf79a.tar.zst re3-5e771f17372919724e00dc12895dc9a8f3cbf79a.zip | |
Diffstat (limited to 'src/math/Vector.h')
| -rw-r--r-- | src/math/Vector.h | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/src/math/Vector.h b/src/math/Vector.h index 42087339..605d96ab 100644 --- a/src/math/Vector.h +++ b/src/math/Vector.h @@ -78,21 +78,6 @@ public: bool IsZero(void) { return x == 0.0f && y == 0.0f && z == 0.0f; } }; -inline float -DotProduct(const CVector &v1, const CVector &v2) -{ - return v1.x*v2.x + v1.y*v2.y + v1.z*v2.z; -} - -inline CVector -CrossProduct(const CVector &v1, const CVector &v2) -{ - return CVector( - v1.y*v2.z - v1.z*v2.y, - v1.z*v2.x - v1.x*v2.z, - v1.x*v2.y - v1.y*v2.x); -} - inline CVector operator+(const CVector &left, const CVector &right) { return CVector(left.x + right.x, left.y + right.y, left.z + right.z); @@ -117,3 +102,24 @@ inline CVector operator/(const CVector &left, float right) { return CVector(left.x / right, left.y / right, left.z / right); } + +inline float +DotProduct(const CVector &v1, const CVector &v2) +{ + return v1.x*v2.x + v1.y*v2.y + v1.z*v2.z; +} + +inline CVector +CrossProduct(const CVector &v1, const CVector &v2) +{ + return CVector( + v1.y*v2.z - v1.z*v2.y, + v1.z*v2.x - v1.x*v2.z, + v1.x*v2.y - v1.y*v2.x); +} + +inline float +Distance(const CVector &v1, const CVector &v2) +{ + return (v2 - v1).Magnitude(); +}
\ No newline at end of file |