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

Fixed build errors

Browse Source
This commit is contained in:
Christophe Riccio 2010-04-14 21:55:13 +01:00
parent 929160ff04
commit d0b22ccdc5
2 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -7,7 +7,6 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS)
add_subdirectory(glm)
add_subdirectory(doc)
add_subdirectory(sample)
add_subdirectory(test)

36
glm/core/func_integer.inl
View File

@ -289,8 +289,8 @@ namespace glm
)
{
return detail::tvec2<T>(
bitfieldExtract(value[0]),
bitfieldExtract(value[1]));
bitfieldExtract(Value[0]),
bitfieldExtract(Value[1]));
}
template <typename T>
@ -302,9 +302,9 @@ namespace glm
)
{
return detail::tvec3<T>(
bitfieldExtract(value[0]),
bitfieldExtract(value[1]),
bitfieldExtract(value[2]));
bitfieldExtract(Value[0]),
bitfieldExtract(Value[1]),
bitfieldExtract(Value[2]));
}
template <typename T>
@ -316,10 +316,10 @@ namespace glm
)
{
return detail::tvec4<T>(
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<T>(
bitfieldInsert(value[0]),
bitfieldInsert(value[1]));
bitfieldInsert(Base[0], Insert[0], Offset, Bits),
bitfieldInsert(Base[1], Insert[1], Offset, Bits));
}
template <typename T>
@ -369,9 +369,9 @@ namespace glm
)
{
return detail::tvec3<T>(
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 <typename T>
@ -384,10 +384,10 @@ namespace glm
)
{
return detail::tvec4<T>(
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