X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftext.cpp;h=a0f53c238c12b88eca6df4f5b28135839163d804;hb=d2d5b4c4dedf90a42dd2baff8334318b1d000f64;hp=a4ec22668537946a6d72e4ded8c0adbfdaadfb43;hpb=11d1b67a9180a0e468b56e355fbe0c88d104ef72;p=libs%2Fgltk.git

diff --git a/source/text.cpp b/source/text.cpp
index a4ec226..a0f53c2 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"
 
@@ -38,9 +39,10 @@ void Text::set_style(const Style *s)
 
 	if(style)
 	{
+		const GL::Font &font = style->get_font();
 		float font_size = style->get_font_size();
 		for(vector<Line>::iterator i=lines.begin(); i!=lines.end(); ++i)
-			i->width = static_cast<unsigned>(style->get_font()->get_string_width(text.substr(i->start, i->length))*font_size);
+			i->width = static_cast<unsigned>(font.get_string_width(text.substr(i->start, i->length))*font_size);
 	}
 }
 
@@ -57,13 +59,20 @@ unsigned Text::get_height() const
 	if(!style)
 		return lines.size();
 
-	const GL::Font *font = style->get_font();
+	const GL::Font &font = style->get_font();
 	float font_size = style->get_font_size();
-	unsigned line_height = static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+	unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
 	unsigned line_spacing = line_height*6/5;
 	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;
@@ -156,22 +165,24 @@ Geometry Text::coords_to_geometry(const Part &part, const Geometry &parent, unsi
 	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, PartCache &cache) const
+{
+	build(part, parent, 0, cache);
+}
+
+void Text::build(const Part &part, 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);
+	const GL::Font &font = style->get_font();
+	GL::MeshBuilder bld(cache.create_mesh(part, font.get_texture()));
+	bld.color(style->get_font_color());
 
 	RenderData data;
-	data.bld = &imm;
+	data.bld = &bld;
 
-	GL::Bind bind_tex(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)
@@ -196,7 +207,7 @@ void Text::find_lines()
 		if(style)
 		{
 			string str = text.substr(line.start, line.length);
-			line.width = static_cast<unsigned>(style->get_font()->get_string_width(str)*font_size);
+			line.width = static_cast<unsigned>(style->get_font().get_string_width(str)*font_size);
 		}
 		lines.push_back(line);
 
@@ -212,16 +223,16 @@ void Text::process_lines(const Part &part, const Geometry &parent, unsigned firs
 	if(!style)
 		return;
 
-	const GL::Font *font = style->get_font();
+	const GL::Font &font = style->get_font();
 	float font_size = style->get_font_size();
-	unsigned line_height = static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+	unsigned line_height = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
 	unsigned line_spacing = static_cast<unsigned>(font_size*6/5);
 	unsigned height = line_height+(lines.size()-1)*line_spacing;
-	int y_offset = static_cast<int>(-font->get_descent()*font_size);
+	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)
 	{
@@ -237,27 +248,24 @@ 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];
-	const GL::Font *font = style->get_font();
 
-	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());
 
-	font->build_string(text.substr(line.start, line.length), *data.bld);
+	style->get_font().build_string(text.substr(line.start, line.length), *data.bld);
 }
 
 void Text::coords_to_geom_line(unsigned i, const Geometry &rgeom, CoordsToGeomData &data) const
 {
 	if(i==data.row)
 	{
-		const Line &line = lines[i];
-		const GL::Font *font = style->get_font();
-
+		float w = style->get_font().get_string_width(text.substr(lines[i].start, data.col));
 		data.result = rgeom;
-		data.result.x += static_cast<unsigned>(font->get_string_width(text.substr(line.start, data.col))*style->get_font_size());
+		data.result.x += static_cast<unsigned>(w*style->get_font_size());
 	}
 }