Merge branch 'master' of https://github.com/regnirpsj/glm into type_trait

.gitignore

@@ -48,3 +48,7 @@ Makefile
 
 # Misc.
 *.log
+
+# local build(s)
+build*
+

glm/gtx/io.hpp

@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 /// OpenGL Mathematics (glm.g-truc.net)
 ///
-/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)
+/// Copyright (c) 2005 - 2016 G-Truc Creation (www.g-truc.net)
 /// Permission is hereby granted, free of charge, to any person obtaining a copy
 /// of this software and associated documentation files (the "Software"), to deal
 /// in the Software without restriction, including without limitation the rights
@@ -26,10 +26,11 @@
 ///
 /// @ref gtx_io
 /// @file glm/gtx/io.hpp
-/// @date 2013-11-22 / 2014-11-25
+/// @date 2013-11-22 / 2016-03-14
 /// @author Jan P Springer (regnirpsj@gmail.com)
 ///
 /// @see core (dependence)
+/// @see gtc_matrix_access (dependence)
 /// @see gtc_quaternion (dependence)
 ///
 /// @defgroup gtx_io GLM_GTX_io
@@ -215,16 +216,8 @@ namespace glm
 	GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x4<T,P> const&);
 
   template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(
+	GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr> &,
-		std::basic_ostream<CTy,CTr> &,
+                                                         std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const &);
-		std::pair<tmat4x4<T,P> const,
-		tmat4x4<T,P> const> const &);
-
-	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(
-		std::basic_ostream<CTy,CTr> &,
-		std::pair<tmat4x4<T,P>,
-		tmat4x4<T,P> > const &);
 
 	/// @}
 }//namespace glm

glm/gtx/io.inl

@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 /// OpenGL Mathematics (glm.g-truc.net)
 ///
-/// Copyright (c) 2005 - 2013 G-Truc Creation (www.g-truc.net)
+/// Copyright (c) 2005 - 2016 G-Truc Creation (www.g-truc.net)
 /// Permission is hereby granted, free of charge, to any person obtaining a copy
 /// of this software and associated documentation files (the "Software"), to deal
 /// in the Software without restriction, including without limitation the rights
@@ -26,12 +26,14 @@
 ///
 /// @ref gtx_io
 /// @file glm/gtx/io.inl
-/// @date 2013-11-22 / 2014-11-25
+/// @date 2013-11-22 / 2016-03-14
 /// @author Jan P Springer (regnirpsj@gmail.com)
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-#include <iomanip> // std::setfill<>, std::fixed, std::setprecision, std::right, std::setw
+#include <iomanip>                  // std::fixed, std::setfill<>, std::setprecision, std::right, std::setw
 #include <ostream>                  // std::basic_ostream<>
+#include "../gtc/matrix_access.hpp" // glm::col, glm::row
+#include "../gtx/type_trait.hpp"    // glm::type<>
 
 namespace glm{
   namespace io
@@ -48,7 +50,7 @@ namespace io
         delim_right       (']'),
         space             (' '),
         newline           ('\n'),
-		order             (row_major)
+        order             (column_major)
     {}
 
     template <typename CTy>
@@ -117,8 +119,7 @@ namespace io
       value[2] = c;
     }
 
-	/* explicit */ GLM_FUNC_QUALIFIER
+    /* explicit */ GLM_FUNC_QUALIFIER order::order(order_type a)
-	order::order(order_type a)
       : value(a)
     {}
 
@@ -165,7 +166,7 @@ namespace io
     }
 
     template <typename CTy, typename CTr>
-	std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, delimeter<CTy> const& a)
+    GLM_FUNC_QUALIFIER  std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, delimeter<CTy> const& a)
     {
       format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)));
 
@@ -185,8 +186,11 @@ namespace io
     }
   } // namespace io
 
