vector; tests

UGameEngine/vector3d.cpp

@@ -51,6 +51,16 @@ bool Vector3D::isNull() const
     return _x == 0 && _y == 0 && _z == 0;
 }
 
+bool Vector3D::equal(const Vector3D &other) const
+{
+    return _x == other._x && _y == other._y && _z == other._z;
+}
+
+Vector3D &Vector3D::add(double k)
+{
+    return add(Vector3D(k, k, k));
+}
+
 Vector3D &Vector3D::add(double x, double y, double z)
 {
     return add(Vector3D(x, y, z));
@@ -64,6 +74,11 @@ Vector3D& Vector3D::add(const Vector3D &other)
     return *this;
 }
 
+Vector3D &Vector3D::sub(double k)
+{
+    return sub(Vector3D(k, k, k));
+}
+
 Vector3D &Vector3D::sub(double x, double y, double z)
 {
     return sub(Vector3D(x, y, z));
@@ -108,8 +123,67 @@ double Vector3D::norm() const
     return sqrt((_x * _x) + (_y * _y) + (_z * _z));
 }
 
+Vector3D Vector3D::operator+()
+{
+    return *this;
+}
+
+Vector3D Vector3D::operator+(const double &k)
+{
+    return Vector3D(*this).add(k);
+}
+
+Vector3D Vector3D::operator+(const Vector3D &v2)
+{
+    return Vector3D(*this).add(v2);
+}
+
+Vector3D Vector3D::operator-()
+{
+    return Vector3D(-_x, -_y, -_z);
+}
+
+Vector3D Vector3D::operator-(const double &k)
+{
+    return Vector3D(*this).sub(k);
+}
+
+Vector3D Vector3D::operator-(const Vector3D &v2)
+{
+    return Vector3D(*this).sub(v2);
+}
+
+Vector3D Vector3D::operator*(const double &k)
+{
+    return Vector3D(*this).mult(k);
+}
+
+double Vector3D::operator*(const Vector3D &v2)
+{
+    return Vector3D(*this).dotProduct(v2);
+}
+
+Vector3D Vector3D::operator/(const double &k)
+{
+    return Vector3D(*this).div(k);
+}
+
+bool Vector3D::operator==(const Vector3D &other)
+{
+    return equal(other);
+}
+
+bool Vector3D::operator!=(const Vector3D &other)
+{
+    return !equal(other);
+}
+
+bool Vector3D::operator!()
+{
+    return isNull();
+}
 
-Vector3D &operator+(const Vector3D &v1, const Vector3D &v2)
+Vector3D::operator bool()
 {
-    return Vector3D(v1).add(v2);
+    return !isNull();
 }

UGameEngine/vector3d.h

@@ -4,7 +4,7 @@
 class Vector3D
 {
 public:
-    Vector3D(double x = 0.0, double y = 0.0, double z = 0.0);
+    explicit Vector3D(double x = 0.0, double y = 0.0, double z = 0.0);
     Vector3D(const Vector3D& other);
 
     double getX() const;
@@ -18,9 +18,13 @@ public:
 
     bool isNull() const;
 
+    bool equal(const Vector3D& other) const;
+
+    Vector3D& add(double k);
     Vector3D& add(double x, double y, double z);
     Vector3D& add(const Vector3D& other);
 
+    Vector3D& sub(double k);
     Vector3D& sub(double x, double y, double z);
     Vector3D& sub(const Vector3D& other);
 
@@ -33,12 +37,30 @@ public:
 
     double norm() const;
 
+    Vector3D operator+();
+    Vector3D operator+(const double& k);
+    Vector3D operator+(const Vector3D& v2);
+
+    Vector3D operator-();
+    Vector3D operator-(const double& k);
+    Vector3D operator-(const Vector3D& v2);
+
+    Vector3D operator*(const double& k);
+    double operator*(const Vector3D& v2);
+
+    Vector3D operator/(const double& k);
+
+    bool operator==(const Vector3D& other);
+    bool operator!=(const Vector3D& other);
+
+    bool operator!();
+    operator bool();
+
 private:
     double _x;
     double _y;
     double _z;
 };
 
-Vector3D& operator+(const Vector3D& v1, const Vector3D& v2);
 
 #endif // VECTOR3D_H

tests/testvector3d.cpp

@@ -9,7 +9,35 @@ private slots:
     void gettersSetters1();
     void gettersSetters2();
     void gettersSetters3();
