Merge pull request #48 from Hapaxia/sfml3

Sfml3
Hapaxia · Jan 23, 2025 · 19162ca · 19162ca
2 parents c539a5f + c982fe7
commit 19162ca
Show file tree

Hide file tree

Showing 42 changed files with 416 additions and 455 deletions.
diff --git a/licence.txt b/licence.txt
@@ -1,6 +1,6 @@
 Selba Ward (https://github.com/Hapaxia/SelbaWard)
 
-Copyright (c) 2014-2024 M. J. Silk
+Copyright (c) 2014-2025 M. J. Silk
 
 This software is provided 'as-is', without any express or implied
 warranty. In no event will the authors be held liable for any damages

diff --git a/readme.md b/readme.md
@@ -12,6 +12,10 @@ Contents: **Bitmap Text**, **Console Screen**, **Crosshair**, **Elastic Sprite**
 
 Feedback and suggestions for new objects always welcome...
 
+---
+**IMPORTANT NOTE: The main branch is now targetted for SFML 3. If you are still using SFML 2, you can use the sfml2 branch.**
+---
+
 [Selba Ward thread on the SFML forum][SFMLForumSelbaWard]
 
 [Wiki]: https://github.com/Hapaxia/SelbaWard/wiki

diff --git a/src/SelbaWard.hpp b/src/SelbaWard.hpp
@@ -2,7 +2,7 @@
 //
 // Selba Ward (https://github.com/Hapaxia/SelbaWard)
 //
-// Copyright(c) 2015-2024 M.J.Silk
+// Copyright(c) 2015-2025 M.J.Silk
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages

diff --git a/src/SelbaWard/BitmapFont.cpp b/src/SelbaWard/BitmapFont.cpp
@@ -5,7 +5,7 @@
 //
 // BitmapFont
 //
-// Copyright(c) 2014-2024 M.J.Silk
+// Copyright(c) 2014-2025 M.J.Silk
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages
@@ -116,8 +116,8 @@ void BitmapFont::setTextureRect(const sf::IntRect& textureRect, const std::size_
 
 	m_glyphs[glyphIndex].useDefaultTextureRect = false;
 	m_glyphs[glyphIndex].textureRect = textureRect;
-	m_glyphs[glyphIndex].width = textureRect.width;
-	m_glyphs[glyphIndex].baseline = textureRect.height - 1;
+	m_glyphs[glyphIndex].width = textureRect.size.x;
+	m_glyphs[glyphIndex].baseline = textureRect.size.y - 1;
 	m_glyphs[glyphIndex].startX = 0;
 }
 
@@ -379,8 +379,8 @@ const BitmapFont::Glyph BitmapFont::priv_getGlyphWithDefaultTextureRect(std::siz
 	Glyph defaultGlyph;
 	defaultGlyph.useDefaultTextureRect = false;
 	defaultGlyph.textureRect = m_defaultTextureRect;
-	defaultGlyph.textureRect.left = m_defaultTextureRect.width * (glyphIndex % m_numberOfTilesPerRow);
-	defaultGlyph.textureRect.top = m_defaultTextureRect.height * (glyphIndex / m_numberOfTilesPerRow);
+	defaultGlyph.textureRect.position.x = m_defaultTextureRect.size.x * (glyphIndex % m_numberOfTilesPerRow);
+	defaultGlyph.textureRect.position.y = m_defaultTextureRect.size.y * (glyphIndex / m_numberOfTilesPerRow);
 	defaultGlyph.width = m_glyphs[glyphIndex].width;
 	defaultGlyph.baseline = m_glyphs[glyphIndex].baseline;
 	defaultGlyph.startX = m_glyphs[glyphIndex].startX;

diff --git a/src/SelbaWard/BitmapFont.hpp b/src/SelbaWard/BitmapFont.hpp
@@ -5,7 +5,7 @@
 //
 // BitmapFont
 //
-// Copyright(c) 2014-2024 M.J.Silk
+// Copyright(c) 2014-2025 M.J.Silk
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages
@@ -41,7 +41,7 @@
 namespace selbaward
 {
 
-// SW Bitmap Font v1.1.1
+// SW Bitmap Font v1.1.2
 class BitmapFont
 {
 public:

diff --git a/src/SelbaWard/BitmapText.cpp b/src/SelbaWard/BitmapText.cpp
@@ -5,7 +5,7 @@
 //
 // BitmapText
 //
-// Copyright(c) 2014-2024 M.J.Silk
+// Copyright(c) 2014-2025 M.J.Silk
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages
@@ -96,12 +96,12 @@ void BitmapText::setScale(const std::size_t scale)
 
 void BitmapText::setScale(const sf::Vector2u scale)
 {
-	setScale(scale.x, scale.y);
+	this->Transformable::setScale(sf::Vector2f(scale));
 }
 
 void BitmapText::setScale(const std::size_t scaleX, const std::size_t scaleY)
 {
-	this->Transformable::setScale(static_cast<float>(scaleX), static_cast<float>(scaleY));
+	setScale({ scaleX, scaleY });
 }
 
 sf::FloatRect BitmapText::getGlobalBounds() const
@@ -133,7 +133,7 @@ void BitmapText::priv_updateVertices()
 	if (m_pBitmapFont == nullptr)
 	{
 		m_vertices.clear();
-		m_bounds = { 0.f, 0.f, 0.f, 0.f };
+		m_bounds = { { 0.f, 0.f }, { 0.f, 0.f } };
 	}
 
 	m_vertices.resize(m_string.length() * 6u);
@@ -151,31 +151,31 @@ void BitmapText::priv_updateVertices()
 
 		BitmapFont::Glyph glyph{ m_pBitmapFont->getGlyph(glyphNumber) };
 
-		const sf::Vector2f glyphOffset{ 0.f - glyph.startX, (glyph.baseline < 0) ? (0.f - glyph.baseline - glyph.textureRect.height) : (0.f - glyph.baseline) };
+		const sf::Vector2f glyphOffset{ 0.f - glyph.startX, (glyph.baseline < 0) ? (0.f - glyph.baseline - glyph.textureRect.size.y) : (0.f - glyph.baseline) };
 		const sf::Vector2f glyphPosition{ penPosition + glyphOffset };
 
 		m_vertices[(character * 6u) + 0u].position = glyphPosition;
-		m_vertices[(character * 6u) + 1u].position = glyphPosition + sf::Vector2f{ 0.f, static_cast<float>(glyph.textureRect.height) };
-		m_vertices[(character * 6u) + 2u].position = glyphPosition + sf::Vector2f{ static_cast<float>(glyph.textureRect.width), 0.f };
-		m_vertices[(character * 6u) + 3u].position = glyphPosition + sf::Vector2f{ static_cast<float>(glyph.textureRect.width), static_cast<float>(glyph.textureRect.height) };
-
-		m_vertices[(character * 6u) + 0u].texCoords = sf::Vector2f{
-			static_cast<float>(glyph.textureRect.left),
-			static_cast<float>(glyph.textureRect.top) };
-		m_vertices[(character * 6u) + 1u].texCoords = sf::Vector2f{
-			static_cast<float>(glyph.textureRect.left),
-			static_cast<float>(glyph.textureRect.top + glyph.textureRect.height) };
-		m_vertices[(character * 6u) + 2u].texCoords = sf::Vector2f{
-			static_cast<float>(glyph.textureRect.left + glyph.textureRect.width),
-			static_cast<float>(glyph.textureRect.top) };
-		m_vertices[(character * 6u) + 3u].texCoords = sf::Vector2f{
-			static_cast<float>(glyph.textureRect.left + glyph.textureRect.width),
-			static_cast<float>(glyph.textureRect.top + glyph.textureRect.height) };
+		m_vertices[(character * 6u) + 1u].position = glyphPosition + sf::Vector2f(0, static_cast<float>(glyph.textureRect.size.y));
+		m_vertices[(character * 6u) + 2u].position = glyphPosition + sf::Vector2f(static_cast<float>(glyph.textureRect.size.x), 0);
+		m_vertices[(character * 6u) + 3u].position = glyphPosition + sf::Vector2f(static_cast<float>(glyph.textureRect.size.x), static_cast<float>(glyph.textureRect.size.y));
+
+		m_vertices[(character * 6u) + 0u].texCoords = sf::Vector2f(
+			static_cast<float>(glyph.textureRect.position.x),
+			static_cast<float>(glyph.textureRect.position.y));
+		m_vertices[(character * 6u) + 1u].texCoords = sf::Vector2f(
+			static_cast<float>(glyph.textureRect.position.x),
+			static_cast<float>(glyph.textureRect.position.y + glyph.textureRect.size.y));
+		m_vertices[(character * 6u) + 2u].texCoords = sf::Vector2f(
+			static_cast<float>(glyph.textureRect.position.x + glyph.textureRect.size.x),
+			static_cast<float>(glyph.textureRect.position.y));
+		m_vertices[(character * 6u) + 3u].texCoords = sf::Vector2f(
+			static_cast<float>(glyph.textureRect.position.x + glyph.textureRect.size.x),
+			static_cast<float>(glyph.textureRect.position.y + glyph.textureRect.size.y));
 
 		m_vertices[(character * 6u) + 4u] = m_vertices[(character * 6u) + 2u];
 		m_vertices[(character * 6u) + 5u] = m_vertices[(character * 6u) + 1u];
 
-		penPosition.x += (glyph.width > 0) ? (0.f + m_tracking + kerning + glyph.width) : (0.f + m_tracking + kerning + glyph.width + glyph.textureRect.width - glyph.startX);
+		penPosition.x += (glyph.width > 0) ? (0.f + m_tracking + kerning + glyph.width) : (0.f + m_tracking + kerning + glyph.width + glyph.textureRect.size.x - glyph.startX);
 
 		min.x = std::min(min.x, m_vertices[(character * 6u) + 0u].position.x);
 		max.x = std::max(max.x, m_vertices[(character * 6u) + 3u].position.x);
@@ -185,10 +185,10 @@ void BitmapText::priv_updateVertices()
 
 	priv_updateColor();
 
-	m_bounds.left = min.x;
-	m_bounds.top = min.y;
-	m_bounds.width = max.x - min.x;
-	m_bounds.height = max.y - min.y;
+	m_bounds.position.x = minX;
+	m_bounds.position.y = minY;
+	m_bounds.size.x = maxX - minX;
+	m_bounds.size.y = maxY - minY;
 }
 
 void BitmapText::priv_updateColor()

diff --git a/src/SelbaWard/BitmapText.hpp b/src/SelbaWard/BitmapText.hpp
@@ -5,7 +5,7 @@
 //
 // BitmapText
 //
-// Copyright(c) 2014-2024 M.J.Silk
+// Copyright(c) 2014-2025 M.J.Silk
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages
@@ -40,7 +40,7 @@
 namespace selbaward
 {
 
-// SW Bitmap Text v1.1.3
+// SW Bitmap Text v1.1.4
 class BitmapText : public sf::Drawable, public sf::Transformable
 {
 public:
@@ -67,7 +67,7 @@ class BitmapText : public sf::Drawable, public sf::Transformable
 	int m_tracking;
 	sf::FloatRect m_bounds;
 
-	virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
+	void draw(sf::RenderTarget& target, sf::RenderStates states) const override;
 	void priv_updateVertices();
 	void priv_updateColor();
 };

diff --git a/src/SelbaWard/Common.hpp b/src/SelbaWard/Common.hpp
@@ -2,7 +2,7 @@
 //
 // Selba Ward (https://github.com/Hapaxia/SelbaWard)
 //
-// Copyright(c) 2015-2024 M.J.Silk
+// Copyright(c) 2015-2025 M.J.Silk
 //
 // This software is provided 'as-is', without any express or implied
 // warranty. In no event will the authors be held liable for any damages
@@ -33,12 +33,6 @@
 #include <exception>
 #include <string>
 
-#if defined(_MSC_VER) && (_MSC_VER < 1900)
-#define SELBAWARD_NOEXCEPT
-#else
-#define SELBAWARD_NOEXCEPT noexcept
-#endif
-
 namespace selbaward
 {
 
@@ -49,7 +43,7 @@ class Exception : public std::exception
 		m_errorMessage("[Selba Ward] " + errorMessage)
 	{
 	}
-	virtual const char* what() const SELBAWARD_NOEXCEPT override
+	const char* what() const noexcept override
 	{
 		return m_errorMessage.c_str();
 	}
@@ -73,10 +67,4 @@ namespace sw = selbaward; // create shortcut namespace
 #include <SFML/Graphics/RenderTarget.hpp>
 #include <SFML/Graphics/RenderStates.hpp>
 
-#if (SFML_VERSION_MAJOR == 2)
-	#if (SFML_VERSION_MINOR < 4)
-		#define USE_SFML_PRE_2_4
-	#endif
-#endif
-
 #endif // SELBAWARD_COMMON_HPP