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

(Bitset) Simplified Resize code 

Removed old code


Former-commit-id: e82ec5e69ba9e4d91b7c65a5132b91fe3a60fd7e
This commit is contained in:
Lynix 2015-03-17 12:26:51 +01:00
parent 4c0c47240c
commit 99e0912163
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -236,26 +236,13 @@ template<typename Block, class Allocator>
void NzBitset<Block, Allocator>::Resize(unsigned int bitCount, bool defaultVal) void NzBitset<Block, Allocator>::Resize(unsigned int bitCount, bool defaultVal)
{ {
// On commence par changer la taille du conteneur, avec la valeur correcte d'initialisation // On commence par changer la taille du conteneur, avec la valeur correcte d'initialisation
auto oldSize = m_blocks.size(); unsigned int lastBlockIndex = m_blocks.size()-1;
m_blocks.resize(ComputeBlockCount(bitCount), (defaultVal) ? fullBitMask : 0U); m_blocks.resize(ComputeBlockCount(bitCount), (defaultVal) ? fullBitMask : 0U);
unsigned int remainingBits = GetBitIndex(m_bitCount); unsigned int remainingBits = GetBitIndex(m_bitCount);
if (bitCount > m_bitCount && remainingBits > 0 && defaultVal) if (bitCount > m_bitCount && remainingBits > 0 && defaultVal)
{
// Initialisation des bits non-utilisés du dernier bloc avant le changement de taille // Initialisation des bits non-utilisés du dernier bloc avant le changement de taille
Block& block = m_blocks[oldSize-1]; // Le bloc à corriger m_blocks[lastBlockIndex] |= fullBitMask << remainingBits;
Block mask = fullBitMask << remainingBits; // Le masque sur les bits en question
// Set/Reset des bits
/*
if (defaultVal)
block |= mask;
else
block &= ~mask;
*/
// https://graphics.stanford.edu/~seander/bithacks.html#ConditionalSetOrClearBitsWithoutBranching
block = (block & ~mask) | (-defaultVal & mask);
}
m_bitCount = bitCount; m_bitCount = bitCount;
ResetExtraBits(); ResetExtraBits();