+
+    void isNull1();
+    void isNull1Op();
+    void isNull2();
+    void isNull2Op();
+
+    void equal1();
+    void equal2();
+    void equal3();
+    void equal4();
+    void equal5();
+    void equal6();
+
+    void add1();
+    void add1Op();
+    void add2();
+    void add2Op();
+    void add3Op();
+
+    void sub1();
+    void sub1Op();
+    void sub2();
+    void sub2Op();
+    void sub3Op();
+
     void mult();
+    void multOp();
+
+
     void div();
 };
 
@@ -40,6 +68,214 @@ void TestVector3D::gettersSetters3()
     QCOMPARE(v.getZ(), z);
 }
 
+void TestVector3D::isNull1()
+{
+    double x = 1.42, y = 2.0, z = 3.0;
+    Vector3D v(x, y, z);
+    QCOMPARE(v.isNull(), false);
+}
+
+void TestVector3D::isNull1Op()
+{
+    double x = 1.42, y = 2.0, z = 3.0;
+    Vector3D v(x, y, z);
+    QCOMPARE((bool)v, true);
+}
+
+void TestVector3D::isNull2()
+{
+    Vector3D v;
+    QCOMPARE(v.isNull(), true);
+}
+
+void TestVector3D::isNull2Op()
+{
+    Vector3D v;
+    QCOMPARE(!v, true);
+}
+
+void TestVector3D::equal1()
+{
+    Vector3D v1(1.42, 2.0, 3.0);
+    Vector3D v2(1.42, 2.0, 3.0);
+    QCOMPARE(v1.equal(v2), true);
+}
+
+void TestVector3D::equal2()
+{
+    Vector3D v1(1.42, 2.0, 3.0);
+    Vector3D v2(1.40, 2.0, 3.0);
+    QCOMPARE(v1.equal(v2), false);
+}
+
+void TestVector3D::equal3()
+{
+    Vector3D v1(1.42, 2.0, 3.0);
+    Vector3D v2(1.42, 2.1, 3.0);
+    QCOMPARE(v1.equal(v2), false);
+}
+
+void TestVector3D::equal4()
+{
+    Vector3D v1(1.42, 2.0, 3.0);
+    Vector3D v2(1.42, 2.0, 3.1);
+    QCOMPARE(v1.equal(v2), false);
+}
+
+void TestVector3D::equal5()
+{
+    Vector3D v1(1.42, 2.0, 3.0);
+    Vector3D v2(1.42, 2.0, 3.1);
+    QCOMPARE(v1 == v2, false);
+}
+
+void TestVector3D::equal6()
+{
+    Vector3D v1(1.42, 2.0, 3.0);
+    Vector3D v2(1.42, 2.0, 3.0);
+    QCOMPARE(v1 == v2, true);
+}
+
+void TestVector3D::add1()
+{
+    double x = 1.42, y = 2.0, z = 3.0, x2 = 0.24, y2 = 24.0, z2 = 42.0;
+    Vector3D v(x, y, z);
+    v.add(x2, y2, z2);
+    QCOMPARE(v.getX(), x + x2);
+    QCOMPARE(v.getY(), y + y2);
+    QCOMPARE(v.getZ(), z + z2);
+}
+
+void TestVector3D::add1Op()
+{
+    double x = 1.42, y = 2.0, z = 3.0, x2 = 0.24, y2 = 24.0, z2 = 42.0;
+    Vector3D v1(x, y, z);
+    Vector3D v2(x2, y2, z2);
+    Vector3D v = v1 + v2;
+
+    QCOMPARE(v.getX(), x + x2);
+    QCOMPARE(v.getY(), y + y2);
+    QCOMPARE(v.getZ(), z + z2);
+
+    QCOMPARE(v1.getX(), x);
+    QCOMPARE(v1.getY(), y);
+    QCOMPARE(v1.getZ(), z);
+
+    QCOMPARE(v2.getX(), x2);
+    QCOMPARE(v2.getY(), y2);
+    QCOMPARE(v2.getZ(), z2);
+}
+
+void TestVector3D::add2()
+{
+    double x = 1.42, y = 2.0, z = 3.0, m = 0.24;
+    Vector3D v(x, y, z);
+    v.add(m);
+    QCOMPARE(v.getX(), x + m);
+    QCOMPARE(v.getY(), y + m);
+    QCOMPARE(v.getZ(), z + m);
+}
+
+void TestVector3D::add2Op()
+{
+    double x = 1.42, y = 2.0, z = 3.0, m = 0.24;
+    Vector3D v1(x, y, z);
+    Vector3D v = v1 + m;
+
+    QCOMPARE(v.getX(), x + m);
+    QCOMPARE(v.getY(), y + m);
+    QCOMPARE(v.getZ(), z + m);
+
+    QCOMPARE(v1.getX(), x);
+    QCOMPARE(v1.getY(), y);
+    QCOMPARE(v1.getZ(), z);
+}
+
+void TestVector3D::add3Op()
+{
+    double x = 1.42, y = 2.0, z = 3.0;
+    Vector3D v1(x, y, z);
+    Vector3D v = +v1;
+
+    QCOMPARE(v.getX(), x);
+    QCOMPARE(v.getY(), y);
+    QCOMPARE(v.getZ(), z);
+
+    QCOMPARE(v1.getX(), x);
+    QCOMPARE(v1.getY(), y);
+    QCOMPARE(v1.getZ(), z);
+}
+
+void TestVector3D::sub1()
+{
+    double x = 1.42, y = 2.0, z = 3.0, x2 = 0.24, y2 = 24.0, z2 = 42.0;
+    Vector3D v(x, y, z);
+    v.sub(x2, y2, z2);
+    QCOMPARE(v.getX(), x - x2);
+    QCOMPARE(v.getY(), y - y2);
+    QCOMPARE(v.getZ(), z - z2);
+}
+
+void TestVector3D::sub1Op()
+{
+    double x = 1.42, y = 2.0, z = 3.0, x2 = 0.24, y2 = 24.0, z2 = 42.0;
+    Vector3D v1(x, y, z);
+    Vector3D v2(x2, y2, z2);
+    Vector3D v = v1 - v2;
+
+    QCOMPARE(v.getX(), x - x2);
+    QCOMPARE(v.getY(), y - y2);
+    QCOMPARE(v.getZ(), z - z2);
+
+    QCOMPARE(v1.getX(), x);
+    QCOMPARE(v1.getY(), y);
+    QCOMPARE(v1.getZ(), z);
+
+    QCOMPARE(v2.getX(), x2);
+    QCOMPARE(v2.getY(), y2);
+    QCOMPARE(v2.getZ(), z2);
+}
+
+void TestVector3D::sub2()
+{
+    double x = 1.42, y = 2.0, z = 3.0, m = 0.24;
+    Vector3D v(x, y, z);
+    v.sub(m);
+    QCOMPARE(v.getX(), x - m);
+    QCOMPARE(v.getY(), y - m);
+    QCOMPARE(v.getZ(), z - m);
+}
+
+void TestVector3D::sub2Op()
+{
+    double x = 1.42, y = 2.0, z = 3.0, m = 0.24;
+    Vector3D v1(x, y, z);
+    Vector3D v = v1 - m;
+
+    QCOMPARE(v.getX(), x - m);
+    QCOMPARE(v.getY(), y - m);
+    QCOMPARE(v.getZ(), z - m);
+
+    QCOMPARE(v1.getX(), x);
+    QCOMPARE(v1.getY(), y);
+    QCOMPARE(v1.getZ(), z);
+}
+
+void TestVector3D::sub3Op()
+{
+    double x = 1.42, y = 2.0, z = 3.0;
+    Vector3D v1(x, y, z);
+    Vector3D v = -v1;
+
+    QCOMPARE(v.getX(), -x);
+    QCOMPARE(v.getY(), -y);
+    QCOMPARE(v.getZ(), -z);
+
+    QCOMPARE(v1.getX(), x);
+    QCOMPARE(v1.getY(), y);
+    QCOMPARE(v1.getZ(), z);
+}
+
 void TestVector3D::mult()
 {
     double x = 1.42, y = 2.0, z = 3.0, m = 2.0;
@@ -50,6 +286,16 @@ void TestVector3D::mult()
     QCOMPARE(v.getZ(), z * m);
 }
 
+void TestVector3D::multOp()
+{
+    double x = 1.42, y = 2.0, z = 3.0, m = 2.0;
+    Vector3D v1(x, y, z);
+    Vector3D v = v1 * m;
+    QCOMPARE(v.getX(), x * m);
+    QCOMPARE(v.getY(), y * m);
+    QCOMPARE(v.getZ(), z * m);
+}
+
 void TestVector3D::div()
 {
     double x = 1.42, y = 2.0, z = 3.0, m = 2.0;