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

Implement Rect::Contains(Point)

Browse Source
This commit is contained in:
Dmitry Marakasov 2014-11-24 01:52:49 +03:00
parent 39c377d7ee
commit 359a0e93c8
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SDL2pp/Rect.cc
View File

@ -21,6 +21,8 @@
#include <cassert>
#include <SDL2pp/Point.hh>
#include <SDL2pp/Rect.hh>
namespace SDL2pp {
@ -129,4 +131,10 @@ void Rect::SetY2(int y2) {
rect_.h = y2 - rect_.y + 1;
}
bool Rect::Contains(const Point& point) const {
if (IsNull() || point.IsNull())
return false;
return !(point.GetX() < GetX() || point.GetY() < GetY() || point.GetX() > GetX2() || point.GetY() > GetY2());
}
}

4
SDL2pp/Rect.hh
View File

@ -28,6 +28,8 @@ struct SDL_Rect;
namespace SDL2pp {
class Point;
class Rect {
private:
SDL_Rect rect_;
@ -74,6 +76,8 @@ public:
int GetY2() const;
void SetY2(int y2);
bool Contains(const Point& point) const;
};
}

13
tests/test_pointrect.cc
View File

@ -160,4 +160,17 @@ BEGIN_TEST()
EXPECT_TRUE(r.GetX() == 98 && r.GetY() == 97);
EXPECT_TRUE(r.GetX2() == 102 && r.GetY2() == 103);
}
{
// Rect contains point
Rect r(10, 20, 5, 5);
EXPECT_TRUE(r.Contains(Point(10, 20)));
EXPECT_TRUE(r.Contains(Point(14, 24)));
EXPECT_TRUE(!r.Contains(Point(9, 20)));
EXPECT_TRUE(!r.Contains(Point(10, 19)));
EXPECT_TRUE(!r.Contains(Point(15, 20)));
EXPECT_TRUE(!r.Contains(Point(10, 25)));
}
END_TEST()