Browse Source

Fixed #187, fixed bitfieldExtract for vector based type

Christophe Riccio 13 years ago
parent
commit
3ab80ffe6d
2 changed files with 10 additions and 9 deletions
  1. 9 9
      glm/core/func_integer.inl
  2. 1 0
      readme.txt

+ 9 - 9
glm/core/func_integer.inl

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

+ 1 - 0
readme.txt

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