X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=1d7a7930dc4bc58c695e8d2082fb5895e9598f66;hb=8d09cdc5e642af9a2e1210ce708790c5b41cb585;hp=0b582c5e8b6c0eb47b64784eef13fb3182161971;hpb=4ab33a06c9f8a85b193d7db8bc6ee9b8895aab09;p=libs%2Fgltk.git

diff --git a/source/text.cpp b/source/text.cpp
index 0b582c5..1d7a793 100644
--- a/source/text.cpp
+++ b/source/text.cpp
@@ -1,6 +1,7 @@
-#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"
 
@@ -65,6 +66,13 @@ unsigned Text::get_height() const
 	return line_height+(lines.size()-1)*line_spacing;
 }
 
+void Text::autosize(const Part &part, Geometry &geom) const
+{
+	const Sides &margin = part.get_margin();
+	geom.w = max(geom.w, get_width()+margin.left+margin.right);
+	geom.h = max(geom.h, get_height()+margin.top+margin.bottom);
+}
+
 void Text::set(const string &t)
 {
 	text = t;
@@ -152,27 +160,29 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi
 	data.row = row;
 	data.col = col;
 
-	process_lines<CoordsToGeomData, &Text::coords_to_geom_line>(part, parent, first_row, data);
+	process_lines(part, parent, first_row, &Text::coords_to_geom_line, data);
 
 	return data.result;
 }
 
-void Text::render(const Part &part, const Geometry &parent, unsigned first_row) const
+void Text::build(const Part &part, State state, const Geometry &parent, PartCache &cache) const
+{
+	build(part, state, parent, 0, cache);
+}
+
+void Text::build(const Part &part, State state, const Geometry &parent, unsigned first_row, PartCache &cache) const
 {
 	if(!style || lines.empty())
 		return;
 
 	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);
+	GL::MeshBuilder bld(cache.create_mesh(part, font.get_texture()));
+	bld.color(style->get_font_color(state));
 
 	RenderData data;
-	data.bld = &imm;
-
-	GL::Bind bind_tex(font.get_texture());
+	data.bld = &bld;
 
-	process_lines<RenderData, &Text::render_line>(part, parent, first_row, data);
+	process_lines(part, parent, first_row, &Text::build_line, data);
 }
 
 Text &Text::operator=(const string &t)
@@ -207,8 +217,8 @@ void Text::find_lines()
 	}
 }
 
-template<typename T, void (Text::*func)(unsigned, const Geometry &, T &) const>
-void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, T &data) const
+template<typename T>
+void Text::process_lines(const Part &part, const Geometry &parent, unsigned first_row, void (Text::*func)(unsigned, const Geometry &, T &) const, T &data) const
 {
 	if(!style)
 		return;
@@ -221,8 +231,9 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
 	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 fit_height = parent.h-margin.top-margin.bottom+line_spacing-line_height;
+	unsigned n_lines = min<unsigned>(lines.size(), max(fit_height/line_spacing, 1U));
+	first_row = min<unsigned>(first_row, lines.size()-n_lines);
 
 	for(unsigned i=0; i<n_lines; ++i)
 	{
@@ -238,13 +249,13 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
 	}
 }
 
-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);
 }