-	template <typename CTy, typename CTr, typename T, precision P>
+  namespace detail {
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tquat<T,P> const& a)
+
+    template <typename CTy, typename CTr, template <typename, precision> class V, typename T, precision P>
+    GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>&
+    print_vector_on(std::basic_ostream<CTy,CTr>& os, V<T,P> const& a)
     {
       typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
 
@@ -194,6 +198,8 @@ namespace io
         {
           io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
 
+          length_t const& components(type<V>::components);
+          
           if(fmt.formatted)
             {
               io::basic_state_saver<CTy> const bss(os);
@@ -202,455 +208,259 @@ namespace io
                  << std::right
                  << std::setprecision(fmt.precision)
                  << std::setfill(fmt.space)
-					<< fmt.delim_left
+                 << fmt.delim_left;
-					<< std::setw(fmt.width) << a.w << fmt.separator
+
-					<< std::setw(fmt.width) << a.x << fmt.separator
+              for (unsigned i(0); i < components; ++i) {
-					<< std::setw(fmt.width) << a.y << fmt.separator
+                os << std::setw(fmt.width) << a[i];
-					<< std::setw(fmt.width) << a.z
+
-					<< fmt.delim_right;
+                if (components-1 != i) { os << fmt.separator; }
+              }
+          
+              os << fmt.delim_right;
             }
           else
             {
-				os << a.w << fmt.space << a.x << fmt.space << a.y << fmt.space << a.z;
+              for (unsigned i(0); i < components; ++i) {
+                os << a[i];
+
+                if (components-1 != i) { os << fmt.space; }
+              }
             }
         }
 
       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, tquat<T,P> const& a)
