mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed glm::to_string on quaternions wrong components order #681

Browse Source
This commit is contained in:
Christophe Riccio
2017-09-20 14:29:22 +02:00
parent 1bf24f8344
commit a2497e6174
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
glm/gtx/string_cast.inl
View File

@@ -446,15 +446,15 @@ namespace detail
{
char const * PrefixStr = prefix<T>::value();
char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
std::string FormatStr(detail::format("%squat(%s, %s, %s, %s)",
std::string FormatStr(detail::format("%squat(%s, {%s, %s, %s})",
PrefixStr,
LiteralStr, LiteralStr, LiteralStr, LiteralStr));
return detail::format(FormatStr.c_str(),
static_cast<typename cast<T>::value_type>(x[3]),
static_cast<typename cast<T>::value_type>(x[0]),
static_cast<typename cast<T>::value_type>(x[1]),
static_cast<typename cast<T>::value_type>(x[2]),
static_cast<typename cast<T>::value_type>(x[3]));
static_cast<typename cast<T>::value_type>(x[2]));
}
};
@@ -465,19 +465,19 @@ namespace detail
{
char const * PrefixStr = prefix<T>::value();
char const * LiteralStr = literal<T, std::numeric_limits<T>::is_iec559>::value();
std::string FormatStr(detail::format("%sdualquat((%s, %s, %s, %s), (%s, %s, %s, %s))",
std::string FormatStr(detail::format("%sdualquat((%s, {%s, %s, %s}), (%s, {%s, %s, %s}))",
PrefixStr,
LiteralStr, LiteralStr, LiteralStr, LiteralStr));
return detail::format(FormatStr.c_str(),
static_cast<typename cast<T>::value_type>(x.real[3]),
static_cast<typename cast<T>::value_type>(x.real[0]),
static_cast<typename cast<T>::value_type>(x.real[1]),
static_cast<typename cast<T>::value_type>(x.real[2]),
static_cast<typename cast<T>::value_type>(x.real[3]),
static_cast<typename cast<T>::value_type>(x.dual[3]),
static_cast<typename cast<T>::value_type>(x.dual[0]),
static_cast<typename cast<T>::value_type>(x.dual[1]),
static_cast<typename cast<T>::value_type>(x.dual[2]),
static_cast<typename cast<T>::value_type>(x.dual[3]));
static_cast<typename cast<T>::value_type>(x.dual[2]));
}
};