fixed: ostream operators

glm/gtx/io.hpp

@@ -30,6 +30,7 @@
 /// @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
@@ -42,6 +43,9 @@
 ///        [http://home.roadrunner.com/~hinnant/bloomington/chrono_io.html]
 ///
 ///        <glm/gtx/io.hpp> needs to be included to use these functionalities.
+///
+///        GLM_META_PROG_HELPERS must be defined before including this and any other
+///        glm header file.
 ///////////////////////////////////////////////////////////////////////////////////
 
 #pragma once
@@ -215,16 +219,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

@@ -30,8 +30,13 @@
 /// @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
+
+#if !defined(GLM_META_PROG_HELPERS)
+# pragma error("Please define 'GLM_META_PROG_HELPERS' before using GLM_GTX_io")
+#endif
 
 namespace glm{
   namespace io
@@ -48,7 +53,7 @@ namespace io
         delim_right       (']'),
         space             (' '),
         newline           ('\n'),
-		order             (row_major)
+        order             (column_major)
     {}
 
     template <typename CTy>
@@ -117,8 +122,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 +169,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 +189,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);
 
@@ -202,85 +209,66 @@ 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 < V<T,P>::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 (V<T,P>::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 < V<T,P>::components; ++i) {
+                os << a[i];
+
+                if (V<T,P>::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, tvec1<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)
-                        {
-                                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
+
+	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)
 	{
-                                os << a.x;
+    return detail::print_vector_on(os, a);
-                        }
 	}
 
-                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, tvec1<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, 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)
+	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)
 	{
-				io::basic_state_saver<CTy> const bss(os);
+    return detail::print_vector_on(os, a);
-
-				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
+  
+	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)
 	{
-				os << a.x << fmt.space << a.y;
+    return detail::print_vector_on(os, a);
-			}
 	}
 
-		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<<(std::basic_ostream<CTy,CTr>& os, tvec3<T,P> const& a)
+    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);
 
@@ -288,369 +276,187 @@ namespace io
         {
           io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
 
-			if(fmt.formatted)
+          if(fmt.formatted) {
+            os << fmt.newline
+               << fmt.delim_left;
+            
+            switch (fmt.order) {
+            case io::column_major:
               {
-				io::basic_state_saver<CTy> const bss(os);
+                for (unsigned i(0); i < M<T,P>::rows; ++i) {
+                  if (0 != i) { os << fmt.space; }
 
-				os << std::fixed
+                  os << row(a, i);
-					<< std::right
+
-					<< std::setprecision(fmt.precision)
+                  if (M<T,P>::rows-1 != i) { os << fmt.newline; }
-					<< 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
+              }
+              break;
+
+            case io::row_major:
               {
-				os << a.x << fmt.space << a.y << fmt.space << a.z;
+                for (unsigned i(0); i < M<T,P>::cols; ++i) {
+                  if (0 != i) { os << fmt.space; }
+                  
+                  os << column(a, i);
+
+                  if (M<T,P>::cols-1 != i) { os << fmt.newline; }
                 }
               }
-
+              break;
-		return os;
             }
 
-	template <typename CTy, typename CTr, typename T, precision P>
+            os << fmt.delim_right;
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec4<T,P> const& a)
+          } else {
+            switch (fmt.order) {
+            case io::column_major:
               {
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+                for (unsigned i(0); i < M<T,P>::cols; ++i) {
+                  os << column(a, i);
 
-		if(cerberus)
+                  if (M<T,P>::cols-1 != i) { os << fmt.space; }
-		{
+                }
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
+              }
+              break;
 
-			if(fmt.formatted)
+            case io::row_major:
               {
-				io::basic_state_saver<CTy> const bss(os);
+                for (unsigned i(0); i < M<T,P>::rows; ++i) {
+                  os << row(a, i);
 
-				os << std::fixed
+                  if (M<T,P>::rows-1 != i) { os << fmt.space; }
-					<< std::right
+                }
-					<< std::setprecision(fmt.precision)
+              }
-					<< std::setfill(fmt.space)
+              break;
-					<< 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.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;
           }
         }
       
       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
+
+	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)
 	{
-				os << m[0] << fmt.space << m[1] << fmt.space << m[2];
+    return detail::print_matrix_on(os, a);
-			}
 	}
 
-		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<<(std::basic_ostream<CTy,CTr>& os, tmat4x4<T,P> const& a)
+    GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>&
+    print_matrix_pair_on(std::basic_ostream<CTy,CTr>& os, std::pair<M<T,P> const, M<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> m(a);
+        M<T,P> const& ml(a.first);
-
+        M<T,P> const& mr(a.second);
-			if (io::row_major == fmt.order)
-				m = transpose(a);
           
-			if(fmt.formatted)
+        if(fmt.formatted) {
-			{
           os << fmt.newline
-					<< fmt.delim_left << m[0] << fmt.newline
+             << fmt.delim_left;
-					<< 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>
+          switch (fmt.order) {
-	GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(
+          case io::column_major:
-		std::basic_ostream<CTy,CTr> & os,
-		std::pair<tmat4x4<T,P> const, tmat4x4<T,P> const> const& a)
             {
-		typename std::basic_ostream<CTy,CTr>::sentry const cerberus(os);
+              for (unsigned i(0); i < M<T,P>::rows; ++i) {
+                if (0 != i) { os << fmt.space; }
 
-		if(cerberus)
+                os << row(ml, i)
-		{
+                   << ((M<T,P>::rows-1 != i) ? fmt.space : fmt.delim_right)
-			io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
+                   << fmt.space
-			tmat4x4<T,P> ml(a.first);
+                   << ((0 != i) ? fmt.space : fmt.delim_left)
-			tmat4x4<T,P> mr(a.second);
+                   << row(mr, i);
 
-			if(io::row_major == fmt.order)
+                if (M<T,P>::rows-1 != i) { os << fmt.newline; }
-			{
+              }
-				ml = transpose(a.first);
-				mr = transpose(a.second);
             }
+            break;
 
-			if(fmt.formatted)
+          case io::row_major:
             {
-				CTy const & l(fmt.delim_left);
+              for (unsigned i(0); i < M<T,P>::cols; ++i) {
-				CTy const & r(fmt.delim_right);
+                if (0 != i) { os << fmt.space; }
-				CTy const & s(fmt.space);
 
-				os << fmt.newline
+                os << column(ml, i)
-					<< l << ml[0] << s << s << l << mr[0] << fmt.newline
+                   << ((M<T,P>::cols-1 != i) ? fmt.space : fmt.delim_right)
-					<< s << ml[1] << s << s << s << mr[1] << fmt.newline
+                   << fmt.space
-					<< s << ml[2] << s << s << s << mr[2] << fmt.newline
+                   << ((0 != i) ? fmt.space : fmt.delim_left)
-					<< s << ml[3] << r << s << s << mr[3] << r;
+                   << column(mr, i);
+
+                if (M<T,P>::cols-1 != i) { os << fmt.newline; }
               }
-			else
+            }
-			{
+            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

@@ -29,6 +29,7 @@
 /// @author Christophe Riccio
 ///////////////////////////////////////////////////////////////////////////////////
 
+#define GLM_META_PROG_HELPERS
 #include <glm/gtc/type_precision.hpp>
 #include <glm/gtx/io.hpp>
 #include <iostream>
@@ -128,7 +129,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 +146,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 +161,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 +193,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;
 }