lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Modified the overloads of sf::Shape::Rectangle according to the last modification

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1506 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-04-10 09:35:15 +00:00
parent 136af3d1fe
commit a00a9c1cc2
5 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/SFML/Graphics/Shape.cpp
View file

@ -218,14 +218,14 @@ Shape Shape::Line(const Vector2f& p1, const Vector2f& p2, float thickness, const
////////////////////////////////////////////////////////////
/// Create a shape made of a single rectangle
////////////////////////////////////////////////////////////
Shape Shape::Rectangle(float p1x, float p1y, float p2x, float p2y, const Color& color, float outline, const Color& outlineColor)
Shape Shape::Rectangle(float left, float top, float width, float height, const Color& color, float outline, const Color& outlineColor)
{
// Create the shape's points
Shape shape;
shape.AddPoint(Vector2f(p1x, p1y), color, outlineColor);
shape.AddPoint(Vector2f(p2x, p1y), color, outlineColor);
shape.AddPoint(Vector2f(p2x, p2y), color, outlineColor);
shape.AddPoint(Vector2f(p1x, p2y), color, outlineColor);
shape.AddPoint(Vector2f(left, top), color, outlineColor);
shape.AddPoint(Vector2f(left + width, top), color, outlineColor);
shape.AddPoint(Vector2f(left + width, top + height), color, outlineColor);
shape.AddPoint(Vector2f(left, top + height), color, outlineColor);
shape.SetOutlineWidth(outline);
// Compile it
@ -236,11 +236,11 @@ Shape Shape::Rectangle(float p1x, float p1y, float p2x, float p2y, const Color&
////////////////////////////////////////////////////////////
/// Create a shape made of a single rectangle (use vectors)
/// Create a shape made of a single rectangle
////////////////////////////////////////////////////////////
Shape Shape::Rectangle(const Vector2f& p1, const Vector2f& p2, const Color& color, float outline, const Color& outlineColor)
Shape Shape::Rectangle(const FloatRect& rectangle, const Color& color, float outline, const Color& outlineColor)
{
return Shape::Rectangle(p1.x, p1.y, p2.x, p2.y, color, outline, outlineColor);
return Shape::Rectangle(rectangle.Left, rectangle.Top, rectangle.Width, rectangle.Height, color, outline, outlineColor);
}