organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-05 05:25:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge f871bd1928 into 88a6ed6ee1

Browse source
This commit is contained in:
Diego Mateos 2024-02-08 15:40:48 +01:00 • committed by GitHub
commit 035d94f8a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 93 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
glm/gtx/io.hpp
View file

@ -64,8 +64,10 @@ namespace glm
char_type separator;
char_type delim_left;
char_type delim_right;
char_type fill;
char_type space;
char_type newline;
char_type firstline;
order_type order;
GLM_FUNC_DECL explicit format_punct(size_t a = 0);
@ -123,14 +125,14 @@ namespace glm
{
unsigned value;
GLM_FUNC_DECL explicit precision(unsigned);
GLM_FUNC_DECL explicit precision(unsigned = 3);
};
struct width
{
unsigned value;
GLM_FUNC_DECL explicit width(unsigned);
GLM_FUNC_DECL explicit width(unsigned = 8);
};
template<typename CTy>
@ -138,14 +140,21 @@ namespace glm
{
CTy value[3];
GLM_FUNC_DECL explicit delimeter(CTy /* left */, CTy /* right */, CTy /* separator */ = ',');
GLM_FUNC_DECL explicit delimeter(CTy /* left */ = "[", CTy /* right */ = "]", CTy /* separator */ = ',');
};
template<typename CTy>
struct filler
{
CTy value[4];
GLM_FUNC_DECL explicit filler(CTy /* fill */ = ' ', CTy /* space */ = ' ', CTy /* newline */ = '\n', CTy /* firstline */ = '\n');
};
struct order
{
order_type value;
GLM_FUNC_DECL explicit order(order_type);
GLM_FUNC_DECL explicit order(order_type = column_major);
};
// functions, inlined (inline)
@ -157,6 +166,11 @@ namespace glm
template<typename FTy, typename CTy, typename CTr>
std::basic_ios<CTy,CTr>& unformatted(std::basic_ios<CTy,CTr>&);
template<typename FTy, typename CTy, typename CTr>
std::basic_ios<CTy,CTr>& reset(std::basic_ios<CTy,CTr>&);
template<typename FTy, typename CTy, typename CTr>
std::basic_ios<CTy,CTr>& compressed(std::basic_ios<CTy,CTr>&);
template<typename CTy, typename CTr>
std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, precision const&);
template<typename CTy, typename CTr>
@ -164,6 +178,8 @@ namespace glm
template<typename CTy, typename CTr>
std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, delimeter<CTy> const&);
template<typename CTy, typename CTr>
std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, filler<CTy> const&);
template<typename CTy, typename CTr>
std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>&, order const&);
}//namespace io

78
glm/gtx/io.inl
View file

@ -21,12 +21,14 @@ namespace io
: std::locale::facet(a)
, formatted(true)
, precision(3)
, width(1 + 4 + 1 + precision)
, width(4 + 1 + precision)
, separator(',')
, delim_left('[')
, delim_right(']')
, fill(' ')
, space(' ')
, newline('\n')
, firstline('\n')
, order(column_major)
{}
@ -39,8 +41,10 @@ namespace io
, separator(a.separator)
, delim_left(a.delim_left)
, delim_right(a.delim_right)
, fill(a.fill)
, space(a.space)
, newline(a.newline)
, firstline(a.firstline)
, order(a.order)
{}
@ -95,6 +99,16 @@ namespace io
value[2] = c;
}
template<typename CTy>
GLM_FUNC_QUALIFIER filler<CTy>::filler(CTy a, CTy b, CTy c, CTy d)
: value()
{
value[0] = a;
value[1] = b;
value[2] = c;
value[3] = d;
}
GLM_FUNC_QUALIFIER order::order(order_type a)
: value(a)
{}
@ -102,6 +116,7 @@ namespace io
template<typename FTy, typename CTy, typename CTr>
GLM_FUNC_QUALIFIER FTy const& get_facet(std::basic_ios<CTy, CTr>& ios)
{
// Destruction handled by locale (0 passed as default argument in the constructor)
if(!std::has_facet<FTy>(ios.getloc()))
ios.imbue(std::locale(ios.getloc(), new FTy));
@ -122,6 +137,44 @@ namespace io
return ios;
}
template<typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ios<CTy, CTr>& reset(std::basic_ios<CTy, CTr>& ios)
{
// could leverage on the default constructor, but requires additional memory allocation
//ios.imbue(std::locale(ios.getloc(), new format_punct<CTy>));
//return ios;
format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)));
fmt.formatted = true;
fmt.precision = 3;
fmt.width = 4 + 1 + fmt.precision;
fmt.separator = ',';
fmt.delim_left = '[';
fmt.delim_right = ']';
fmt.fill = ' ';
fmt.space = ' ';
fmt.newline = '\n';
fmt.firstline = '\n';
fmt.order = column_major;
return ios;
}
template<typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ios<CTy, CTr>& compressed(std::basic_ios<CTy, CTr>& ios)
{
format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(ios)));
fmt.formatted = true;
fmt.width = 0;
//fmt.space = ' ';
fmt.newline = ',';
fmt.firstline = '\0';
return ios;
}
template<typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, precision const& a)
{
@ -148,6 +201,19 @@ namespace io
return os;
}
template<typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, filler<CTy> const& a)
{
format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)));
fmt.fill = a.value[0];
fmt.space = a.value[1];
fmt.newline = a.value[2];
fmt.firstline = a.value[3];
return os;
}
template<typename CTy, typename CTr>
GLM_FUNC_QUALIFIER std::basic_ostream<CTy, CTr>& operator<<(std::basic_ostream<CTy, CTr>& os, order const& a)
{
@ -174,13 +240,13 @@ namespace detail
{
io::basic_state_saver<CTy> const bss(os);
os << std::fixed << std::right << std::setprecision(static_cast<std::streamsize>(fmt.precision)) << std::setfill(fmt.space) << fmt.delim_left;
os << std::fixed << std::right << std::setprecision(static_cast<std::streamsize>(fmt.precision)) << std::setfill(fmt.fill) << fmt.delim_left;
for(length_t i(0); i < components; ++i)
{
os << std::setw(static_cast<int>(fmt.width)) << a[i];
if(components-1 != i)
os << fmt.separator;
os << fmt.separator << fmt.space;
}
os << fmt.delim_right;
@ -247,7 +313,8 @@ namespace detail
if(fmt.formatted)
{
os << fmt.newline << fmt.delim_left;
if (fmt.firstline != '\0') os << fmt.firstline;
os << fmt.delim_left;
switch(fmt.order)
{
@ -390,7 +457,8 @@ namespace detail
if(fmt.formatted)
{
os << fmt.newline << fmt.delim_left;
if (fmt.firstline != '\0') os << fmt.firstline;
os << fmt.delim_left;
switch(fmt.order)
{