anulax
/
glm
1
0
Fork 0
Code Issues Pull Requests Packages project_board Releases Wiki Activity

merge 0.9.5

Browse Source
master
Christophe Riccio ago%!(EXTRA string=11 years)
parent a5ab409ed2 4fa38c7a03
commit b5ffd74c3e
5 changed files with 780 additions and 764 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      glm/gtx/io.hpp
  2. 263
      glm/gtx/io.inl
  3. 54
      glm/gtx/quaternion.inl
  4. 3
      readme.txt
  5. 4
      test/core/core_func_matrix.cpp

40
glm/gtx/io.hpp
Unescape View File

@ -62,12 +62,11 @@ namespace glm
namespace io namespace io
{ {
enum order_type { column_major, row_major};
enum order_type { column_major, row_major, };
template <typename CTy> template <typename CTy>
class format_punct : public std::locale::facet { class format_punct : public std::locale::facet
{
typedef CTy char_type; typedef CTy char_type;
public: public:
@ -86,7 +85,6 @@ namespace glm
explicit format_punct(size_t a = 0); explicit format_punct(size_t a = 0);
explicit format_punct(format_punct const&); explicit format_punct(format_punct const&);
}; };
template <typename CTy, typename CTr = std::char_traits<CTy> > template <typename CTy, typename CTr = std::char_traits<CTy> >
@ -113,15 +111,14 @@ namespace glm
locale_type locale_; locale_type locale_;
basic_state_saver& operator=(basic_state_saver const&); basic_state_saver& operator=(basic_state_saver const&);
}; };
typedef basic_state_saver<char> state_saver; typedef basic_state_saver<char> state_saver;
typedef basic_state_saver<wchar_t> wstate_saver; typedef basic_state_saver<wchar_t> wstate_saver;
template <typename CTy, typename CTr = std::char_traits<CTy> > template <typename CTy, typename CTr = std::char_traits<CTy> >
class basic_format_saver { class basic_format_saver
{
public: public:
explicit basic_format_saver(std::basic_ios<CTy,CTr>&); explicit basic_format_saver(std::basic_ios<CTy,CTr>&);
@ -132,43 +129,38 @@ namespace glm
basic_state_saver<CTy> const bss_; basic_state_saver<CTy> const bss_;
basic_format_saver& operator=(basic_format_saver const&); basic_format_saver& operator=(basic_format_saver const&);
}; };
typedef basic_format_saver<char> format_saver; typedef basic_format_saver<char> format_saver;
typedef basic_format_saver<wchar_t> wformat_saver; typedef basic_format_saver<wchar_t> wformat_saver;
struct precision { struct precision
{
unsigned value; unsigned value;
explicit precision(unsigned); explicit precision(unsigned);
}; };
struct width { struct width
{
unsigned value; unsigned value;
explicit width(unsigned); explicit width(unsigned);
}; };
template <typename CTy> template <typename CTy>
struct delimeter { struct delimeter
{
CTy value[3]; CTy value[3];
explicit delimeter(CTy /* left */, CTy /* right */, CTy /* separator */ = ','); explicit delimeter(CTy /* left */, CTy /* right */, CTy /* separator */ = ',');
}; };
struct order { struct order
{
order_type value; order_type value;
explicit order(order_type); explicit order(order_type);
}; };
// functions, inlined (inline) // functions, inlined (inline)
@ -188,12 +180,10 @@ namespace glm
std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, delimeter<CTy> const&); std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, delimeter<CTy> const&);
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, order const&); std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, order const&);
}//namespace io }//namespace io
namespace detail namespace detail
{ {
template <typename CTy, typename CTr, typename T, precision P> template <typename CTy, typename CTr, typename T, precision P>
GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tquat<T,P> const&); GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tquat<T,P> const&);
template <typename CTy, typename CTr, typename T, precision P> template <typename CTy, typename CTr, typename T, precision P>
@ -222,10 +212,10 @@ namespace glm
GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, tmat4x4<T,P> const&); 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> template <typename CTy, typename CTr, typename T, precision P>
GLM_FUNC_DECL std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>&, GLM_FUNC_DECL std::basic_ostream<CTy,CTr> & operator<<(
std::basic_ostream<CTy,CTr> &,
std::pair<tmat4x4<T,P> const, std::pair<tmat4x4<T,P> const,
tmat4x4<T,P> const> const &); tmat4x4<T,P> const> const &);
}//namespace detail }//namespace detail
/// @} /// @}

