mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-29 19:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed io build

Browse Source
This commit is contained in:
Christophe Riccio 2013-12-25 17:56:03 +01:00
parent 48fcbd6ec4
commit e9cb71e8b6
1 changed files with 27 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
glm/gtx/io.inl
View File

@ -205,16 +205,11 @@ namespace detail
typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os); typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
if (cerberus) { if (cerberus) {
tmat3x2<T,P> m(a); tmat2x3<T,P> m(a);
if (io::format_guard::row_major == io::order()) {
m = transpose(a);
}
os << io::cr() os << io::cr()
<< '[' << m[0] << io::cr() << '[' << m[0] << io::cr()
<< ' ' << m[1] << io::cr() << ' ' << m[1] << ']';
<< ' ' << m[2] << ']';
} }
return os; return os;
@ -226,17 +221,11 @@ namespace detail
typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os); typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
if (cerberus) { if (cerberus) {
tmat4x2<T,P> m(a); tmat2x4<T,P> m(a);
if (io::format_guard::row_major == io::order()) {
m = transpose(a);
}
os << io::cr() os << io::cr()
<< '[' << m[0] << io::cr() << '[' << m[0] << io::cr()
<< ' ' << m[1] << io::cr() << ' ' << m[1] << ']';
<< ' ' << m[2] << io::cr()
<< ' ' << m[3] << ']';
} }
return os; return os;
@ -248,15 +237,12 @@ namespace detail
typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os); typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
if (cerberus) { if (cerberus) {
tmat2x3<T,P> m(a); tmat3x2<T,P> m(a);
if (io::format_guard::row_major == io::order()) {
m = transpose(a);
}
os << io::cr() os << io::cr()
<< '[' << m[0] << io::cr() << '[' << m[0] << io::cr()
<< ' ' << m[1] << ']'; << ' ' << m[1] << io::cr()
<< ' ' << m[2] << ']';
} }
return os; return os;
@ -289,11 +275,24 @@ namespace detail
typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os); typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
if (cerberus) { if (cerberus) {
tmat4x3<T,P> m(a); tmat3x4<T,P> m(a);
if (io::format_guard::row_major == io::order()) { os << io::cr()
m = transpose(a); << '[' << m[0] << io::cr()
} << ' ' << m[1] << io::cr()
<< ' ' << m[2] << ']';
}
return os;
}
template <typename CTy, typename CTr, typename T, precision P>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x2<T,P> const& a)
{
typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
if (cerberus) {
tmat4x2<T,P> m(a);
os << io::cr() os << io::cr()
<< '[' << m[0] << io::cr() << '[' << m[0] << io::cr()
@ -305,42 +304,19 @@ namespace detail
return os; return os;
} }
template <typename CTy, typename CTr, typename T, precision P>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x2<T,P> const& a)
{
typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
if (cerberus) {
tmat2x4<T,P> m(a);
if (io::format_guard::row_major == io::order()) {
m = transpose(a);
}
os << io::cr()
<< '[' << m[0] << io::cr()
<< ' ' << m[1] << ']';
}
return os;
}
template <typename CTy, typename CTr, typename T, precision P> template <typename CTy, typename CTr, typename T, precision P>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x3<T,P> const& a) GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x3<T,P> const& a)
{ {
typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os); typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
if (cerberus) { if (cerberus) {
tmat3x4<T,P> m(a); tmat4x3<T,P> m(a);
if (io::format_guard::row_major == io::order()) {
m = transpose(a);
}
os << io::cr() os << io::cr()
<< '[' << m[0] << io::cr() << '[' << m[0] << io::cr()
<< ' ' << m[1] << io::cr() << ' ' << m[1] << io::cr()
<< ' ' << m[2] << ']'; << ' ' << m[2] << io::cr()
<< ' ' << m[3] << ']';
} }
return os; return os;