mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 18:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #187, fixed bitfieldExtract for vector based type

Browse Source
This commit is contained in:
Christophe Riccio 2012-06-28 19:40:42 +01:00
parent a979cb483e
commit 3ab80ffe6d
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
glm/core/func_integer.inl
View File

@ -301,8 +301,8 @@ namespace glm
) )
{ {
return detail::tvec2<T>( return detail::tvec2<T>(
bitfieldExtract(Value[0]), bitfieldExtract(Value[0], Offset, Bits),
bitfieldExtract(Value[1])); bitfieldExtract(Value[1], Offset, Bits));
} }
template <typename T> template <typename T>
@ -314,9 +314,9 @@ namespace glm
) )
{ {
return detail::tvec3<T>( return detail::tvec3<T>(
bitfieldExtract(Value[0]), bitfieldExtract(Value[0], Offset, Bits),
bitfieldExtract(Value[1]), bitfieldExtract(Value[1], Offset, Bits),
bitfieldExtract(Value[2])); bitfieldExtract(Value[2], Offset, Bits));
} }
template <typename T> template <typename T>
@ -328,10 +328,10 @@ namespace glm
) )
{ {
return detail::tvec4<T>( return detail::tvec4<T>(
bitfieldExtract(Value[0]), bitfieldExtract(Value[0], Offset, Bits),
bitfieldExtract(Value[1]), bitfieldExtract(Value[1], Offset, Bits),
bitfieldExtract(Value[2]), bitfieldExtract(Value[2], Offset, Bits),
bitfieldExtract(Value[3])); bitfieldExtract(Value[3], Offset, Bits));
} }
// bitfieldInsert // bitfieldInsert

1
readme.txt
View File

@ -43,6 +43,7 @@ GLM 0.9.3.4: 2012-06-28
- Removed VIRTREV_xstream and the incompatibility generated with GCC - Removed VIRTREV_xstream and the incompatibility generated with GCC
- Fixed C++11 compiler option for GCC - Fixed C++11 compiler option for GCC
- Removed MS language extension option for GCC (not fonctionnal) - Removed MS language extension option for GCC (not fonctionnal)
- Fixed bitfieldExtract for vector types
================================================================================ ================================================================================
GLM 0.9.3.3: 2012-05-10 GLM 0.9.3.3: 2012-05-10