263
glm/gtx/io.inl
Unescape View File

@ -10,11 +10,9 @@
#include <iomanip> // std::setfill<>, std::fixed, std::setprecision, std::right, std::setw #include <iomanip> // std::setfill<>, std::fixed, std::setprecision, std::right, std::setw
#include <ostream> // std::basic_ostream<> #include <ostream> // std::basic_ostream<>
namespace glm namespace glm{
{
namespace io namespace io
{ {
template <typename CTy> template <typename CTy>
/* explicit */ GLM_FUNC_QUALIFIER /* explicit */ GLM_FUNC_QUALIFIER
format_punct<CTy>::format_punct(size_t a) format_punct<CTy>::format_punct(size_t a)
@ -48,8 +46,7 @@ namespace glm
template <typename CTy> std::locale::id format_punct<CTy>::id; template <typename CTy> std::locale::id format_punct<CTy>::id;
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
/* explicit */ GLM_FUNC_QUALIFIER /* explicit */ GLM_FUNC_QUALIFIER basic_state_saver<CTy,CTr>::basic_state_saver(std::basic_ios<CTy,CTr>& a)
basic_state_saver<CTy,CTr>::basic_state_saver(std::basic_ios<CTy,CTr>& a)
: state_ (a), : state_ (a),
flags_ (a.flags()), flags_ (a.flags()),
precision_(a.precision()), precision_(a.precision()),
@ -59,8 +56,7 @@ namespace glm
{} {}
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
GLM_FUNC_QUALIFIER GLM_FUNC_QUALIFIER basic_state_saver<CTy,CTr>::~basic_state_saver()
basic_state_saver<CTy,CTr>::~basic_state_saver()
{ {
state_.imbue(locale_); state_.imbue(locale_);
state_.fill(fill_); state_.fill(fill_);
@ -70,8 +66,7 @@ namespace glm
} }
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
/* explicit */ GLM_FUNC_QUALIFIER /* explicit */ GLM_FUNC_QUALIFIER basic_format_saver<CTy,CTr>::basic_format_saver(std::basic_ios<CTy,CTr>& a)
basic_format_saver<CTy,CTr>::basic_format_saver(std::basic_ios<CTy,CTr>& a)
: bss_(a) : bss_(a)
{ {
a.imbue(std::locale(a.getloc(), new format_punct<CTy>(get_facet<format_punct<CTy> >(a)))); a.imbue(std::locale(a.getloc(), new format_punct<CTy>(get_facet<format_punct<CTy> >(a))));
@ -82,19 +77,16 @@ namespace glm
basic_format_saver<CTy,CTr>::~basic_format_saver() basic_format_saver<CTy,CTr>::~basic_format_saver()
{} {}
/* explicit */ GLM_FUNC_QUALIFIER /* explicit */ GLM_FUNC_QUALIFIER precision::precision(unsigned a)
precision::precision(unsigned a)
: value(a) : value(a)
{} {}
/* explicit */ GLM_FUNC_QUALIFIER /* explicit */ GLM_FUNC_QUALIFIER width::width(unsigned a)
width::width(unsigned a)
: value(a) : value(a)
{} {}
template <typename CTy> template <typename CTy>
/* explicit */ GLM_FUNC_QUALIFIER /* explicit */ GLM_FUNC_QUALIFIER delimeter<CTy>::delimeter(CTy a, CTy b, CTy c)
delimeter<CTy>::delimeter(CTy a, CTy b, CTy c)
: value() : value()
{ {
value[0] = a; value[0] = a;
@ -108,8 +100,7 @@ namespace glm
{} {}
template <typename FTy, typename CTy, typename CTr> template <typename FTy, typename CTy, typename CTr>
GLM_FUNC_QUALIFIER FTy const& GLM_FUNC_QUALIFIER FTy const& get_facet(std::basic_ios<CTy,CTr>& ios)
get_facet(std::basic_ios<CTy,CTr>& ios)
{ {
if (!std::has_facet<FTy>(ios.getloc())) { if (!std::has_facet<FTy>(ios.getloc())) {
ios.imbue(std::locale(ios.getloc(), new FTy)); ios.imbue(std::locale(ios.getloc(), new FTy));
@ -119,8 +110,7 @@ namespace glm
} }
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ios<CTy,CTr>& GLM_FUNC_QUALIFIER std::basic_ios<CTy,CTr>& formatted(std::basic_ios<CTy,CTr>& ios)
formatted(std::basic_ios<CTy,CTr>& ios)
{ {
const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = true; const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = true;
@ -128,8 +118,7 @@ namespace glm
} }
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ios<CTy,CTr>& GLM_FUNC_QUALIFIER std::basic_ios<CTy,CTr>& unformatted(std::basic_ios<CTy,CTr>& ios)
unformatted(std::basic_ios<CTy,CTr>& ios)
{ {
const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = false; const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)).formatted = false;
@ -137,8 +126,7 @@ namespace glm
} }
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, precision const& a)
operator<<(std::basic_ostream<CTy, CTr>& os, precision const& a)
{ {
const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).precision = a.value; const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).precision = a.value;
@ -146,8 +134,7 @@ namespace glm
} }
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, width const& a)
operator<<(std::basic_ostream<CTy, CTr>& os, width const& a)
{ {
const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).width = a.value; const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).width = a.value;
@ -155,8 +142,7 @@ namespace glm
} }
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, delimeter<CTy> const& a)
delimeter<CTy> const& a)
{ {
format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os))); format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)));
@ -168,28 +154,27 @@ namespace glm
} }
template <typename CTy, typename CTr> template <typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, order const& a)
operator<<(std::basic_ostream<CTy, CTr>& os, order const& a)
{ {
const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).order = a.value; const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)).order = a.value;
return os; return os;
} }
} // namespace io } // namespace io
namespace detail { namespace detail
{
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tquat<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tquat<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
if (fmt.formatted) { if(fmt.formatted)
{
io::basic_state_saver<CTy> const bss(os); io::basic_state_saver<CTy> const bss(os);
os << std::fixed os << std::fixed
@ -202,7 +187,9 @@ namespace glm
<< std::setw(fmt.width) << a.y << fmt.separator << std::setw(fmt.width) << a.y << fmt.separator
<< std::setw(fmt.width) << a.z << std::setw(fmt.width) << a.z
<< fmt.delim_right; << fmt.delim_right;
} else { }
else
{
os << a.w << fmt.space << a.x << fmt.space << a.y << fmt.space << a.z; os << a.w << fmt.space << a.x << fmt.space << a.y << fmt.space << a.z;
} }
} }
@ -211,15 +198,16 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec2<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tvec2<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
if (fmt.formatted) { if(fmt.formatted)
{
io::basic_state_saver<CTy> const bss(os); io::basic_state_saver<CTy> const bss(os);
os << std::fixed os << std::fixed
@ -230,7 +218,9 @@ namespace glm
<< std::setw(fmt.width) << a.x << fmt.separator << std::setw(fmt.width) << a.x << fmt.separator
<< std::setw(fmt.width) << a.y << std::setw(fmt.width) << a.y
<< fmt.delim_right; << fmt.delim_right;
} else { }
else
{
os << a.x << fmt.space << a.y; os << a.x << fmt.space << a.y;
} }
} }
@ -239,15 +229,16 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec3<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tvec3<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
if (fmt.formatted) { if(fmt.formatted)
{
io::basic_state_saver<CTy> const bss(os); io::basic_state_saver<CTy> const bss(os);
os << std::fixed os << std::fixed
@ -259,7 +250,9 @@ namespace glm
<< std::setw(fmt.width) << a.y << fmt.separator << std::setw(fmt.width) << a.y << fmt.separator
<< std::setw(fmt.width) << a.z << std::setw(fmt.width) << a.z
<< fmt.delim_right; << fmt.delim_right;
} else { }
else
{
os << a.x << fmt.space << a.y << fmt.space << a.z; os << a.x << fmt.space << a.y << fmt.space << a.z;
} }
} }
@ -268,15 +261,16 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tvec4<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tvec4<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
if (fmt.formatted) { if(fmt.formatted)
{
io::basic_state_saver<CTy> const bss(os); io::basic_state_saver<CTy> const bss(os);
os << std::fixed os << std::fixed
@ -289,7 +283,9 @@ namespace glm
<< std::setw(fmt.width) << a.z << fmt.separator << std::setw(fmt.width) << a.z << fmt.separator
<< std::setw(fmt.width) << a.w << std::setw(fmt.width) << a.w
<< fmt.delim_right; << fmt.delim_right;
} else { }
else
{
os << a.x << fmt.space << a.y << fmt.space << a.z << fmt.space << a.w; os << a.x << fmt.space << a.y << fmt.space << a.z << fmt.space << a.w;
} }
} }
@ -298,24 +294,26 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x2<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x2<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat2x2<T,P> m(a); tmat2x2<T,P> m(a);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) { if(fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.delim_right; << fmt.space << m[1] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1]; os << m[0] << fmt.space << m[1];
} }
} }
@ -324,25 +322,27 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x3<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x3<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat3x2<T,P> m(a); tmat3x2<T,P> m(a);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) { if(fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.newline << fmt.space << m[1] << fmt.newline
<< fmt.space << m[2] << fmt.delim_right; << fmt.space << m[2] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1] << fmt.space << m[2]; os << m[0] << fmt.space << m[1] << fmt.space << m[2];
} }
} }
@ -351,26 +351,29 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x4<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tmat2x4<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat4x2<T,P> m(a); tmat4x2<T,P> m(a);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) {
if(fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.newline << fmt.space << m[1] << fmt.newline
<< fmt.space << m[2] << fmt.newline << fmt.space << m[2] << fmt.newline
<< fmt.space << m[3] << fmt.delim_right; << fmt.space << m[3] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3]; os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
} }
} }
@ -379,24 +382,26 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x2<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x2<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat2x3<T,P> m(a); tmat2x3<T,P> m(a);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) { if(fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.delim_right; << fmt.space << m[1] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1]; os << m[0] << fmt.space << m[1];
} }
} }
@ -405,25 +410,27 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x3<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x3<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat3x3<T,P> m(a); tmat3x3<T,P> m(a);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) { if(fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.newline << fmt.space << m[1] << fmt.newline
<< fmt.space << m[2] << fmt.delim_right; << fmt.space << m[2] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1] << fmt.space << m[2]; os << m[0] << fmt.space << m[1] << fmt.space << m[2];
} }
} }
@ -432,26 +439,28 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x4<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tmat3x4<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat4x3<T,P> m(a); tmat4x3<T,P> m(a);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) { if (fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.newline << fmt.space << m[1] << fmt.newline
<< fmt.space << m[2] << fmt.newline << fmt.space << m[2] << fmt.newline
<< fmt.space << m[3] << fmt.delim_right; << fmt.space << m[3] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3]; os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
} }
} }
@ -460,24 +469,26 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x2<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x2<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat2x4<T,P> m(a); tmat2x4<T,P> m(a);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) { if (fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.delim_right; << fmt.space << m[1] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1]; os << m[0] << fmt.space << m[1];
} }
} }
@ -486,25 +497,27 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x3<T,P> const& a)
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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat3x4<T,P> m(a); tmat3x4<T,P> m(a);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) { if(fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.newline << fmt.space << m[1] << fmt.newline
<< fmt.space << m[2] << fmt.delim_right; << fmt.space << m[2] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1] << fmt.space << m[2]; os << m[0] << fmt.space << m[1] << fmt.space << m[2];
} }
} }
@ -513,26 +526,28 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr> & operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x4<T,P> const& a)
operator<<(std::basic_ostream<CTy,CTr>& os, tmat4x4<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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat4x4<T,P> m(a); tmat4x4<T,P> m(a);
if (io::row_major == fmt.order) { if (io::row_major == fmt.order)
m = transpose(a); m = transpose(a);
}
if (fmt.formatted) { if(fmt.formatted)
{
os << fmt.newline os << fmt.newline
<< fmt.delim_left << m[0] << fmt.newline << fmt.delim_left << m[0] << fmt.newline
<< fmt.space << m[1] << fmt.newline << fmt.space << m[1] << fmt.newline
<< fmt.space << m[2] << fmt.newline << fmt.space << m[2] << fmt.newline
<< fmt.space << m[3] << fmt.delim_right; << fmt.space << m[3] << fmt.delim_right;
} else { }
else
{
os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3]; os << m[0] << fmt.space << m[1] << fmt.space << m[2] << fmt.space << m[3];
} }
} }
@ -541,23 +556,26 @@ namespace glm
} }
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>& GLM_FUNC_QUALIFIER std::basic_ostream<CTy,CTr>& operator<<(
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> const, tmat4x4<T,P> const> 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)
{
io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os)); io::format_punct<CTy> const & fmt(io::get_facet<io::format_punct<CTy> >(os));
tmat4x4<T,P> ml(a.first); tmat4x4<T,P> ml(a.first);
tmat4x4<T,P> mr(a.second); tmat4x4<T,P> mr(a.second);
if (io::row_major == fmt.order) { if(io::row_major == fmt.order)
{
ml = transpose(a.first); ml = transpose(a.first);
mr = transpose(a.second); mr = transpose(a.second);
} }
if (fmt.formatted) { if(fmt.formatted)
{
CTy const & l(fmt.delim_left); CTy const & l(fmt.delim_left);
CTy const & r(fmt.delim_right); CTy const & r(fmt.delim_right);
CTy const & s(fmt.space); CTy const & s(fmt.space);
@ -567,13 +585,14 @@ namespace glm
<< s << ml[1] << s << s << s << mr[1] << fmt.newline << s << ml[1] << s << s << s << mr[1] << fmt.newline
<< s << ml[2] << s << s << s << mr[2] << fmt.newline << s << ml[2] << s << s << s << mr[2] << fmt.newline
<< s << ml[3] << r << s << s << mr[3] << r; << s << ml[3] << r << s << s << mr[3] << r;
} else { }
else
{
os << ml << fmt.space << mr; os << ml << fmt.space << mr;
} }
} }
return os; return os;
} }
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm

