mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 04:41:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant 4-param sf::Rect<T> constructor

Browse Source
This commit is contained in:
Chris Thrasher 2021-12-31 12:52:52 -07:00 committed by Vittorio Romeo
parent 6c816aba44
commit 79c2aadbcc
12 changed files with 33 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/shader/Shader.cpp
View File

@ -208,7 +208,7 @@ public:
// Load the moving entities
for (int i = 0; i < 6; ++i)
{
sf::Sprite entity(m_entityTexture, sf::IntRect(96 * i, 0, 96, 96));
sf::Sprite entity(m_entityTexture, sf::IntRect({96 * i, 0}, {96, 96}));
m_entities.push_back(entity);
}

2
include/SFML/Graphics/Image.hpp
View File

@ -214,7 +214,7 @@ public:
/// \param applyAlpha Should the copy take into account the source transparency?
///
////////////////////////////////////////////////////////////
void copy(const Image& source, unsigned int destX, unsigned int destY, const IntRect& sourceRect = IntRect(0, 0, 0, 0), bool applyAlpha = false);
void copy(const Image& source, unsigned int destX, unsigned int destY, const IntRect& sourceRect = IntRect({0, 0}, {0, 0}), bool applyAlpha = false);
////////////////////////////////////////////////////////////
/// \brief Change the color of a pixel

14
include/SFML/Graphics/Rect.hpp
View File

@ -51,20 +51,6 @@ public:
////////////////////////////////////////////////////////////
constexpr Rect();
////////////////////////////////////////////////////////////
/// \brief Construct the rectangle from its coordinates
///
/// Be careful, the last two parameters are the width
/// and height, not the right and bottom coordinates!
///
/// \param rectLeft Left coordinate of the rectangle
/// \param rectTop Top coordinate of the rectangle
/// \param rectWidth Width of the rectangle
/// \param rectHeight Height of the rectangle
///
////////////////////////////////////////////////////////////
constexpr Rect(T rectLeft, T rectTop, T rectWidth, T rectHeight);
////////////////////////////////////////////////////////////
/// \brief Construct the rectangle from position and size
///

16
include/SFML/Graphics/Rect.inl
View File

@ -35,18 +35,6 @@ height(0)
}
////////////////////////////////////////////////////////////
template <typename T>
constexpr Rect<T>::Rect(T rectLeft, T rectTop, T rectWidth, T rectHeight) :
left (rectLeft),
top (rectTop),
width (rectWidth),
height(rectHeight)
{
}
////////////////////////////////////////////////////////////
template <typename T>
constexpr Rect<T>::Rect(const Vector2<T>& position, const Vector2<T>& size) :
@ -131,12 +119,12 @@ constexpr bool Rect<T>::intersects(const Rect<T>& rectangle, Rect<T>& intersecti
// If the intersection is valid (positive non zero area), then there is an intersection
if ((interLeft < interRight) && (interTop < interBottom))
{
intersection = Rect<T>(interLeft, interTop, interRight - interLeft, interBottom - interTop);
intersection = Rect<T>({interLeft, interTop}, {interRight - interLeft, interBottom - interTop});
return true;
}
else
{
intersection = Rect<T>(0, 0, 0, 0);
intersection = Rect<T>({0, 0}, {0, 0});
return false;
}
}

6
src/SFML/Graphics/Font.cpp
View File

@ -731,7 +731,7 @@ IntRect Font::findGlyphRect(Page& page, unsigned int width, unsigned int height)
if (!newTexture.create(textureWidth * 2, textureHeight * 2))
{
err() << "Failed to create new page texture" << std::endl;
return IntRect(0, 0, 2, 2);
return IntRect({0, 0}, {2, 2});
}
newTexture.setSmooth(m_isSmooth);
@ -742,7 +742,7 @@ IntRect Font::findGlyphRect(Page& page, unsigned int width, unsigned int height)
{
// Oops, we've reached the maximum texture size...
err() << "Failed to add a new character to the font: the maximum texture size has been reached" << std::endl;
return IntRect(0, 0, 2, 2);
return IntRect({0, 0}, {2, 2});
}
}
@ -753,7 +753,7 @@ IntRect Font::findGlyphRect(Page& page, unsigned int width, unsigned int height)
}
// Find the glyph's rectangle on the selected row
IntRect rect(Rect<unsigned int>(row->width, row->top, width, height));
IntRect rect(Rect<unsigned int>({row->width, row->top}, {width, height}));
// Update the row informations
row->width += width;

