-#include <msp/gl/immediate.h>
#include <msp/gl/matrix.h>
+#include <msp/gl/meshbuilder.h>
#include <msp/gl/texture2d.h>
+#include "partcache.h"
#include "style.h"
#include "text.h"
return data.result;
}
-void Text::render(const Part &part, const Geometry &parent, unsigned first_row) const
+void Text::build(const Part &part, const Geometry &parent, CachedPart &cache) const
+{
+ build(part, parent, 0, cache);
+}
+
+void Text::build(const Part &part, const Geometry &parent, unsigned first_row, CachedPart &cache) const
{
if(!style || lines.empty())
+ {
+ cache.texture = 0;
return;
+ }
+
+ cache.clear_mesh();
+ GL::MeshBuilder bld(*cache.mesh);
const GL::Font &font = style->get_font();
- const GL::Color &color = style->get_font_color();
- GL::Immediate imm((GL::COLOR4_UBYTE, GL::TEXCOORD2, GL::VERTEX2));
- imm.color(color.r, color.g, color.b);
+ bld.color(style->get_font_color());
RenderData data;
- data.bld = &imm;
+ data.bld = &bld;
- GL::Bind bind_tex(font.get_texture());
+ cache.texture = &font.get_texture();
- process_lines<RenderData, &Text::render_line>(part, parent, first_row, data);
+ process_lines<RenderData, &Text::build_line>(part, parent, first_row, data);
}
Text &Text::operator=(const string &t)
int y_offset = static_cast<int>(-font.get_descent()*font_size);
const Sides &margin = part.get_margin();
- unsigned n_lines = min(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
- first_row = min(first_row, lines.size()-n_lines);
+ unsigned n_lines = min<unsigned>(lines.size(), max((parent.h-margin.top-margin.bottom)/line_spacing, 1U));
+ first_row = min<unsigned>(first_row, lines.size()-n_lines);
for(unsigned i=0; i<n_lines; ++i)
{
}
}
-void Text::render_line(unsigned i, const Geometry &rgeom, RenderData &data) const
+void Text::build_line(unsigned i, const Geometry &rgeom, RenderData &data) const
{
const Line &line = lines[i];
- GL::PushMatrix _pushm;
- GL::translate(rgeom.x, rgeom.y, 0);
- GL::scale_uniform(style->get_font_size());
+ GL::MatrixStack::Push _pushm(data.bld->matrix());
+ data.bld->matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+ data.bld->matrix() *= GL::Matrix::scaling(style->get_font_size());
style->get_font().build_string(text.substr(line.start, line.length), *data.bld);
}