From 7429f0782f9f0f2c4ae9ce608dd0e89aee702d2a Mon Sep 17 00:00:00 2001 From: josh Date: Tue, 2 Jan 2024 21:31:44 -0500 Subject: [PATCH] Implementing Vector3 Unit Tests --- include/J3ML/LinearAlgebra/Angle2D.h | 6 +- include/J3ML/LinearAlgebra/Vector3.h | 5 +- src/J3ML/LinearAlgebra/Vector2.cpp | 1 - src/J3ML/LinearAlgebra/Vector3.cpp | 15 ++- tests/LinearAlgebra/Vector3Tests.cpp | 142 +++++++++++++++++++-------- 5 files changed, 123 insertions(+), 46 deletions(-) diff --git a/include/J3ML/LinearAlgebra/Angle2D.h b/include/J3ML/LinearAlgebra/Angle2D.h index 5583c50..1b90d59 100644 --- a/include/J3ML/LinearAlgebra/Angle2D.h +++ b/include/J3ML/LinearAlgebra/Angle2D.h @@ -5,6 +5,10 @@ namespace LinearAlgebra { class Angle2D { public: - + float x; + float y; + bool operator==(const Angle2D& rhs) const { + return (this->x==rhs.x && this->y==rhs.y); + } }; } \ No newline at end of file diff --git a/include/J3ML/LinearAlgebra/Vector3.h b/include/J3ML/LinearAlgebra/Vector3.h index 7f5eeef..95a8f4d 100644 --- a/include/J3ML/LinearAlgebra/Vector3.h +++ b/include/J3ML/LinearAlgebra/Vector3.h @@ -3,6 +3,7 @@ #include #include #include +#include namespace LinearAlgebra { @@ -95,8 +96,8 @@ public: static Vector3 Lerp(const Vector3& lhs, const Vector3& rhs, float alpha); - float AngleBetween(const Vector3& rhs) const; // TODO: 3D Angle representation? - static float AngleBetween(const Vector3& lhs, const Vector3& rhs); // TODO: 3D Angle representation? + Angle2D AngleBetween(const Vector3& rhs) const; + static Angle2D AngleBetween(const Vector3& lhs, const Vector3& rhs); // Adds two vectors Vector3 operator+(const Vector3& rhs) const; diff --git a/src/J3ML/LinearAlgebra/Vector2.cpp b/src/J3ML/LinearAlgebra/Vector2.cpp index 895efaa..f401f0d 100644 --- a/src/J3ML/LinearAlgebra/Vector2.cpp +++ b/src/J3ML/LinearAlgebra/Vector2.cpp @@ -116,7 +116,6 @@ namespace LinearAlgebra { { auto numer = this->Dot(rhs); auto denom = this->Magnitude() * rhs.Magnitude(); - std::cout << numer << ", " << denom << std::endl; return std::acos(numer / denom); } diff --git a/src/J3ML/LinearAlgebra/Vector3.cpp b/src/J3ML/LinearAlgebra/Vector3.cpp index 0ad9992..700c64d 100644 --- a/src/J3ML/LinearAlgebra/Vector3.cpp +++ b/src/J3ML/LinearAlgebra/Vector3.cpp @@ -269,7 +269,7 @@ namespace LinearAlgebra { } Vector3 Vector3::Sub(const Vector3 &lhs, const Vector3 &rhs) { - lhs.Sub(rhs); + return lhs.Sub(rhs); } Vector3 Vector3::Mul(float scalar) const { @@ -288,5 +288,18 @@ namespace LinearAlgebra { return lhs.Div(rhs); } + Angle2D Vector3::AngleBetween(const Vector3 &rhs) const { + const auto Pi_x_180 = 180.f / M_PI; + auto dist = this->Distance(rhs); + float x = -(asinf((rhs.y - this->y) / dist)); + float y = (atan2f(rhs.x - this->x,rhs.z - this->z)); + return {x, y}; + } + + Angle2D Vector3::AngleBetween(const Vector3 &lhs, const Vector3 &rhs) // TODO: 3D Angle representation? + { + return lhs.AngleBetween(rhs); + } + #pragma endregion } \ No newline at end of file diff --git a/tests/LinearAlgebra/Vector3Tests.cpp b/tests/LinearAlgebra/Vector3Tests.cpp index 3dba895..5718cdf 100644 --- a/tests/LinearAlgebra/Vector3Tests.cpp +++ b/tests/LinearAlgebra/Vector3Tests.cpp @@ -16,96 +16,96 @@ TEST(Vector3Test, V3_Constructor_XYZ) } TEST(Vector3Test, V3_Addition_Op) { - Vector3 A {}; - Vector3 B {}; + Vector3 A {1,1,1}; + Vector3 B {2,2,2}; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {3,3,3}; EXPECT_EQ(A + B, ExpectedResult); } TEST(Vector3Test, V3_Addition_Method) { - Vector3 A {}; - Vector3 B {}; + Vector3 A {1,1,1}; + Vector3 B {2,2,2}; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {3,3,3}; EXPECT_EQ(A.Add(B), ExpectedResult); } TEST(Vector3Test, V3_Addition_Static) { - Vector3 A {}; - Vector3 B {}; + Vector3 A {1,1,1}; + Vector3 B {3,3,3}; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {4,4,4}; EXPECT_EQ(Vector3::Add(A, B), ExpectedResult); } TEST(Vector3Test, V3_Subtract_Op) { - Vector3 A {}; - Vector3 B {}; + Vector3 A {2,2,2}; + Vector3 B {.5f, .5f, .5f}; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {1.5f, 1.5f, 1.5f}; EXPECT_EQ(A - B, ExpectedResult); } TEST(Vector3Test, V3_Subtract_Method) { - Vector3 A {}; - Vector3 B {}; + Vector3 A {3,3,3}; + Vector3 B {1,1,1}; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {2,2,2}; EXPECT_EQ(A.Sub(B), ExpectedResult); } TEST(Vector3Test, V3_Subtract_Static) { - Vector3 A {}; - Vector3 B {}; + Vector3 A {4,4,4}; + Vector3 B {1,1,1}; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {3,3,3}; EXPECT_EQ(Vector3::Sub(A, B), ExpectedResult); } TEST(Vector3Test, V3_Scalar_Mult_Op) { - Vector3 A { }; + Vector3 A { 1,1,1}; float B = 1.5f; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {1.5f, 1.5f, 1.5f}; EXPECT_EQ(A * B, ExpectedResult); } TEST(Vector3Test, V3_Scalar_Mult_Method) { - Vector3 A { }; + Vector3 A {3,3,3}; float B = 1.5f; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {4.5f, 4.5f, 4.5f}; EXPECT_EQ(A.Mul(B), ExpectedResult); } TEST(Vector3Test, V3_Scalar_Mult_Static) { - Vector3 A { }; + Vector3 A {2,2,2}; float B = 1.5f; - Vector3 ExpectedResult {}; + Vector3 ExpectedResult {3.f, 3.f, 3.f}; EXPECT_EQ(Vector3::Mul(A, B), ExpectedResult); } TEST(Vector3Test, V3_Scalar_Div_Op) { - Vector3 A {}; - float B = 1.5f; + Vector3 A {4,4,4}; + float B = 2.f; - Vector3 ExpectedResult { }; + Vector3 ExpectedResult {2,2,2}; EXPECT_EQ(A / B, ExpectedResult); } TEST(Vector3Test, V3_Scalar_Div_Method) { - Vector3 A { }; - float B = 1.5f; - Vector3 ExpectedResult { }; + Vector3 A {6,6,6}; + float B = 2.f; + Vector3 ExpectedResult { 3,3,3}; EXPECT_EQ(A.Div(B), ExpectedResult); } TEST(Vector3Test, V3_Scalar_Div_Static) { - Vector3 A { }; + Vector3 A {3,3,3}; float B = 1.5f; - Vector3 ExpectedResult { }; + Vector3 ExpectedResult { 2.f, 2.f, 2.f}; EXPECT_EQ(Vector3::Div(A, B), ExpectedResult); } @@ -116,12 +116,72 @@ TEST(Vector3Test, V3_NaN) { EXPECT_NE(Vector3(0, 0, 0), Vector3::NaN); } -TEST(Vector3Test, V3_Min) {} -TEST(Vector3Test, V3_Max) {} -TEST(Vector3Test, V3_Clamp) {} -TEST(Vector3Test, V3_DotProduct) {} -TEST(Vector3Test, V3_CrossProduct) {} -TEST(Vector3Test, V3_Project) {} -TEST(Vector3Test, V3_Normalize) {} -TEST(Vector3Test, V3_Lerp) {} -TEST(Vector3Test, V3_AngleBetween) {} +TEST(Vector3Test, V3_Min) { + Vector3 Input {2,2,2}; + Vector3 Minimum {3,3,3}; + Vector3 ExpectedResult {2,2,2}; + + EXPECT_EQ(Input.Min(Minimum), ExpectedResult); +} +TEST(Vector3Test, V3_Max) { + Vector3 Input {2,2,2}; + Vector3 Maximum {3,3,3}; + Vector3 ExpectedResult {3,3,3}; + + EXPECT_EQ(Input.Max(Maximum), ExpectedResult); +} +TEST(Vector3Test, V3_Clamp) { + Vector3 Input {5,-1,8}; + Vector3 Minimum {1,1,1}; + Vector3 Maximum {5,5,5}; + + Vector3 ExpectedResult {5,1,5}; + + EXPECT_EQ(Input.Clamp(Minimum, Maximum), ExpectedResult); + +} +TEST(Vector3Test, V3_DotProduct) { + Vector3 A{6,6,6}; + Vector3 B{1,1,1}; + + + float ExpectedResult = 1; + + EXPECT_FLOAT_EQ(A.Dot(B), ExpectedResult); +} +TEST(Vector3Test, V3_CrossProduct) { + Vector3 A{1,1,1}; + Vector3 B{2,2,2}; + + Vector3 ExpectedResult {0,0,0}; + + EXPECT_EQ(A.Cross(B), ExpectedResult); + +} +TEST(Vector3Test, V3_Project) { + Vector3 Base {}; + Vector3 Projection {}; + Vector3 ExpectedResult {}; +} +TEST(Vector3Test, V3_Normalize) { + Vector3 Input {2, 0, 0}; + Vector3 ExpectedResult {1, 0, 0}; + + EXPECT_EQ(Input, ExpectedResult); +} +TEST(Vector3Test, V3_Lerp) +{ + Vector3 Start {}; + Vector3 Finish {}; + float Percent = 50; + Vector3 ExpectedResult {}; + EXPECT_EQ(Start.Lerp(Finish, Percent), ExpectedResult); +} +TEST(Vector3Test, V3_AngleBetween) { + Vector3 A{ .5f, .5f, .5f}; + Vector3 B {.25f, .75f, .25f}; + A = A.Normalize(); + B = B.Normalize(); + LinearAlgebra::Angle2D ExpectedResult {0,0}; + EXPECT_EQ(A.AngleBetween(B), ExpectedResult); +}