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

Remove unnecessary static casts

Browse Source
This commit is contained in:
Chris Thrasher 2024-05-16 20:56:30 -06:00
parent 3f38738a08
commit 5484824948
10 changed files with 26 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/island/Island.cpp
View File

@ -474,8 +474,8 @@ void processWorkItem(std::vector<sf::Vertex>& vertices, const WorkItem& workItem
const unsigned int rowEnd = std::min(rowStart + rowBlockSize, resolutionY);
const unsigned int rowCount = rowEnd - rowStart;
const float scalingFactorX = static_cast<float>(windowWidth) / static_cast<float>(resolutionX);
const float scalingFactorY = static_cast<float>(windowHeight) / static_cast<float>(resolutionY);
const float scalingFactorX = float{windowWidth} / float{resolutionX};
const float scalingFactorY = float{windowHeight} / float{resolutionY};
for (unsigned int y = rowStart; y < rowEnd; ++y)
{

4
examples/sound_effects/SoundEffects.cpp
View File

@ -494,7 +494,7 @@ private:
static constexpr unsigned int sampleRate{44100};
static constexpr std::size_t chunkSize{sampleRate / 100};
static constexpr float timePerSample{1.f / static_cast<float>(sampleRate)};
static constexpr float timePerSample{1.f / float{sampleRate}};
std::vector<std::int16_t> m_sampleBuffer = std::vector<std::int16_t>(chunkSize, 0);
Type m_type{Type::Triangle};
@ -600,7 +600,7 @@ private:
static constexpr unsigned int sampleRate{44100};
static constexpr std::size_t chunkSize{sampleRate / 100};
static constexpr float timePerSample{1.f / static_cast<float>(sampleRate)};
static constexpr float timePerSample{1.f / float{sampleRate}};
std::vector<std::int16_t> m_sampleBuffer = std::vector<std::int16_t>(chunkSize, 0);
float m_amplitude{0.05f};

2
src/SFML/Audio/Music.cpp
View File

@ -227,7 +227,7 @@ std::optional<std::uint64_t> Music::onLoop()
// Looping is enabled, and either we're at the loop end, or we're at the EOF
// when it's equivalent to the loop end (loop end takes priority). Send us to loop begin
m_file->seek(m_loopSpan.offset);
return static_cast<std::int64_t>(m_file->getSampleOffset());
return m_file->getSampleOffset();
}
else if (getLoop() && (currentOffset >= m_file->getSampleCount()))
{

2
src/SFML/Audio/SoundFileReaderMp3.cpp
View File

@ -173,7 +173,7 @@ void SoundFileReaderMp3::seek(std::uint64_t sampleOffset)
std::uint64_t SoundFileReaderMp3::read(std::int16_t* samples, std::uint64_t maxCount)
{
std::uint64_t toRead = std::min(maxCount, m_numSamples - m_position);
toRead = static_cast<std::uint64_t>(mp3dec_ex_read(&m_decoder, samples, static_cast<std::size_t>(toRead)));
toRead = std::uint64_t{mp3dec_ex_read(&m_decoder, samples, static_cast<std::size_t>(toRead))};
m_position += toRead;
return toRead;
}

2
src/SFML/Audio/SoundFileWriterWav.cpp
View File

@ -252,7 +252,7 @@ void SoundFileWriterWav::writeHeader(unsigned int sampleRate, unsigned int chann
m_file.write(mainChunkId.data(), mainChunkId.size());
// Write the main chunk header
encode(m_file, static_cast<std::uint32_t>(0)); // 0 is a placeholder, will be written later
encode(m_file, std::uint32_t{0}); // 0 is a placeholder, will be written later
std::array mainChunkFormat = {'W', 'A', 'V', 'E'};
m_file.write(mainChunkFormat.data(), mainChunkFormat.size());

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

@ -84,8 +84,7 @@ inline T reinterpret(const U& input)
// Combine outline thickness, boldness and font glyph index into a single 64-bit key
std::uint64_t combine(float outlineThickness, bool bold, std::uint32_t index)
{
return (static_cast<std::uint64_t>(reinterpret<std::uint32_t>(outlineThickness)) << 32) |
(static_cast<std::uint64_t>(bold) << 31) | index;
return (std::uint64_t{reinterpret<std::uint32_t>(outlineThickness)} << 32) | (std::uint64_t{bold} << 31) | index;
}
} // namespace
@ -365,8 +364,7 @@ float Font::getKerning(std::uint32_t first, std::uint32_t second, unsigned int c
// Combine kerning with compensation deltas and return the X advance
// Flooring is required as we use FT_KERNING_UNFITTED flag which is not quantized in 64 based grid
return std::floor(
(secondLsbDelta - firstRsbDelta + static_cast<float>(kerning.x) + 32) / static_cast<float>(1 << 6));
return std::floor((secondLsbDelta - firstRsbDelta + static_cast<float>(kerning.x) + 32) / float{1 << 6});
}
else
{
@ -385,7 +383,7 @@ float Font::getLineSpacing(unsigned int characterSize) const
if (setCurrentSize(characterSize))
{
return static_cast<float>(face->size->metrics.height) / static_cast<float>(1 << 6);
return static_cast<float>(face->size->metrics.height) / float{1 << 6};
}
else
{
@ -407,8 +405,7 @@ float Font::getUnderlinePosition(unsigned int characterSize) const
if (!FT_IS_SCALABLE(face))
return static_cast<float>(characterSize) / 10.f;
return -static_cast<float>(FT_MulFix(face->underline_position, face->size->metrics.y_scale)) /
static_cast<float>(1 << 6);
return -static_cast<float>(FT_MulFix(face->underline_position, face->size->metrics.y_scale)) / float{1 << 6};
}
else
{
@ -430,8 +427,7 @@ float Font::getUnderlineThickness(unsigned int characterSize) const
if (!FT_IS_SCALABLE(face))
return static_cast<float>(characterSize) / 14.f;
return static_cast<float>(FT_MulFix(face->underline_thickness, face->size->metrics.y_scale)) /
static_cast<float>(1 << 6);
return static_cast<float>(FT_MulFix(face->underline_thickness, face->size->metrics.y_scale)) / float{1 << 6};
}
else
{
@ -519,7 +515,7 @@ Glyph Font::loadGlyph(std::uint32_t codePoint, unsigned int characterSize, bool
FT_Stroker stroker = m_fontHandles->stroker;
FT_Stroker_Set(stroker,
static_cast<FT_Fixed>(outlineThickness * static_cast<float>(1 << 6)),
static_cast<FT_Fixed>(outlineThickness * float{1 << 6}),
FT_STROKER_LINECAP_ROUND,
FT_STROKER_LINEJOIN_ROUND,
0);
@ -547,7 +543,7 @@ Glyph Font::loadGlyph(std::uint32_t codePoint, unsigned int characterSize, bool
// Compute the glyph's advance offset
glyph.advance = static_cast<float>(bitmapGlyph->root.advance.x >> 16);
if (bold)
glyph.advance += static_cast<float>(weight) / static_cast<float>(1 << 6);
glyph.advance += static_cast<float>(weight) / float{1 << 6};
glyph.lsbDelta = static_cast<int>(face->glyph->lsb_delta);
glyph.rsbDelta = static_cast<int>(face->glyph->rsb_delta);

14
test/Network/Packet.test.cpp
View File

@ -22,7 +22,7 @@
CHECK(packet.getData() != nullptr); \
CHECK(packet.getDataSize() == sizeof(expected)); \
CHECK(!packet.endOfPacket()); \
CHECK(static_cast<bool>(packet)); \
CHECK(bool{packet}); \
\
decltype(expected) received; \
packet >> received; \
@ -30,7 +30,7 @@
CHECK(packet.getData() != nullptr); \
CHECK(packet.getDataSize() == sizeof(expected)); \
CHECK(packet.endOfPacket()); \
CHECK(static_cast<bool>(packet)); \
CHECK(bool{packet}); \
CHECK((expected) == received); \
} while (false)
@ -43,7 +43,7 @@
CHECK(packet.getData() != nullptr); \
CHECK(packet.getDataSize() == (size)); \
CHECK(!packet.endOfPacket()); \
CHECK(static_cast<bool>(packet)); \
CHECK(bool{packet}); \
\
std::remove_const_t<decltype(expected)> received; \
packet >> received; \
@ -51,7 +51,7 @@
CHECK(packet.getData() != nullptr); \
CHECK(packet.getDataSize() == (size)); \
CHECK(packet.endOfPacket()); \
CHECK(static_cast<bool>(packet)); \
CHECK(bool{packet}); \
CHECK(sf::String(expected) == sf::String(received)); \
} while (false)
@ -78,7 +78,7 @@ TEST_CASE("[Network] sf::Packet")
CHECK(packet.getData() == nullptr);
CHECK(packet.getDataSize() == 0);
CHECK(packet.endOfPacket());
CHECK(static_cast<bool>(packet));
CHECK(bool{packet});
}
static constexpr std::array data = {1, 2, 3, 4, 5, 6};
@ -91,14 +91,14 @@ TEST_CASE("[Network] sf::Packet")
CHECK(packet.getData() != nullptr);
CHECK(packet.getDataSize() == data.size());
CHECK(!packet.endOfPacket());
CHECK(static_cast<bool>(packet));
CHECK(bool{packet});
packet.clear();
CHECK(packet.getReadPosition() == 0);
CHECK(packet.getData() == nullptr);
CHECK(packet.getDataSize() == 0);
CHECK(packet.endOfPacket());
CHECK(static_cast<bool>(packet));
CHECK(bool{packet});
}
SECTION("Network ordering")

5
test/System/String.test.cpp
View File

@ -26,11 +26,10 @@ auto select(const std::basic_string<T>& string16, const std::basic_string<T>& st
return string32;
}
template <typename CharT>
auto toHex(const CharT character)
auto toHex(const std::uint32_t character)
{
std::ostringstream stream;
stream << "[\\x" << std::uppercase << std::hex << static_cast<std::uint32_t>(character) << ']';
stream << "[\\x" << std::uppercase << std::hex << character << ']';
return stream.str();
}
} // namespace

4
test/System/Time.test.cpp
View File

@ -243,7 +243,7 @@ TEST_CASE("[System] sf::Time")
SECTION("operator*=")
{
sf::Time time = sf::milliseconds(1'000);
time *= static_cast<std::int64_t>(10);
time *= std::int64_t{10};
CHECK(time == sf::milliseconds(10'000));
time *= 0.1f;
CHECK(time.asMilliseconds() == 1'000);
@ -262,7 +262,7 @@ TEST_CASE("[System] sf::Time")
SECTION("operator/=")
{
sf::Time time = sf::milliseconds(1'000);
time /= static_cast<std::int64_t>(2);
time /= std::int64_t{2};
CHECK(time == sf::milliseconds(500));
time /= 0.5f;
CHECK(time.asMilliseconds() == 1'000);

2
test/TestUtilities/SystemUtil.cpp
View File

@ -62,7 +62,7 @@ template std::ostream& operator<<(std::ostream&, const Vector3<float>&);
bool operator==(const float& lhs, const Approx<float>& rhs)
{
return static_cast<double>(lhs) == Catch::Approx(static_cast<double>(rhs.value)).margin(1e-5);
return lhs == Catch::Approx(rhs.value).margin(1e-5);
}
bool operator==(const sf::Vector2f& lhs, const Approx<sf::Vector2f>& rhs)