diff --git a/CMakeLists.txt b/CMakeLists.txt index ea94b224..fc46d193 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS) add_subdirectory(glm) add_subdirectory(doc) -add_subdirectory(sample) add_subdirectory(test) diff --git a/glm/core/func_integer.inl b/glm/core/func_integer.inl index 7ae7e1a8..d86746cc 100644 --- a/glm/core/func_integer.inl +++ b/glm/core/func_integer.inl @@ -289,8 +289,8 @@ namespace glm ) { return detail::tvec2( - bitfieldExtract(value[0]), - bitfieldExtract(value[1])); + bitfieldExtract(Value[0]), + bitfieldExtract(Value[1])); } template @@ -302,9 +302,9 @@ namespace glm ) { return detail::tvec3( - bitfieldExtract(value[0]), - bitfieldExtract(value[1]), - bitfieldExtract(value[2])); + bitfieldExtract(Value[0]), + bitfieldExtract(Value[1]), + bitfieldExtract(Value[2])); } template @@ -316,10 +316,10 @@ namespace glm ) { return detail::tvec4( - bitfieldExtract(value[0]), - bitfieldExtract(value[1]), - bitfieldExtract(value[2]), - bitfieldExtract(value[3])); + bitfieldExtract(Value[0]), + bitfieldExtract(Value[1]), + bitfieldExtract(Value[2]), + bitfieldExtract(Value[3])); } // bitfieldInsert @@ -355,8 +355,8 @@ namespace glm ) { return detail::tvec2( - bitfieldInsert(value[0]), - bitfieldInsert(value[1])); + bitfieldInsert(Base[0], Insert[0], Offset, Bits), + bitfieldInsert(Base[1], Insert[1], Offset, Bits)); } template @@ -369,9 +369,9 @@ namespace glm ) { return detail::tvec3( - bitfieldInsert(value[0]), - bitfieldInsert(value[1]), - bitfieldInsert(value[2])); + bitfieldInsert(Base[0], Insert[0], Offset, Bits), + bitfieldInsert(Base[1], Insert[1], Offset, Bits), + bitfieldInsert(Base[2], Insert[2], Offset, Bits)); } template @@ -384,10 +384,10 @@ namespace glm ) { return detail::tvec4( - bitfieldInsert(value[0]), - bitfieldInsert(value[1]), - bitfieldInsert(value[2]), - bitfieldInsert(value[3])); + bitfieldInsert(Base[0], Insert[0], Offset, Bits), + bitfieldInsert(Base[1], Insert[1], Offset, Bits), + bitfieldInsert(Base[2], Insert[2], Offset, Bits), + bitfieldInsert(Base[3], Insert[3], Offset, Bits)); } // bitfieldReverse