Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Rounded rectangle shape #157

Closed
wants to merge 2 commits into from

5 participants

@Overdrivr

I've just added a new shape to the family. I've inspired the code on other shapes, so I hope it is okay.

src/SFML/Graphics/RoundedRectangleShape.cpp
((46 lines not shown))
+void RoundedRectangleShape::SetCornerPointCount(unsigned int count)
+{
+ myCornerPointCount = count;
+ Update();
+}
+
+////////////////////////////////////////////////////////////
+unsigned int RoundedRectangleShape::GetPointCount() const
+{
+ return myCornerPointCount*4;
+}
+
+////////////////////////////////////////////////////////////
+sf::Vector2f RoundedRectangleShape::GetPoint(unsigned int index) const
+{
+ if(index >= myCornerPointCount*4 || index < 0)

wouldn't the second comparison always evaluate to true?

As index is an unsigned int and can not be a value below 0 anyway.

You mean false, right? But yes, the second comparison is useless.

No you're right Jamie, the second comparaison will always be true, strange that I didn't noticed anything when debugging. The code needs modifications for SFML 2, I'll correct that as well.

And by "true" I mean "false", sorry about that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@Foaly

This pull request should be closed, since it's not going to be merged anyway. The code should be moved to the wiki and replace this page https://github.com/LaurentGomila/SFML/wiki/Source%3A-Draw-Rounded-Rectangle because the code on there is outdated and lacks documentation.

@LaurentGomila

Agreed.

@Foaly

I updated the wikipage. It was a simple copy and paste for now. If I have more time, I will test the code (maybe remove the sf namespace) and add some documentation (ie a little example).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 20, 2012
  1. @Overdrivr

    RoundedRectangleShape added

    Overdrivr authored
Commits on Jul 18, 2012
  1. @Overdrivr
This page is out of date. Refresh to see the latest.
View
154 include/SFML/Graphics/RoundedRectangleShape.hpp
@@ -0,0 +1,154 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2012 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+// you must not claim that you wrote the original software.
+// If you use this software in a product, an acknowledgment
+// in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+// and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+#ifndef ROUNDEDRECTANGLESHAPE_HPP
+#define ROUNDEDRECTANGLESHAPE_HPP
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Graphics/Shape.hpp>
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+/// \brief Specialized shape representing a rectangle
+/// with rounded corners
+////////////////////////////////////////////////////////////
+class SFML_GRAPHICS_API RoundedRectangleShape : public sf::Shape
+{
+ public:
+ ////////////////////////////////////////////////////////////
+ /// \brief Default constructor
+ ///
+ /// \param size Size of the rectangle
+ /// \param radius Radius for each rounded corner
+ /// \param pointCount Number of points of each corner
+ ///
+ ////////////////////////////////////////////////////////////
+ explicit RoundedRectangleShape(const Vector2f& size = Vector2f(0, 0), float radius = 0, unsigned int cornerPointCount = 0);
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Set the size of the rounded rectangle
+ ///
+ /// \param size New size of the rounded rectangle
+ ///
+ /// \see GetSize
+ ///
+ ////////////////////////////////////////////////////////////
+ void setSize(const Vector2f& size);
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Get the size of the rounded rectangle
+ ///
+ /// \return Size of the rounded rectangle
+ ///
+ /// \see SetSize
+ ///
+ ////////////////////////////////////////////////////////////
+ const Vector2f& getSize() const;
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Set the radius of the rounded corners
+ ///
+ /// \param Radius of the rounded corners
+ ///
+ /// \see GetRadius
+ ///
+ ////////////////////////////////////////////////////////////
+ void setCornersRadius(float radius);
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Get the radius of the rounded corners
+ ///
+ /// \return Radius of the rounded corners
+ ///
+ /// \see SetRadius
+ ///
+ ////////////////////////////////////////////////////////////
+ const float getCornersRadius() const;
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Set the number of points of each corner
+ ///
+ /// \param count New number of points of the rounded rectangle
+ ///
+ /// \see GetPointCount
+ ///
+ ////////////////////////////////////////////////////////////
+ void setCornerPointCount(unsigned int count);
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Get the number of points defining the rounded rectangle
+ ///
+ /// \return Number of points of the rounded rectangle
+ ///
+ ////////////////////////////////////////////////////////////
+ virtual unsigned int getPointCount() const;
+
+ ////////////////////////////////////////////////////////////
+ /// \brief Get a point of the rounded rectangle
+ ///
+ /// The result is undefined if \a index is out of the valid range.
+ ///
+ /// \param index Index of the point to get, in range [0 .. GetPointCount() - 1]
+ ///
+ /// \return Index-th point of the shape
+ ///
+ ////////////////////////////////////////////////////////////
+ virtual sf::Vector2f getPoint(unsigned int index) const;
+
+ private:
+ ////////////////////////////////////////////////////////////
+ // Member data
+ ////////////////////////////////////////////////////////////
+ Vector2f mySize;
+ float myRadius;
+ unsigned int myCornerPointCount;
+};
+}
+#endif // ROUNDEDRECTANGLESHAPE_HPP
+
+////////////////////////////////////////////////////////////
+/// \class sf::RoundedRectangleShape
+/// \ingroup graphics
+///
+/// This class inherits all the functions of sf::Transformable
+/// (position, rotation, scale, bounds, ...) as well as the
+/// functions of sf::Shape (outline, color, texture, ...).
+///
+/// Usage example:
+/// \code
+/// sf::RoundedRectangleShape roundedRectangle;
+/// rectangle.setSize(sf::Vector2f(100, 50));
+/// rectangle.setCornersRadius(5);
+/// rectangle.setOutlineThickness(5);
+/// rectangle.setPosition(10, 20);
+/// ...
+/// window.draw(rectangle);
+/// \endcode
+///
+/// \see sf::Shape, sf::CircleShape, sf::ConvexShape
+///
+////////////////////////////////////////////////////////////
View
104 src/SFML/Graphics/RoundedRectangleShape.cpp
@@ -0,0 +1,104 @@
+////////////////////////////////////////////////////////////
+//
+// SFML - Simple and Fast Multimedia Library
+// Copyright (C) 2007-2012 Laurent Gomila (laurent.gom@gmail.com)
+//
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors be held liable for any damages arising from the use of this software.
+//
+// Permission is granted to anyone to use this software for any purpose,
+// including commercial applications, and to alter it and redistribute it freely,
+// subject to the following restrictions:
+//
+// 1. The origin of this software must not be misrepresented;
+// you must not claim that you wrote the original software.
+// If you use this software in a product, an acknowledgment
+// in the product documentation would be appreciated but is not required.
+//
+// 2. Altered source versions must be plainly marked as such,
+// and must not be misrepresented as being the original software.
+//
+// 3. This notice may not be removed or altered from any source distribution.
+//
+////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////
+// Headers
+////////////////////////////////////////////////////////////
+#include <SFML/Graphics/RoundedRectangleShape.hpp>
+#include <cmath>
+
+namespace sf
+{
+////////////////////////////////////////////////////////////
+RoundedRectangleShape::RoundedRectangleShape(const Vector2f& size, float radius, unsigned int cornerPointCount)
+{
+ mySize = size;
+ myRadius = radius;
+ myCornerPointCount = cornerPointCount;
+ Update();
+}
+
+////////////////////////////////////////////////////////////
+void RoundedRectangleShape::setSize(const Vector2f& size)
+{
+ mySize = size;
+ Update();
+}
+
+////////////////////////////////////////////////////////////
+const Vector2f& RoundedRectangleShape::getSize() const
+{
+ return mySize;
+}
+
+////////////////////////////////////////////////////////////
+void RoundedRectangleShape::setCornersRadius(float radius)
+{
+ myRadius = radius;
+ Update();
+}
+
+////////////////////////////////////////////////////////////
+const float RoundedRectangleShape::getCornersRadius() const
+{
+ return myRadius;
+}
+
+////////////////////////////////////////////////////////////
+void RoundedRectangleShape::setCornerPointCount(unsigned int count)
+{
+ myCornerPointCount = count;
+ Update();
+}
+
+////////////////////////////////////////////////////////////
+unsigned int RoundedRectangleShape::getPointCount() const
+{
+ return myCornerPointCount*4;
+}
+
+////////////////////////////////////////////////////////////
+sf::Vector2f RoundedRectangleShape::getPoint(unsigned int index) const
+{
+ if(index >= myCornerPointCount*4)
+ return sf::Vector2f(0,0);
+
+ float deltaAngle = 90.0f/(myCornerPointCount-1);
+ sf::Vector2f center;
+ unsigned int centerIndex = index/myCornerPointCount;
+ unsigned int offset = 0;
+ static const float pi = 3.141592654f;
+
+ switch(centerIndex)
+ {
+ case 0: center.x = mySize.x - myRadius; center.y = myRadius; break;
+ case 1: center.x = myRadius; center.y = myRadius; break;
+ case 2: center.x = myRadius; center.y = mySize.y - myRadius; break;
+ case 3: center.x = mySize.x - myRadius; center.y = mySize.y - myRadius; break;
+ }
+
+ return sf::Vector2f(myRadius*cos(deltaAngle*(index-centerIndex)*pi/180)+center.x,
+ myRadius*sin(deltaAngle*(index-centerIndex)*pi/180)-center.y);
+}
+}//namespace sf
Something went wrong with that request. Please try again.