CVector moved to shared

Author: MiranDMC

examples/UnitTests/source/Main.cpp

@@ -10,8 +10,9 @@ struct Main
 {
     Main()
     {
+        gInstance.RunTests(); // run now. In future some tests might require the game to be initialized
         // register event callbacks
-        Events::menuDrawingEvent += []{ gInstance.RunTests(); };
+        //Events::menuDrawingEvent += []{ gInstance.RunTests(); };
     }
 
     void RunTests()

examples/UnitTests/source/Test_CVector.h

@@ -48,6 +48,7 @@ UTEST(CVector, ctor_CVector)
     EXPECT_EQ(v.z, 3.0f);
 }
 
+#ifdef RW
 UTEST(CVector, ctor_RwV3d)
 {
     RwV3d src;
@@ -60,6 +61,7 @@ UTEST(CVector, ctor_RwV3d)
     EXPECT_EQ(v.y, 2.0f);
     EXPECT_EQ(v.z, 3.0f);
 }
+#endif
 
 UTEST(CVector, ctor_CVector2D)
 {
@@ -108,6 +110,7 @@ UTEST(CVector, operator_assign)
     EXPECT_EQ(v.z, 3.0f);
 }
 
+#ifdef RW
 UTEST(CVector, FromRwV3d)
 {
     RwV3d src;
@@ -121,6 +124,7 @@ UTEST(CVector, FromRwV3d)
     EXPECT_EQ(v.y, 2.0f);
     EXPECT_EQ(v.z, 3.0f);
 }
+#endif
 
 UTEST(CVector, From2D)
 {
@@ -193,6 +197,7 @@ UTEST(CVector, FromCross)
     EXPECT_NEAR(v.z, 1.0f, F_EPS);
 }
 
+#ifdef HAS_CMATRIX
 UTEST(CVector, FromMultiply)
 {
     CMatrix m;
@@ -220,9 +225,11 @@ UTEST(CVector, FromMultiply3x3)
     EXPECT_NEAR(v.y, 1.0f, F_EPS);
     EXPECT_NEAR(v.z, 0.0f, F_EPS);
 }
+#endif
 
 // conversions
 
+#ifdef RW
 UTEST(CVector, ToRwV3d)
 {
     CVector src;
@@ -235,6 +242,7 @@ UTEST(CVector, ToRwV3d)
     EXPECT_EQ(v.y, 2.0f);
     EXPECT_EQ(v.z, 3.0f);
 }
+#endif
 
 UTEST(CVector, To2D)
 {
@@ -676,6 +684,7 @@ UTEST(CVector, Cross_CVectorCVector)
     EXPECT_NEAR(1.0f, v.z, F_EPS);
 }
 
+#ifdef HAS_CMATRIX
 UTEST(CVector, Multiply)
 {
     CMatrix m;
@@ -701,6 +710,7 @@ UTEST(CVector, Multiply3x3)
     EXPECT_NEAR(v.y, 1.0f, F_EPS);
     EXPECT_NEAR(v.z, 0.0f, F_EPS);
 }
+#endif
 
 // static operators
 

plugin_II/game_II/CVector.cpp plugin_II/game_II/CVector2D.cppplugin_II/game_II/CVector.cpp renamed to plugin_II/game_II/CVector2D.cpp

@@ -5,7 +5,8 @@
     Do not delete this comment block. Respect others' work!
 */
 
-#include "CVector.h"
+#include "CVector2D.h"
+#include <CVector.h>
 
 CEncodedVector::CEncodedVector() {
     x = 0; y = 0; z = 0;
@@ -96,69 +97,3 @@ void CVector2D::operator/=(float divisor) {
 CEncodedVector2D CVector2D::ToInt16() {
     return CEncodedVector2D((int)(this->x * 16384), (int)(this->y * 16384));
 }
-
-CVector::CVector() {
-    x = 0.0f; y = 0.0f; z = 0.0f;
-}
-
-CVector::CVector(float X, float Y, float Z) {
-    x = X; y = Y; z = Z;
-}
-
-CVector::CVector(CVector const& src) {
-    x = src.x; y = src.y; z = src.z;
-}
-
-float CVector::Magnitude() {
-    return sqrtf(this->x * this->x + this->y * this->y + this->z * this->z);
-}
-
-float CVector::Magnitude2D() {
-    return sqrtf(this->x * this->x + this->y * this->y);
-}
-
-void CVector::Sum(CVector& a, CVector& b) {
-    this->x = a.x + b.x;
-    this->y = a.y + b.y;
-    this->z = a.z + b.z;
-}
-
-void CVector::Difference(CVector& a, CVector& b) {
-    this->x = a.x - b.x;
-    this->y = a.y - b.y;
-    this->z = a.z - b.z;
-}
-
-void CVector::operator=(const CVector& right) {
-    this->x = right.x;
-    this->y = right.y;
-    this->z = right.z;
-}
-
-void CVector::operator+=(const CVector& right) {
-    this->x += right.x;
-    this->y += right.y;
-    this->z += right.z;
-}
-
-void CVector::operator-=(const CVector& right) {
-    this->x -= right.x;
-    this->y -= right.y;
-    this->z -= right.z;
-}
-
-void CVector::operator *= (float multiplier) {
-    this->x *= multiplier;
-    this->y *= multiplier;
-    this->z *= multiplier;
-}
-
-void CVector::operator/=(float divisor) {
-    this->x /= divisor;
-    this->y /= divisor;
-    this->z /= divisor;
-}
-
-CEncodedVector CVector::ToInt16() {
-    return CEncodedVector((int)(this->x * 16384), (int)(this->y * 16384), (int)(this->z * 16384));
-}

plugin_II/game_II/CVector.h plugin_II/game_II/CVector2D.hplugin_II/game_II/CVector.h renamed to plugin_II/game_II/CVector2D.h

@@ -66,39 +66,6 @@ inline CVector2D operator*(const CVector2D& left, float right) {
     return CVector2D(left.x * right, left.y * right);
 }
 
-class CVector {
-public:
-    float x, y, z;
-
-public:
-    CVector();
-    CVector(float X, float Y, float Z);
-    CVector(CVector const& src);
-    float Magnitude();
-    float Magnitude2D();
-
-    void Sum(CVector& a, CVector& b);
-    void Difference(CVector& a, CVector& b);
-    void operator=(const CVector& right);
-    void operator+=(const CVector& right);
-    void operator-=(const CVector& right);
-    void operator*=(float multiplier);
-    void operator/=(float divisor);
-    CEncodedVector ToInt16();
-};
-
-inline CVector operator+(const CVector& left, const CVector& right) {
-    return CVector(left.x + right.x, left.y + right.y, left.z + right.z);
-}
-
-inline CVector operator-(const CVector& left, const CVector& right) {
-    return CVector(left.x - right.x, left.y - right.y, left.z - right.z);
-}
-
-inline CVector operator-(const CVector& left, const CVector2D& right) {
-    return CVector(left.x - right.x, left.y - right.y, left.z);
-}
-
-inline CVector2D operator-(const CVector2D& left, const CVector& right) {
+inline CVector2D operator-(const CVector2D& left, const CVector2D& right) {
     return CVector2D(left.x - right.x, left.y - right.y);
 }