+	{
+    return detail::print_vector_on(os, a);
+	}
+
 	template <typename CTy, typename CTr, typename T, precision P>
   GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec1<T,P> const& a)
   {
-                typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_vector_on(os, a);
-
-                if(cerberus)
-                {
-                        io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-
-                        if(fmt.formatted)
-                        {
-                                io::basic_state_saver<CTy> const bss(os);
-
-                                os << std::fixed
-                                        << std::right
-                                        << std::setprecision(fmt.precision)
-                                        << std::setfill(fmt.space)
-                                        << fmt.delim_left
-                                        << std::setw(fmt.width) << a.x
-                                        << fmt.delim_right;
-                        }
-                        else
-                        {
-                                os << a.x;
-                        }
-                }
-
-                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, tvec2<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_vector_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-
-			if(fmt.formatted)
-			{
-				io::basic_state_saver<CTy> const bss(os);
-
-				os << std::fixed
-					<< std::right
-					<< std::setprecision(fmt.precision)
-					<< std::setfill(fmt.space)
-					<< fmt.delim_left
-					<< std::setw(fmt.width) << a.x << fmt.separator
-					<< std::setw(fmt.width) << a.y
-					<< fmt.delim_right;
-			}
-			else
-			{
-				os << a.x << fmt.space << a.y;
-			}
-		}
-
-		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, tvec3<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_vector_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-
-			if(fmt.formatted)
-			{
-				io::basic_state_saver<CTy> const bss(os);
-
-				os << std::fixed
-					<< std::right
-					<< std::setprecision(fmt.precision)
-					<< std::setfill(fmt.space)
-					<< fmt.delim_left
-					<< std::setw(fmt.width) << a.x << fmt.separator
-					<< std::setw(fmt.width) << a.y << fmt.separator
-					<< std::setw(fmt.width) << a.z
-					<< fmt.delim_right;
-			}
-			else
-			{
-				os << a.x << fmt.space << a.y << fmt.space << a.z;
-			}
-		}
-
-		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, tvec4<T,P> const& a)
 	{
+    return detail::print_vector_on(os, a);
+	}
+
+  namespace detail {
+
+    template <typename CTy, typename CTr, template <typename, precision> class M, typename T, precision P>
+    GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>&
+    print_matrix_on(std::basic_ostream<CTy,CTr>& os, M<T,P> const& a)
+    {
       typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
 
       if(cerberus)
         {
           io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
 
-			if(fmt.formatted)
+          length_t const& cols(type<M>::cols);
-			{
+          length_t const& rows(type<M>::rows);
-				io::basic_state_saver<CTy> const bss(os);
           
-				os << std::fixed
+          if(fmt.formatted) {
-					<< std::right
+            os << fmt.newline
-					<< std::setprecision(fmt.precision)
+               << fmt.delim_left;
-					<< std::setfill(fmt.space)
+            
-					<< fmt.delim_left
+            switch (fmt.order) {
-					<< std::setw(fmt.width) << a.x << fmt.separator
+            case io::column_major:
-					<< std::setw(fmt.width) << a.y << fmt.separator
-					<< std::setw(fmt.width) << a.z << fmt.separator
-					<< std::setw(fmt.width) << a.w
-					<< fmt.delim_right;
-			}
-			else
               {
-				os << a.x << fmt.space << a.y << fmt.space << a.z << fmt.space << a.w;
+                for (unsigned i(0); i < rows; ++i) {
+                  if (0 != i) { os << fmt.space; }
+
+                  os << row(a, i);
+
+                  if (rows-1 != i) { os << fmt.newline; }
+                }
+              }
+              break;
+
+            case io::row_major:
+              {
+                for (unsigned i(0); i < cols; ++i) {
+                  if (0 != i) { os << fmt.space; }
+                  
+                  os << column(a, i);
+
+                  if (cols-1 != i) { os << fmt.newline; }
+                }
+              }
+              break;
+            }
+
+            os << fmt.delim_right;
+          } else {
+            switch (fmt.order) {
+            case io::column_major:
+              {
+                for (unsigned i(0); i < cols; ++i) {
+                  os << column(a, i);
+
+                  if (cols-1 != i) { os << fmt.space; }
+                }
+              }
+              break;
+
+            case io::row_major:
+              {
+                for (unsigned i(0); i < rows; ++i) {
+                  os << row(a, i);
+
+                  if (rows-1 != i) { os << fmt.space; }
+                }
+              }
+              break;
+            }
           }
         }
       
       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, tmat2x2<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+		return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat2x2<T,P> m(a);
-
-			if(io::row_major == fmt.order)
-				m = transpose(a);
-
-			if(fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1];
-			}
-		}
-
-		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, tmat2x3<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat3x2<T,P> m(a);
-
-			if(io::row_major == fmt.order)
-				m = transpose(a);
-
-			if(fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.newline
-					<< fmt.space      << m[2] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1] << fmt.space << 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, tmat2x4<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat4x2<T,P> m(a);
-
-			if(io::row_major == fmt.order)
-				m = transpose(a);
-
-
-			if(fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.newline
-					<< fmt.space      << m[2] << fmt.newline
-					<< fmt.space      << m[3] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
-			}
-		}
-
-		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, tmat3x2<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat2x3<T,P> m(a);
-
-			if(io::row_major == fmt.order)
-				m = transpose(a);
-
-			if(fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1];
-			}
-		}
-
-		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, tmat3x3<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat3x3<T,P> m(a);
-
-			if(io::row_major == fmt.order)
-				m = transpose(a);
-
-			if(fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.newline
-					<< fmt.space      << m[2] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1] << fmt.space << 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, tmat3x4<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat4x3<T,P> m(a);
-
-			if(io::row_major == fmt.order)
-				m = transpose(a);
-
-			if (fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.newline
-					<< fmt.space      << m[2] << fmt.newline
-					<< fmt.space      << m[3] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
-			}
-		}
-
-		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);
+    return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat2x4<T,P> m(a);
-
-			if(io::row_major == fmt.order)
-				m = transpose(a);
-
-			if (fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1];
-			}
-		}
-
-		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, tmat4x3<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat3x4<T,P> m(a);
-
-			if(io::row_major == fmt.order)
-				m = transpose(a);
-
-			if(fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.newline
-					<< fmt.space      << m[2] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1] << fmt.space << 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, tmat4x4<T,P> const& a)
 	{
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+    return detail::print_matrix_on(os, a);
-
-		if(cerberus)
-		{
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat4x4<T,P> m(a);
-
-			if (io::row_major == fmt.order)
-				m = transpose(a);
-
-			if(fmt.formatted)
-			{
-				os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
-					<< fmt.space      << m[1] << fmt.newline
-					<< fmt.space      << m[2] << fmt.newline
-					<< fmt.space      << m[3] << fmt.delim_right;
-			}
-			else
-			{
-				os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
-			}
 	}
 
-		return os;
+  namespace detail {
-	}
 
-	template <typename CTy, typename CTr, typename T, precision P>
+    template <typename CTy, typename CTr, template <typename, precision> class M, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(
+    GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>&
-		std::basic_ostream<CTy,CTr> & os,
+    print_matrix_pair_on(std::basic_ostream<CTy,CTr>& os, std::pair<M<T,P> const, M<T,P> const> const& a)
-		std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const& a)
     {
       typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
 
       if(cerberus)
       {
         io::format_punct<CTy> const& fmt(io::get_facet<io::format_punct<CTy> >(os));
-			tmat4x4<T,P> ml(a.first);
+        M<T,P> const&                ml(a.first);
-			tmat4x4<T,P> mr(a.second);
+        M<T,P> const&                mr(a.second);
-
+        length_t const&              cols(type<M>::cols);
-			if(io::row_major == fmt.order)
+        length_t const&              rows(type<M>::rows);
-			{
-				ml = transpose(a.first);
-				mr = transpose(a.second);
-			}
-
-			if(fmt.formatted)
-			{
-				CTy const & l(fmt.delim_left);
-				CTy const & r(fmt.delim_right);
-				CTy const & s(fmt.space);
           
+        if(fmt.formatted) {
           os << fmt.newline
-					<< l << ml[0] << s << s << l << mr[0] << fmt.newline
+             << fmt.delim_left;
-					<< s << ml[1] << s << s << s << mr[1] << fmt.newline
+            
-					<< s << ml[2] << s << s << s << mr[2] << fmt.newline
+          switch (fmt.order) {
-					<< s << ml[3] << r << s << s << mr[3] << r;
+          case io::column_major:
-			}
-			else
             {
+              for (unsigned i(0); i < rows; ++i) {
+                if (0 != i) { os << fmt.space; }
+
+                os << row(ml, i)
+                   << ((rows-1 != i) ? fmt.space : fmt.delim_right)
+                   << fmt.space
+                   << ((0 != i) ? fmt.space : fmt.delim_left)
+                   << row(mr, i);
+
+                if (rows-1 != i) { os << fmt.newline; }
+              }
+            }
+            break;
+
+          case io::row_major:
+            {
+              for (unsigned i(0); i < cols; ++i) {
+                if (0 != i) { os << fmt.space; }
+
+                os << column(ml, i)
+                   << ((cols-1 != i) ? fmt.space : fmt.delim_right)
+                   << fmt.space
+                   << ((0 != i) ? fmt.space : fmt.delim_left)
+                   << column(mr, i);
+
+                if (cols-1 != i) { os << fmt.newline; }
+              }
+            }
+            break;
+          }
+
+          os << fmt.delim_right;
+        } else {
           os << ml << fmt.space << mr;
         }
       }
 
       return os;
+    }
   }
   
 	template <typename CTy, typename CTr, typename T, precision P>
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(
+	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr> & os,
-		std::basic_ostream<CTy,CTr> & os,
+                                                             std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const& a)
-		std::pair<tmat4x4<T,P>, tmat4x4<T,P> > const& a)
 	{
-		return operator<<(os, static_cast<std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const&>(a));
+    return detail::print_matrix_pair_on(os, a);
 	}
 }//namespace glm

