mirror of
https://github.com/g-truc/glm.git
synced 2024-11-23 01:14:34 +00:00
Fixed #187, fixed bitfieldExtract for vector based type
This commit is contained in:
parent
a979cb483e
commit
3ab80ffe6d
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user