10
src/SFML/Graphics/RenderTarget.cpp
View File

@ -202,10 +202,10 @@ IntRect RenderTarget::getViewport(const View& view) const
float height = static_cast<float>(getSize().y);
const FloatRect& viewport = view.getViewport();
return IntRect(static_cast<int>(0.5f + width * viewport.left),
static_cast<int>(0.5f + height * viewport.top),
static_cast<int>(0.5f + width * viewport.width),
static_cast<int>(0.5f + height * viewport.height));
return IntRect({static_cast<int>(0.5f + width * viewport.left),
static_cast<int>(0.5f + height * viewport.top)},
{static_cast<int>(0.5f + width * viewport.width),
static_cast<int>(0.5f + height * viewport.height)});
}
@ -555,7 +555,7 @@ void RenderTarget::resetGLStates()
void RenderTarget::initialize()
{
// Setup the default and current views
m_defaultView.reset(FloatRect(0, 0, static_cast<float>(getSize().x), static_cast<float>(getSize().y)));
m_defaultView.reset(FloatRect({0, 0}, Vector2f(getSize())));
m_view = m_defaultView;
// Set GL states only on first draw, so that we don't pollute user's states

2
src/SFML/Graphics/Shape.cpp
View File

@ -66,7 +66,7 @@ void Shape::setTexture(const Texture* texture, bool resetRect)
{
// Recompute the texture area if requested, or if there was no texture & rect before
if (resetRect || (!m_texture && (m_textureRect == IntRect())))
setTextureRect(IntRect(0, 0, static_cast<int>(texture->getSize().x), static_cast<int>(texture->getSize().y)));
setTextureRect(IntRect({0, 0}, Vector2i(texture->getSize())));
}
// Assign the new texture

5
src/SFML/Graphics/Sprite.cpp
View File

@ -68,8 +68,7 @@ void Sprite::setTexture(const Texture& texture, bool resetRect)
// Recompute the texture area if requested, or if there was no valid texture & rect before
if (resetRect || (!m_texture && (m_textureRect == sf::IntRect())))
{
Vector2i size = Vector2i(texture.getSize());
setTextureRect(IntRect(0, 0, size.x, size.y));
setTextureRect(IntRect({0, 0}, Vector2i(texture.getSize())));
}
// Assign the new texture
@ -127,7 +126,7 @@ FloatRect Sprite::getLocalBounds() const
auto width = static_cast<float>(std::abs(m_textureRect.width));
auto height = static_cast<float>(std::abs(m_textureRect.height));
return FloatRect(0.f, 0.f, width, height);
return FloatRect({0.f, 0.f}, {width, height});
}

2
src/SFML/Graphics/Transform.cpp
View File

@ -127,7 +127,7 @@ FloatRect Transform::transformRect(const FloatRect& rectangle) const
else if (points[i].y > bottom) bottom = points[i].y;
}
return FloatRect(left, top, right - left, bottom - top);
return FloatRect({left, top}, {right - left, bottom - top});
}

2
src/SFML/Graphics/VertexArray.cpp
View File

