mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.2' into 0.9.3

Browse Source
This commit is contained in:
Christophe Riccio
2011-09-09 11:01:31 +01:00
parent 7d3a2d7743 fb2d15b5df
commit 0abfe343a5
5 changed files with 114 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
glm/gtx/string_cast.inl
View File

@@ -38,7 +38,7 @@ namespace detail
GLM_FUNC_QUALIFIER std::string to_string(detail::thalf const & x)
{
return detail::format("half(%f)", float(x));
return detail::format("half(%2.4f)", float(x));
}
GLM_FUNC_QUALIFIER std::string to_string(float x)
@@ -106,7 +106,7 @@ namespace detail
detail::tvec2<detail::thalf> const & v
)
{
return detail::format("hvec2(%f, %f)", float(v.x), float(v.y));
return detail::format("hvec2(%2.4f, %2.4f)", float(v.x), float(v.y));
}
template <>
@@ -115,7 +115,7 @@ namespace detail
detail::tvec3<detail::thalf> const & v
)
{
return detail::format("hvec3(%f, %f, %f)", float(v.x), float(v.y), float(v.z));
return detail::format("hvec3(%2.4f, %2.4f, %2.4f)", float(v.x), float(v.y), float(v.z));
}
template <>
@@ -124,7 +124,7 @@ namespace detail
detail::tvec4<detail::thalf> const & v
)
{
return detail::format("hvec4(%f, %f, %f, %f)", float(v.x), float(v.y), float(v.z), float(v.w));
return detail::format("hvec4(%2.4f, %2.4f, %2.4f, %2.4f)", float(v.x), float(v.y), float(v.z), float(v.w));
}
////////////////////////////////