App: Add Vector2 and Vector3 implementation
This commit is contained in:
parent
c408c76027
commit
e57bd40991
5
App/.vscode/settings.json
vendored
5
App/.vscode/settings.json
vendored
@ -42,7 +42,10 @@
|
|||||||
"xstddef": "cpp",
|
"xstddef": "cpp",
|
||||||
"xstring": "cpp",
|
"xstring": "cpp",
|
||||||
"xtr1common": "cpp",
|
"xtr1common": "cpp",
|
||||||
"xutility": "cpp"
|
"xutility": "cpp",
|
||||||
|
"list": "cpp",
|
||||||
|
"vector": "cpp",
|
||||||
|
"xtree": "cpp"
|
||||||
},
|
},
|
||||||
"cmake.configureOnOpen": true
|
"cmake.configureOnOpen": true
|
||||||
}
|
}
|
||||||
@ -8,6 +8,9 @@ namespace Core
|
|||||||
class Vector2
|
class Vector2
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
float x;
|
||||||
|
float y;
|
||||||
|
|
||||||
Vector2();
|
Vector2();
|
||||||
Vector2(float x, float y);
|
Vector2(float x, float y);
|
||||||
|
|
||||||
@ -15,18 +18,15 @@ namespace Core
|
|||||||
Vector2 operator-(Vector2 const& other);
|
Vector2 operator-(Vector2 const& other);
|
||||||
Vector2 operator*(Vector2 const& other);
|
Vector2 operator*(Vector2 const& other);
|
||||||
Vector2 operator/(Vector2 const& other);
|
Vector2 operator/(Vector2 const& other);
|
||||||
Vector2 operator+=(Vector2 const& other);
|
Vector2& operator+=(Vector2 const& other);
|
||||||
Vector2 operator-=(Vector2 const& other);
|
Vector2& operator-=(Vector2 const& other);
|
||||||
Vector2 operator*=(Vector2 const& other);
|
Vector2& operator*=(Vector2 const& other);
|
||||||
Vector2 operator/=(Vector2 const& other);
|
Vector2& operator/=(Vector2 const& other);
|
||||||
|
|
||||||
bool operator==(Vector2 const& other);
|
bool operator==(Vector2 const& other);
|
||||||
bool operator!=(Vector2 const& other);
|
bool operator!=(Vector2 const& other);
|
||||||
|
|
||||||
Vector2 operator*(float const& scalar);
|
Vector2 operator*(float const& scalar);
|
||||||
|
|
||||||
float x;
|
|
||||||
float y;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class Vector3
|
class Vector3
|
||||||
@ -37,14 +37,18 @@ namespace Core
|
|||||||
float z;
|
float z;
|
||||||
float w;
|
float w;
|
||||||
|
|
||||||
|
Vector3();
|
||||||
|
Vector3(float x, float y, float z);
|
||||||
|
Vector3(float x, float y, float z, float w);
|
||||||
|
|
||||||
Vector3 operator+(Vector3 const& other);
|
Vector3 operator+(Vector3 const& other);
|
||||||
Vector3 operator-(Vector3 const& other);
|
Vector3 operator-(Vector3 const& other);
|
||||||
Vector3 operator*(Vector3 const& other);
|
Vector3 operator*(Vector3 const& other);
|
||||||
Vector3 operator/(Vector3 const& other);
|
Vector3 operator/(Vector3 const& other);
|
||||||
Vector3 operator+=(Vector3 const& other);
|
Vector3& operator+=(Vector3 const& other);
|
||||||
Vector3 operator-=(Vector3 const& other);
|
Vector3& operator-=(Vector3 const& other);
|
||||||
Vector3 operator*=(Vector3 const& other);
|
Vector3& operator*=(Vector3 const& other);
|
||||||
Vector3 operator/=(Vector3 const& other);
|
Vector3& operator/=(Vector3 const& other);
|
||||||
|
|
||||||
bool operator==(Vector3 const& other);
|
bool operator==(Vector3 const& other);
|
||||||
bool operator!=(Vector3 const& other);
|
bool operator!=(Vector3 const& other);
|
||||||
|
|||||||
@ -27,7 +27,143 @@ namespace Core
|
|||||||
|
|
||||||
Vector2 Vector2::operator/(Vector2 const &other)
|
Vector2 Vector2::operator/(Vector2 const &other)
|
||||||
{
|
{
|
||||||
|
// TODO(Eero): Add Zero checks
|
||||||
return Vector2(this->x/other.x, this->y/other.y);
|
return Vector2(this->x/other.x, this->y/other.y);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Vector2& Vector2::operator+=(Vector2 const &other)
|
||||||
|
{
|
||||||
|
this->x += other.x;
|
||||||
|
this->y += other.y;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector2& Vector2::operator-=(Vector2 const &other)
|
||||||
|
{
|
||||||
|
this->x -= other.x;
|
||||||
|
this->y -= other.y;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector2& Vector2::operator*=(Vector2 const &other)
|
||||||
|
{
|
||||||
|
this->x *= other.x;
|
||||||
|
this->y *= other.y;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector2& Vector2::operator/=(Vector2 const &other)
|
||||||
|
{
|
||||||
|
// TODO(Eero): Add Zero checks
|
||||||
|
this->x /= other.x;
|
||||||
|
this->y /= other.y;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Vector2::operator==(Vector2 const &other)
|
||||||
|
{
|
||||||
|
return (this->x == other.x && this->y == other.y) ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Vector2::operator!=(Vector2 const &other)
|
||||||
|
{
|
||||||
|
return (this->x != other.x || this->y != other.y) ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector2 Vector2::operator*(float const &scalar)
|
||||||
|
{
|
||||||
|
return Vector2(scalar * this->x, scalar * this->y);
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3::Vector3() : x(0), y(0), z(0), w(1)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3::Vector3(float x, float y, float z) : x(x), y(y), z(z), w(1)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3::Vector3(float x, float y, float z, float w) : x(x), y(y), z(z), w(w)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3 Vector3::operator+(Vector3 const &other)
|
||||||
|
{
|
||||||
|
return Vector3(this->x+other.x, this->y+other.y, this->z+other.z);
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3 Vector3::operator-(Vector3 const &other)
|
||||||
|
{
|
||||||
|
return Vector3(this->x-other.x, this->y-other.y, this->z-other.z);
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3 Vector3::operator*(Vector3 const &other)
|
||||||
|
{
|
||||||
|
return Vector3(this->x*other.x, this->y*other.y, this->z*other.z);
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3 Vector3::operator/(Vector3 const &other)
|
||||||
|
{
|
||||||
|
// TODO(Eero): Add Zero checks
|
||||||
|
return Vector3(this->x/other.x, this->y/other.y, this->z/other.z);
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3& Vector3::operator+=(Vector3 const &other)
|
||||||
|
{
|
||||||
|
this->x += other.x;
|
||||||
|
this->y += other.y;
|
||||||
|
this->z += other.z;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3& Vector3::operator-=(Vector3 const &other)
|
||||||
|
{
|
||||||
|
this->x -= other.x;
|
||||||
|
this->y -= other.y;
|
||||||
|
this->z -= other.z;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3& Vector3::operator*=(Vector3 const &other)
|
||||||
|
{
|
||||||
|
this->x *= other.x;
|
||||||
|
this->y *= other.y;
|
||||||
|
this->z *= other.z;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3& Vector3::operator/=(Vector3 const &other)
|
||||||
|
{
|
||||||
|
// TODO(Eero): Add Zero checks
|
||||||
|
this->x /= other.x;
|
||||||
|
this->y /= other.y;
|
||||||
|
this->z /= other.z;
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Vector3::operator==(Vector3 const &other)
|
||||||
|
{
|
||||||
|
return (
|
||||||
|
this->x == other.x
|
||||||
|
&& this->y == other.y
|
||||||
|
&& this->z == other.z
|
||||||
|
&& this->w == other.w // TODO(Eero): Is w check required?
|
||||||
|
) ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Vector3::operator!=(Vector3 const &other)
|
||||||
|
{
|
||||||
|
return (
|
||||||
|
this->x != other.x
|
||||||
|
|| this->y != other.y
|
||||||
|
|| this->z != other.z
|
||||||
|
|| this->w != other.w // TODO(Eero): Is w check required?
|
||||||
|
) ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Vector3 Vector3::operator*(float const &scalar)
|
||||||
|
{
|
||||||
|
return Vector3(scalar * this->x, scalar * this->y, scalar * this->z);
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Core
|
} // namespace Core
|
||||||
Loading…
x
Reference in New Issue
Block a user