diff --git a/ChangeLog.md b/ChangeLog.md index d4b3dc3b9..f70b056d1 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -71,6 +71,7 @@ Nazara Engine: - PhysWorld3D class is now movable - ⚠️ Removed array/pointer constructor from Vector classes - Fixed Platform module not being classified as client-only +- ⚠️ Renamed Bitset::Read to Bitset::Write Nazara Development Kit: - Added ImageWidget (#139) diff --git a/include/Nazara/Core/Bitset.hpp b/include/Nazara/Core/Bitset.hpp index 16cca14fb..1ac7a74b2 100644 --- a/include/Nazara/Core/Bitset.hpp +++ b/include/Nazara/Core/Bitset.hpp @@ -51,9 +51,6 @@ namespace Nz std::size_t GetCapacity() const; std::size_t GetSize() const; - PointerSequence Read(const void* ptr, std::size_t bitCount); - PointerSequence Read(const PointerSequence& sequence, std::size_t bitCount); - void PerformsAND(const Bitset& a, const Bitset& b); void PerformsNOT(const Bitset& a); void PerformsOR(const Bitset& a, const Bitset& b); @@ -90,6 +87,9 @@ namespace Nz void UnboundedSet(std::size_t bit, bool val = true); bool UnboundedTest(std::size_t bit) const; + PointerSequence Write(const void* ptr, std::size_t bitCount); + PointerSequence Write(const PointerSequence& sequence, std::size_t bitCount); + Bit operator[](std::size_t index); bool operator[](std::size_t index) const; diff --git a/include/Nazara/Core/Bitset.inl b/include/Nazara/Core/Bitset.inl index 3b24586bd..1feda0b59 100644 --- a/include/Nazara/Core/Bitset.inl +++ b/include/Nazara/Core/Bitset.inl @@ -328,9 +328,9 @@ namespace Nz } /*! - * \brief Read a byte sequence into a bitset + * \brief Writes a byte sequence into a bitset * - * This function extends the bitset with bits read from a byte sequence + * This function extends the bitset with bits read from a byte sequence. * * \param ptr A pointer to the start of the byte sequence * \param bitCount Number of bits to read from the byte sequence @@ -341,17 +341,18 @@ namespace Nz * * \see AppendBits * \see Read + * \see Write */ template - typename Bitset::PointerSequence Bitset::Read(const void* ptr, std::size_t bitCount) + typename Bitset::PointerSequence Bitset::Write(const void* ptr, std::size_t bitCount) { - return Read(PointerSequence(ptr, 0U), bitCount); + return Write(PointerSequence(ptr, 0U), bitCount); } /*! - * \brief Read a byte sequence into a bitset + * \brief Writes a byte sequence into a bitset * - * This function extends the bitset with bits read from a pointer sequence (made of a pointer and a bit index) + * This function extends the bitset with bits read from a pointer sequence (made of a pointer and a bit index). * * \param sequence A pointer sequence to the start of the byte sequence * \param bitCount Number of bits to read from the byte sequence @@ -362,9 +363,10 @@ namespace Nz * * \see AppendBits * \see Read + * \see Write */ template - typename Bitset::PointerSequence Bitset::Read(const PointerSequence& sequence, std::size_t bitCount) + typename Bitset::PointerSequence Bitset::Write(const PointerSequence& sequence, std::size_t bitCount) { NazaraAssert(sequence.first, "Invalid pointer sequence"); NazaraAssert(sequence.second < 8, "Invalid next bit index (must be < 8)"); @@ -1161,9 +1163,9 @@ namespace Nz Bitset bitset; if (sequence) - *sequence = bitset.Read(ptr, bitCount); + *sequence = bitset.Write(ptr, bitCount); else - bitset.Read(ptr, bitCount); + bitset.Write(ptr, bitCount); return bitset; } diff --git a/src/Nazara/Utility/Image.cpp b/src/Nazara/Utility/Image.cpp index 54c47b5a3..81a810e1a 100644 --- a/src/Nazara/Utility/Image.cpp +++ b/src/Nazara/Utility/Image.cpp @@ -839,7 +839,7 @@ namespace Nz if (pixelCount == 0) return false; - auto seq = workingBitset.Read(GetConstPixels(), info.bitsPerPixel); + auto seq = workingBitset.Write(GetConstPixels(), info.bitsPerPixel); do { workingBitset &= info.alphaMask; @@ -847,7 +847,7 @@ namespace Nz return true; workingBitset.Clear(); - workingBitset.Read(seq, info.bitsPerPixel); + workingBitset.Write(seq, info.bitsPerPixel); } while (--pixelCount > 0); diff --git a/tests/Engine/Core/Bitset.cpp b/tests/Engine/Core/Bitset.cpp index 9cbd605b3..ed55392e1 100644 --- a/tests/Engine/Core/Bitset.cpp +++ b/tests/Engine/Core/Bitset.cpp @@ -322,9 +322,9 @@ void CheckRead(const char* title) { Nz::Bitset bitset; - auto seq = bitset.Read(data.data(), pair.second); + auto seq = bitset.Write(data.data(), pair.second); for (std::size_t i = pair.second; i < bitCount; i += pair.second) - seq = bitset.Read(seq, pair.second); + seq = bitset.Write(seq, pair.second); REQUIRE(bitset.GetSize() == bitCount);