54
glm/gtx/quaternion.inl
Unescape View File

@ -8,6 +8,7 @@
/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
#include <limits> #include <limits>
#include "../gtc/constants.hpp"
namespace glm namespace glm
{ {
@ -40,7 +41,7 @@ namespace glm
detail::tquat<T, P> const & s2, detail::tquat<T, P> const & s2,
T const & h) T const & h)
{ {
return mix(mix(q1, q2, h), mix(s1, s2, h), T(2) * (T(1) - h) * h); return mix(mix(q1, q2, h), mix(s1, s2, h), static_cast<T>(2) * (static_cast<T>(1) - h) * h);
} }
template <typename T, precision P> template <typename T, precision P>
@ -52,7 +53,7 @@ namespace glm
) )
{ {
detail::tquat<T, P> invQuat = inverse(curr); detail::tquat<T, P> invQuat = inverse(curr);
return exp((log(next + invQuat) + log(prev + invQuat)) / T(-4)) * curr; return exp((log(next + invQuat) + log(prev + invQuat)) / static_cast<T>(-4)) * curr;
} }
template <typename T, precision P> template <typename T, precision P>
@ -62,7 +63,10 @@ namespace glm
) )
{ {
detail::tvec3<T, P> u(q.x, q.y, q.z); detail::tvec3<T, P> u(q.x, q.y, q.z);
float Angle = glm::length(u); T Angle = glm::length(u);
if (Angle < epsilon<T>())
return detail::tquat<T, P>();
detail::tvec3<T, P> v(u / Angle); detail::tvec3<T, P> v(u / Angle);
return detail::tquat<T, P>(cos(Angle), sin(Angle) * v); return detail::tquat<T, P>(cos(Angle), sin(Angle) * v);
} }
@ -73,18 +77,20 @@ namespace glm
detail::tquat<T, P> const & q detail::tquat<T, P> const & q
) )
{ {
if((q.x == static_cast<T>(0)) && (q.y == static_cast<T>(0)) && (q.z == static_cast<T>(0))) detail::tvec3<T, P> u(q.x, q.y, q.z);
T Vec3Len = length(u);
if (Vec3Len < epsilon<T>())
{ {
if(q.w > T(0)) if(q.w > static_cast<T>(0))
return detail::tquat<T, P>(log(q.w), T(0), T(0), T(0)); return detail::tquat<T, P>(log(q.w), static_cast<T>(0), static_cast<T>(0), static_cast<T>(0));
else if(q.w < T(0)) else if(q.w < static_cast<T>(0))
return detail::tquat<T, P>(log(-q.w), T(3.1415926535897932384626433832795), T(0),T(0)); return detail::tquat<T, P>(log(-q.w), pi<T>(), static_cast<T>(0), static_cast<T>(0));
else else
return detail::tquat<T, P>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity()); return detail::tquat<T, P>(std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity(), std::numeric_limits<T>::infinity());
} }
else else
{ {
T Vec3Len = sqrt(q.x * q.x + q.y * q.y + q.z * q.z);
T QuatLen = sqrt(Vec3Len * Vec3Len + q.w * q.w); T QuatLen = sqrt(Vec3Len * Vec3Len + q.w * q.w);
T t = atan(Vec3Len, T(q.w)) / Vec3Len; T t = atan(Vec3Len, T(q.w)) / Vec3Len;
return detail::tquat<T, P>(log(QuatLen), t * q.x, t * q.y, t * q.z); return detail::tquat<T, P>(log(QuatLen), t * q.x, t * q.y, t * q.z);
@ -98,11 +104,11 @@ namespace glm
T const & y T const & y
) )
{ {
if(abs(x.w) > T(0.9999)) if(abs(x.w) > (static_cast<T>(1) - epsilon<T>()))
return x; return x;
float Angle = acos(y); T Angle = acos(y);
float NewAngle = Angle * y; T NewAngle = Angle * y;
float Div = sin(NewAngle) / sin(Angle); T Div = sin(NewAngle) / sin(Angle);
return detail::tquat<T, P>( return detail::tquat<T, P>(
cos(NewAngle), cos(NewAngle),
x.x * Div, x.x * Div,
@ -146,7 +152,7 @@ namespace glm
detail::tquat<T, P> const & q detail::tquat<T, P> const & q
) )
{ {
T w = static_cast<T>(1.0) - q.x * q.x - q.y * q.y - q.z * q.z; T w = static_cast<T>(1) - q.x * q.x - q.y * q.y - q.z * q.z;
if(w < T(0)) if(w < T(0))
return T(0); return T(0);
else else
@ -170,12 +176,12 @@ namespace glm
T const & a T const & a
) )
{ {
if(a <= T(0)) return x; if(a <= static_cast<T>(0)) return x;
if(a >= T(1)) return y; if(a >= static_cast<T>(1)) return y;
T fCos = dot(x, y); T fCos = dot(x, y);
detail::tquat<T, P> y2(y); //BUG!!! tquat<T> y2; detail::tquat<T, P> y2(y); //BUG!!! tquat<T> y2;
if(fCos < T(0)) if(fCos < static_cast<T>(0))
{ {
y2 = -y; y2 = -y;
fCos = -fCos; fCos = -fCos;
@ -183,7 +189,7 @@ namespace glm
//if(fCos > 1.0f) // problem //if(fCos > 1.0f) // problem
T k0, k1; T k0, k1;
if(fCos > T(0.9999)) if(fCos > (static_cast<T>(1) - epsilon<T>()))
{ {
k0 = static_cast<T>(1) - a; k0 = static_cast<T>(1) - a;
k1 = static_cast<T>(0) + a; //BUG!!! 1.0f + a; k1 = static_cast<T>(0) + a; //BUG!!! 1.0f + a;
@ -193,8 +199,8 @@ namespace glm
T fSin = sqrt(T(1) - fCos * fCos); T fSin = sqrt(T(1) - fCos * fCos);
T fAngle = atan(fSin, fCos); T fAngle = atan(fSin, fCos);
T fOneOverSin = static_cast<T>(1) / fSin; T fOneOverSin = static_cast<T>(1) / fSin;
k0 = sin((T(1) - a) * fAngle) * fOneOverSin; k0 = sin((static_cast<T>(1) - a) * fAngle) * fOneOverSin;
k1 = sin((T(0) + a) * fAngle) * fOneOverSin; k1 = sin((static_cast<T>(0) + a) * fAngle) * fOneOverSin;
} }
return detail::tquat<T, P>( return detail::tquat<T, P>(
@ -212,7 +218,7 @@ namespace glm
T const & a T const & a
) )
{ {
return glm::normalize(x * (T(1) - a) + (y * a)); return glm::normalize(x * (static_cast<T>(1) - a) + (y * a));
} }
template <typename T, precision P> template <typename T, precision P>
@ -225,7 +231,7 @@ namespace glm
T cosTheta = dot(orig, dest); T cosTheta = dot(orig, dest);
detail::tvec3<T, P> rotationAxis; detail::tvec3<T, P> rotationAxis;
if(cosTheta < T(-1) + epsilon<T>()) if(cosTheta < static_cast<T>(-1) + epsilon<T>())
{ {
// special case when vectors in opposite directions : // special case when vectors in opposite directions :
// there is no "ideal" rotation axis // there is no "ideal" rotation axis
@ -243,11 +249,11 @@ namespace glm
// Implementation from Stan Melax's Game Programming Gems 1 article // Implementation from Stan Melax's Game Programming Gems 1 article
rotationAxis = cross(orig, dest); rotationAxis = cross(orig, dest);
T s = sqrt((T(1) + cosTheta) * T(2)); T s = sqrt((T(1) + cosTheta) * static_cast<T>(2));
T invs = static_cast<T>(1) / s; T invs = static_cast<T>(1) / s;
return detail::tquat<T, P>( return detail::tquat<T, P>(
s * T(0.5f), s * static_cast<T>(0.5f),
rotationAxis.x * invs, rotationAxis.x * invs,
rotationAxis.y * invs, rotationAxis.y * invs,
rotationAxis.z * invs); rotationAxis.z * invs);

3
readme.txt
Unescape View File

@ -45,7 +45,7 @@ GLM 0.9.6.0: 2014-XX-XX
- Added move contructors and assignment operators (#141) - Added move contructors and assignment operators (#141)
================================================================================ ================================================================================
GLM 0.9.5.4: 2014-0X-XX GLM 0.9.5.4: 2014-06-21
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- Fixed non-utf8 character #196 - Fixed non-utf8 character #196
- Added FindGLM install for CMake #189 - Added FindGLM install for CMake #189
@ -64,6 +64,7 @@ GLM 0.9.5.4: 2014-0X-XX
- Fixed std::copy and std::vector with GLM types #214 - Fixed std::copy and std::vector with GLM types #214
- Fixed strict aliasing issues #212, #152 - Fixed strict aliasing issues #212, #152
- Fixed std::nextafter not supported with C++11 on Android #213 - Fixed std::nextafter not supported with C++11 on Android #213
- Fixed corner cases in exp and log functions for quaternions #199
================================================================================ ================================================================================
GLM 0.9.5.3: 2014-04-02 GLM 0.9.5.3: 2014-04-02

4
test/core/core_func_matrix.cpp
Unescape View File

@ -228,10 +228,10 @@ int test_inverse_perf(std::size_t Instance, char const * Message)
//glm::uint Ulp = 0; //glm::uint Ulp = 0;
//Ulp = glm::max(glm::float_distance(*Dst, *Src), Ulp); //Ulp = glm::max(glm::float_distance(*Dst, *Src), Ulp);
printf("inverse<%s>(%f): %d\n", Message, Diff, EndTime - StartTime); printf("inverse<%s>(%f): %lu\n", Message, Diff, EndTime - StartTime);
return 0; return 0;
}; }
int main() int main()
{ {

Write Preview
Loading…
Cancel
Save