@ -130,7 +130,7 @@ FloatRect VertexArray::getBounds() const
bottom = position.y;
}
return FloatRect(left, top, right - left, bottom - top);
return FloatRect({left, top}, {right - left, bottom - top});
}
else
{

8
src/SFML/Graphics/View.cpp
View File

@ -36,11 +36,11 @@ View::View() :
m_center (),
m_size (),
m_rotation (0),
m_viewport (0, 0, 1, 1),
m_viewport ({0, 0}, {1, 1}),
m_transformUpdated (false),
m_invTransformUpdated(false)
{
reset(FloatRect(0, 0, 1000, 1000));
reset(FloatRect({0, 0}, {1000, 1000}));
}
@ -49,7 +49,7 @@ View::View(const FloatRect& rectangle) :
m_center (),
m_size (),
m_rotation (0),
m_viewport (0, 0, 1, 1),
m_viewport ({0, 0}, {1, 1}),
m_transformUpdated (false),
m_invTransformUpdated(false)
{
@ -62,7 +62,7 @@ View::View(const Vector2f& center, const Vector2f& size) :
m_center (center),
m_size (size),
m_rotation (0),
m_viewport (0, 0, 1, 1),
m_viewport ({0, 0}, {1, 1}),
m_transformUpdated (false),
m_invTransformUpdated(false)
{

24
test/Graphics/Rect.cpp
View File

@ -17,7 +17,7 @@ TEST_CASE("sf::Rect class template - [graphics]")
SUBCASE("(left, top, width, height) constructor")
{
sf::IntRect rectangle(1, 2, 3, 4);
sf::IntRect rectangle({1, 2}, {3, 4});
CHECK(rectangle.left == 1);
CHECK(rectangle.top == 2);
CHECK(rectangle.width == 3);
@ -38,7 +38,7 @@ TEST_CASE("sf::Rect class template - [graphics]")
SUBCASE("Conversion constructor")
{
sf::FloatRect sourceRectangle(1.0f, 2.0f, 3.0f, 4.0f);
sf::FloatRect sourceRectangle({1.0f, 2.0f}, {3.0f, 4.0f});
sf::IntRect rectangle(sourceRectangle);
CHECK(rectangle.left == static_cast<int>(sourceRectangle.left));
@ -52,7 +52,7 @@ TEST_CASE("sf::Rect class template - [graphics]")
{
SUBCASE("contains(Vector2)")
{
sf::IntRect rectangle(0, 0, 10, 10);
sf::IntRect rectangle({0, 0}, {10, 10});
CHECK(rectangle.contains(sf::Vector2i(0, 0)) == true);
CHECK(rectangle.contains(sf::Vector2i(9, 0)) == true);
@ -69,9 +69,9 @@ TEST_CASE("sf::Rect class template - [graphics]")
{
SUBCASE("intersects(Rect)")
{
sf::IntRect rectangle(0, 0, 10, 10);
sf::IntRect intersectingRectangle(5, 5, 10, 10);
sf::IntRect nonIntersectingRectangle(-5, -5, 5, 5);
sf::IntRect rectangle({0, 0}, {10, 10});
sf::IntRect intersectingRectangle({5, 5}, {10, 10});
sf::IntRect nonIntersectingRectangle({-5, -5}, {5, 5});
CHECK(rectangle.intersects(intersectingRectangle) == true);
CHECK(rectangle.intersects(nonIntersectingRectangle) == false);
@ -79,9 +79,9 @@ TEST_CASE("sf::Rect class template - [graphics]")
SUBCASE("intersects(Rect, Rect)")
{
sf::IntRect rectangle(0, 0, 10, 10);
sf::IntRect intersectingRectangle(5, 5, 10, 10);
sf::IntRect nonIntersectingRectangle(-5, -5, 5, 5);
sf::IntRect rectangle({0, 0}, {10, 10});
sf::IntRect intersectingRectangle({5, 5}, {10, 10});
sf::IntRect nonIntersectingRectangle({-5, -5}, {5, 5});
sf::IntRect intersectionResult;
CHECK(rectangle.intersects(intersectingRectangle, intersectionResult) == true);
@ -96,9 +96,9 @@ TEST_CASE("sf::Rect class template - [graphics]")
SUBCASE("Comparison operations")
{
sf::IntRect firstRectangle(1, 3, 2, 5);
sf::IntRect secondRectangle(1, 3, 2, 5);
sf::IntRect differentRectangle(3, 1, 5, 2);
sf::IntRect firstRectangle({1, 3}, {2, 5});
sf::IntRect secondRectangle({1, 3}, {2, 5});
sf::IntRect differentRectangle({3, 1}, {5, 2});
CHECK(firstRectangle == secondRectangle);
CHECK(firstRectangle != differentRectangle);