mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed merge

Browse Source
This commit is contained in:
Christophe Riccio
2011-09-18 19:44:45 +01:00
parent ac869c9faa 0c7dadef8e
commit 0a7e5ffaf0
3 changed files with 109 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
glm/gtc/half_float.hpp
View File

@@ -54,6 +54,7 @@ namespace detail
enum ctor{null};
typedef thalf value_type;
typedef std::size_t size_type;
GLM_FUNC_DECL size_type length() const;
static GLM_FUNC_DECL size_type value_size();

16
glm/gtc/half_float.inl
View File

@@ -44,6 +44,11 @@ GLM_FUNC_QUALIFIER tvec2<thalf>::size_type tvec2<thalf>::value_size()
return 2;
}
GLM_FUNC_QUALIFIER typename tvec2<thalf>::size_type tvec2<thalf>::length() const
{
return 2;
}
//////////////////////////////////////
// Accesses
@@ -317,6 +322,11 @@ GLM_FUNC_QUALIFIER tvec3<thalf>::size_type tvec3<thalf>::value_size()
return 3;
}
GLM_FUNC_QUALIFIER typename tvec3<thalf>::size_type tvec3<thalf>::length() const
{
return 3;
}
//////////////////////////////////////
// Accesses
@@ -634,6 +644,12 @@ GLM_FUNC_QUALIFIER tvec4<thalf>::size_type tvec4<thalf>::value_size()
return 4;
}
GLM_FUNC_QUALIFIER typename tvec4<thalf>::size_type tvec4<thalf>::length() const
{
return 4;
}
//////////////////////////////////////
// Accesses