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

dedicated property for fill instead of reusing space

Browse source
This commit is contained in:
diego.mateos 2024-01-26 10:16:19 +01:00
parent dac18393fa
commit 629ab26240
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
glm/gtx/io.hpp
View file

@ -64,6 +64,7 @@ namespace glm
char_type separator;
char_type delim_left;
char_type delim_right;
char_type fill;
char_type space;
char_type newline;
order_type order;
@ -144,9 +145,9 @@ namespace glm
template<typename CTy>
struct filler
{
CTy value[2];
CTy value[3];
GLM_FUNC_DECL explicit filler(CTy /* space */ = ' ', CTy /* newline */ = '\n');
GLM_FUNC_DECL explicit filler(CTy /* fill */ = ' ', CTy /* space */ = ' ', CTy /* newline */ = '\n');
};
struct order

12
glm/gtx/io.inl
View file

@ -25,6 +25,7 @@ namespace io
, separator(',')
, delim_left('[')
, delim_right(']')
, fill(' ')
, space(' ')
, newline('\n')
, order(column_major)
@ -39,6 +40,7 @@ namespace io
, separator(a.separator)
, delim_left(a.delim_left)
, delim_right(a.delim_right)
, fill(a.fill)
, space(a.space)
, newline(a.newline)
, order(a.order)
@ -96,11 +98,12 @@ namespace io
}
template<typename CTy>
GLM_FUNC_QUALIFIER filler<CTy>::filler(CTy a, CTy b)
GLM_FUNC_QUALIFIER filler<CTy>::filler(CTy a, CTy b, CTy c)
: value()
{
value[0] = a;
value[1] = b;
value[2] = c;
}
GLM_FUNC_QUALIFIER order::order(order_type a)
@ -161,8 +164,9 @@ namespace io
{
format_punct<CTy> & fmt(const_cast<format_punct<CTy>&>(get_facet<format_punct<CTy> >(os)));
fmt.space = a.value[0];
fmt.newline = a.value[1];
fmt.fill = a.value[0];
fmt.space = a.value[1];
fmt.newline = a.value[2];
return os;
}
@ -193,7 +197,7 @@ 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)
{