X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.h;h=c49b167a844945d3a55cab385e9bbb5fa7c2f502;hb=8f888fddb056e4af2437a8996b8294112509bc31;hp=db58b2462621aad9dcd0e66db32baa7195d1ae36;hpb=d2d5b4c4dedf90a42dd2baff8334318b1d000f64;p=libs%2Fgltk.git diff --git a/source/text.h b/source/text.h index db58b24..c49b167 100644 --- a/source/text.h +++ b/source/text.h @@ -3,6 +3,7 @@ #include #include +#include "state.h" namespace Msp { namespace GLtk { @@ -53,15 +54,15 @@ public: unsigned coords_to_offset(unsigned, unsigned) const; Geometry coords_to_geometry(const Part &, const Geometry &, unsigned, unsigned, unsigned) const; - void build(const Part &, const Geometry &, PartCache &) const; - void build(const Part &, const Geometry &, unsigned, PartCache &) const; + void build(const Part &, State, const Geometry &, PartCache &) const; + void build(const Part &, State, const Geometry &, unsigned, PartCache &) const; Text &operator=(const std::string &); private: void find_lines(); - template - void process_lines(const Part &, const Geometry &, unsigned, T &) const; + template + void process_lines(const Part &, const Geometry &, unsigned, void (Text::*)(unsigned, const Geometry &, T &) const, T &) const; void build_line(unsigned, const Geometry &, RenderData &) const; void coords_to_geom_line(unsigned, const Geometry &, CoordsToGeomData &) const;