X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmath%2Frect.hpp;h=1fd5dcbf20ac7ea2bfbdd03daebededc47698827;hb=7e1ffbded538860c7f647d4597ee3dcb1f0917ca;hp=0f8e6c2598c2612586ea9e07833bc9b92e1e341e;hpb=07ddaed2a657e4d2a3d038fed223fc5827159caf;p=supertux.git diff --git a/src/math/rect.hpp b/src/math/rect.hpp index 0f8e6c259..1fd5dcbf2 100644 --- a/src/math/rect.hpp +++ b/src/math/rect.hpp @@ -25,8 +25,8 @@ /** This class represents a rectangle. * (Implementation Note) We're using upper left and lower right point instead of - * upper left and width/height here, because that makes the collision dectection - * a little bit efficienter. + * upper left and width/height here, because that makes the collision detection + * a little bit more efficient. */ class Rect { @@ -83,7 +83,11 @@ public: { set_width(width); set_height(height); - } + } + Vector get_size() + { + return Vector(get_width(), get_height()); + } void move(const Vector& v) { @@ -91,11 +95,11 @@ public: p2 += v; } - bool inside(const Vector& v) const + bool contains(const Vector& v) const { return v.x >= p1.x && v.y >= p1.y && v.x < p2.x && v.y < p2.y; } - bool inside(const Rect& other) const + bool contains(const Rect& other) const { if(p1.x >= other.p2.x || other.p1.x >= p2.x) return false; @@ -104,8 +108,8 @@ public: return true; } - - // leave these 2 public to safe the headaches of set/get functions for such + + // leave these two public to save the headaches of set/get functions for such // simple things :) /// upper left edge @@ -115,4 +119,3 @@ public: }; #endif -