TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-08-04 03:15:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move most other Point methods to the header to allow inlining

Browse Source
This commit is contained in:
Dmitry Marakasov 2015-07-07 15:28:16 +03:00
parent 5a55e91987
commit 63cd8feebc
2 changed files with 50 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
SDL2pp/Point.cc
View File

@ -25,72 +25,6 @@
namespace SDL2pp {
Point& Point::SetX(int nx) {
x = nx;
return *this;
}
Point& Point::SetY(int ny) {
y = ny;
return *this;
}
Point& Point::operator+=(const Point& other) {
x += other.x;
y += other.y;
return *this;
}
Point& Point::operator-=(const Point& other) {
x -= other.x;
y -= other.y;
return *this;
}
Point& Point::operator/=(int value) {
x /= value;
y /= value;
return *this;
}
Point& Point::operator/=(const Point& other) {
x /= other.x;
y /= other.y;
return *this;
}
Point& Point::operator%=(int value) {
x %= value;
y %= value;
return *this;
}
Point& Point::operator%=(const Point& other) {
x %= other.x;
y %= other.y;
return *this;
}
Point& Point::operator*=(int value) {
x *= value;
y *= value;
return *this;
}
Point& Point::operator*=(const Point& other) {
x *= other.x;
y *= other.y;
return *this;
}
Point Point::GetClamped(const Rect& rect) const {
Point p = *this;
p.Clamp(rect);

62
SDL2pp/Point.hh
View File

@ -145,7 +145,10 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& SetX(int nx);
Point& SetX(int nx) {
x = nx;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Get Y coordinate of the point
@ -165,7 +168,10 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& SetY(int ny);
Point& SetY(int ny) {
y = ny;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Get point's memberwise negation
@ -291,7 +297,11 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& operator+=(const Point& other);
Point& operator+=(const Point& other) {
x += other.x;
y += other.y;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Memberwise subtract another point
@ -301,7 +311,11 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& operator-=(const Point& other);
Point& operator-=(const Point& other) {
x -= other.x;
y -= other.y;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Memberwise divide by an integer
@ -311,17 +325,25 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& operator/=(int value);
Point& operator/=(int value) {
x /= value;
y /= value;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Memberwise divide by another point
///////////////////////////////////////////////////////////
/// nbrief Memberwise divide by another point
///
/// \param[in] other Divisor
///
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& operator/=(const Point& other);
Point& operator/=(const Point& other) {
x /= other.x;
y /= other.y;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Memberwise remainder from division by an integer
@ -331,7 +353,11 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& operator%=(int value);
Point& operator%=(int value) {
x %= value;
y %= value;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Memberwise remainder from division by another
@ -342,7 +368,11 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& operator%=(const Point& other);
Point& operator%=(const Point& other) {
x %= other.x;
y %= other.y;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Memberwise multiply by an integer
@ -352,7 +382,11 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& operator*=(int value);
Point& operator*=(int value) {
x *= value;
y *= value;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Memberwise multiply by another point
@ -362,7 +396,11 @@ public:
/// \returns Reference to self
///
////////////////////////////////////////////////////////////
Point& operator*=(const Point& other);
Point& operator*=(const Point& other) {
x *= other.x;
y *= other.y;
return *this;
}
////////////////////////////////////////////////////////////
/// \brief Get a point with coordinates modified so it fits