mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-14 06:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
Christophe Riccio 2011-05-07 16:10:09 +01:00
commit 752e8540c2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
glm/core/func_integer.inl
View File

@ -258,14 +258,15 @@ namespace glm
} }
// bitfieldExtract // bitfieldExtract
template <typename genIUType> template <typename genIUType, typename sizeType>
GLM_FUNC_QUALIFIER genIUType bitfieldExtract GLM_FUNC_QUALIFIER genIUType bitfieldExtract
( (
genIUType const & Value, genIUType const & Value,
int const & Offset, sizeType const & Offset,
int const & Bits sizeType const & Bits
) )
{ {
/*
GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'bitfieldExtract' only accept integer values"); GLM_STATIC_ASSERT(std::numeric_limits<genIUType>::is_integer, "'bitfieldExtract' only accept integer values");
assert(Offset + Bits <= (sizeof(genIUType) << 3)); assert(Offset + Bits <= (sizeof(genIUType) << 3));
@ -278,6 +279,15 @@ namespace glm
Mask |= (genIUType(1) << Bit); Mask |= (genIUType(1) << Bit);
return Result | ((Mask & Value) >> Offset); return Result | ((Mask & Value) >> Offset);
*/
sizeType GenSize = sizeof(genIUType) << sizeType(3);
assert(Offset + Bits <= GenSize);
genIUType ShiftLeft = Bits ? Value << (GenSize - (Bits + Offset)) : genIUType(0);
genIUType ShiftBack = ShiftLeft >> genIUType(GenSize - Bits);
return ShiftBack;
} }
template <typename T> template <typename T>