sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
Jérôme Leclercq
2022-02-21 20:46:37 +01:00
parent ad544a595d
commit a1b6f51398
8 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/Bitset.inl
View File

@@ -654,7 +654,7 @@ namespace Nz
// Activation of the bit without branching
// https://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching
block = (block & ~mask) | (-val & mask);
block = (block & ~mask) | (-static_cast<Block>(val) & mask);
}
/*!

4
include/Nazara/Utility/SimpleTextDrawer.hpp
View File

@@ -20,7 +20,7 @@ namespace Nz
public:
inline SimpleTextDrawer();
inline SimpleTextDrawer(const SimpleTextDrawer& drawer);
inline SimpleTextDrawer(SimpleTextDrawer&& drawer);
inline SimpleTextDrawer(SimpleTextDrawer&& drawer) noexcept;
~SimpleTextDrawer() = default;
inline void AppendText(const std::string_view& str);
@@ -58,7 +58,7 @@ namespace Nz
inline void SetText(std::string str);
inline SimpleTextDrawer& operator=(const SimpleTextDrawer& drawer);
inline SimpleTextDrawer& operator=(SimpleTextDrawer&& drawer);
inline SimpleTextDrawer& operator=(SimpleTextDrawer&& drawer) noexcept;
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style = TextStyle_Regular, const Color& color = Color::White);
static inline SimpleTextDrawer Draw(const std::string& str, unsigned int characterSize, TextStyleFlags style, const Color& color, float outlineThickness, const Color& outlineColor);

4
include/Nazara/Utility/SimpleTextDrawer.inl
View File

@@ -38,7 +38,7 @@ namespace Nz
SetFont(drawer.m_font);
}
inline SimpleTextDrawer::SimpleTextDrawer(SimpleTextDrawer&& drawer)
inline SimpleTextDrawer::SimpleTextDrawer(SimpleTextDrawer&& drawer) noexcept
{
operator=(std::move(drawer));
}
@@ -228,7 +228,7 @@ namespace Nz
return *this;
}
inline SimpleTextDrawer& SimpleTextDrawer::operator=(SimpleTextDrawer&& drawer)
inline SimpleTextDrawer& SimpleTextDrawer::operator=(SimpleTextDrawer&& drawer) noexcept
{
DisconnectFontSlots();