Codebase update: Made Vector2 a POD
This commit is contained in:
+4
-2
@@ -43,8 +43,10 @@ InWorld::InWorld() {
|
|||||||
|
|
||||||
snprintf(p.playerInfo.handle, PACKET_STRING_SIZE, "%s", configUtil->CString("handle"));
|
snprintf(p.playerInfo.handle, PACKET_STRING_SIZE, "%s", configUtil->CString("handle"));
|
||||||
snprintf(p.playerInfo.avatar, PACKET_STRING_SIZE, "%s", configUtil->CString("avatar"));
|
snprintf(p.playerInfo.avatar, PACKET_STRING_SIZE, "%s", configUtil->CString("avatar"));
|
||||||
p.playerInfo.position = {50, 50};
|
p.playerInfo.position.x = 50;
|
||||||
p.playerInfo.motion = {0, 0};
|
p.playerInfo.position.y = 50;
|
||||||
|
p.playerInfo.motion.x = 0;
|
||||||
|
p.playerInfo.motion.y = 0;
|
||||||
|
|
||||||
netUtil->Send(GAME_CHANNEL, &p, sizeof(Packet));
|
netUtil->Send(GAME_CHANNEL, &p, sizeof(Packet));
|
||||||
|
|
||||||
|
|||||||
@@ -29,9 +29,7 @@ class Vector2 {
|
|||||||
public:
|
public:
|
||||||
double x = 0, y = 0;
|
double x = 0, y = 0;
|
||||||
Vector2() = default;
|
Vector2() = default;
|
||||||
Vector2(double i, double j) {
|
|
||||||
x = i; y = j;
|
|
||||||
}
|
|
||||||
double Length() const {
|
double Length() const {
|
||||||
return sqrt(x*x+y*y);
|
return sqrt(x*x+y*y);
|
||||||
}
|
}
|
||||||
@@ -46,20 +44,46 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
//Arithmetic operators
|
//Arithmetic operators
|
||||||
Vector2 operator+(Vector2 v) const { return Vector2(x + v.x, y + v.y); }
|
Vector2 operator+(Vector2 v) const {
|
||||||
Vector2 operator-(Vector2 v) const { return Vector2(x - v.x, y - v.y); }
|
Vector2 ret;
|
||||||
Vector2 operator*(Vector2 v) const { return Vector2(x * v.x, y * v.y); }
|
ret.x = x + v.x;
|
||||||
Vector2 operator*(double d) const { return Vector2(x * d, y * d); }
|
ret.y = y + v.y;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
Vector2 operator-(Vector2 v) const {
|
||||||
|
Vector2 ret;
|
||||||
|
ret.x = x - v.x;
|
||||||
|
ret.y = y - v.y;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
Vector2 operator*(Vector2 v) const {
|
||||||
|
Vector2 ret;
|
||||||
|
ret.x = x * v.x;
|
||||||
|
ret.y = y * v.y;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
Vector2 operator*(double d) const {
|
||||||
|
Vector2 ret;
|
||||||
|
ret.x = x * d;
|
||||||
|
ret.y = y * d;
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
Vector2 operator/(Vector2 v) {
|
Vector2 operator/(Vector2 v) {
|
||||||
if (!v.x || !v.y)
|
if (!v.x || !v.y)
|
||||||
throw(std::domain_error("Divide by zero"));
|
throw(std::domain_error("Divide by zero"));
|
||||||
return Vector2(x / v.x, y / v.y);
|
Vector2 ret;
|
||||||
|
ret.x = x / v.x;
|
||||||
|
ret.y = y / v.y;
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
Vector2 operator/(double d) {
|
Vector2 operator/(double d) {
|
||||||
if (!d)
|
if (!d)
|
||||||
throw(std::domain_error("Divide by zero"));
|
throw(std::domain_error("Divide by zero"));
|
||||||
return Vector2(x / d, y / d);
|
Vector2 ret;
|
||||||
|
ret.x = x / d;
|
||||||
|
ret.y = y / d;
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
|
bool operator==(Vector2 v) { return (x == v.x && y == v.y); }
|
||||||
|
|||||||
Reference in New Issue
Block a user