test/gtx/gtx_io.cpp

@@ -1,7 +1,7 @@
 ///////////////////////////////////////////////////////////////////////////////////
 /// OpenGL Mathematics (glm.g-truc.net)
 ///
-/// Copyright (c) 2005 - 2015 G-Truc Creation (www.g-truc.net)
+/// Copyright (c) 2005 - 2016 G-Truc Creation (www.g-truc.net)
 /// Permission is hereby granted, free of charge, to any person obtaining a copy
 /// of this software and associated documentation files (the "Software"), to deal
 /// in the Software without restriction, including without limitation the rights
@@ -25,8 +25,8 @@
 /// THE SOFTWARE.
 ///
 /// @file test/gtx/gtx_io.cpp
-/// @date 2013-11-22 / 2014-11-25
+/// @date 2013-11-22 / 2016-03-14
-/// @author Christophe Riccio
+/// @author Jan P Springer (regnirpsj@gmail.com)
 ///////////////////////////////////////////////////////////////////////////////////
 
 #include <glm/gtc/type_precision.hpp>
@@ -128,7 +128,7 @@ int test_io_vec(OS& os)
 }
 
 template <typename T, glm::precision P, typename OS>
-int test_io_mat(OS& os)
+int test_io_mat(OS& os, glm::io::order_type otype)
 {
 	os << '\n' << typeid(OS).name() << '\n';
 
@@ -145,21 +145,10 @@ int test_io_mat(OS& os)
 	glm::tvec4<T,P> const v4_3(28, 29, 30, 31);
 	glm::tvec4<T,P> const v4_4(32, 33, 34, 35);
 
-#if 0
-	os << "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2<T,P>(v2_1, v2_2) << '\n'
-		<< "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3<T,P>(v3_1, v3_2) << '\n'
-		<< "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4<T,P>(v4_1, v4_2) << '\n'
-		<< "mat3x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x2<T,P>(v2_1, v2_2, v2_3) << '\n'
-		<< "mat3x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x3<T,P>(v3_1, v3_2, v3_3) << '\n'
-		<< "mat3x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat3x4<T,P>(v4_1, v4_2, v4_3) << '\n'
-		<< "mat4x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x2<T,P>(v2_1, v2_2, v2_3, v2_4) << '\n'
-		<< "mat4x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x3<T,P>(v3_1, v3_2, v3_3, v3_4) << '\n'
-		<< "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x4<T,P>(v4_1, v4_2, v4_3, v4_4) << '\n';
-#endif
-
 	glm::io::basic_format_saver<typename OS::char_type> const iofs(os);
 
 	os << glm::io::precision(2) << glm::io::width(1 + 2 + 1 + 2)
+		<< glm::io::order(otype)
 		<< "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2<T,P>(v2_1, v2_2) << '\n'
 		<< "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3<T,P>(v3_1, v3_2) << '\n'
 		<< "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4<T,P>(v4_1, v4_2) << '\n'
@@ -171,7 +160,7 @@ int test_io_mat(OS& os)
 		<< "mat4x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat4x4<T,P>(v4_1, v4_2, v4_3, v4_4) << '\n';
 
 	os << glm::io::unformatted
-		<< glm::io::order(glm::io::column_major)
+		<< glm::io::order(otype)
 		<< "mat2x2<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x2<T,P>(v2_1, v2_2) << '\n'
 		<< "mat2x3<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x3<T,P>(v3_1, v3_2) << '\n'
 		<< "mat2x4<" << typeid(T).name() << ',' << P << ">: " << glm::tmat2x4<T,P>(v4_1, v4_2) << '\n'
@@ -203,8 +192,10 @@ int main()
 	Error += test_io_vec<glm::uint, glm::lowp>(std::cout);
 	Error += test_io_vec<glm::uint, glm::lowp>(std::wcout);
 
-	Error += test_io_mat<float, glm::highp>(std::cout);
+	Error += test_io_mat<float, glm::highp>(std::cout, glm::io::column_major);
-	Error += test_io_mat<float, glm::lowp>(std::wcout);
+	Error += test_io_mat<float, glm::lowp>(std::wcout, glm::io::column_major);
+	Error += test_io_mat<float, glm::highp>(std::cout, glm::io::row_major);
+        Error += test_io_mat<float, glm::lowp>(std::wcout, glm::io::row_major);
 
 	return Error;
 }