github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-11 14:22:31 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.uppdev

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6082 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-05-19 15:44:02 +00:00
parent 0ad63be48d
commit 76e8fa040a
4 changed files with 34 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
uppdev/Glyph/FDrawText.cpp
View file

@ -1,5 +1,7 @@
#include "glyph.h"
#define LTIMING(x) // RTIMING(x)
struct sMakeGlyph : public ImageMaker
{
int chr;
@ -17,8 +19,10 @@ struct sMakeGlyph : public ImageMaker
}
virtual Image Make() const {
RTIMING("Render glyph");
return RenderGlyph(font, chr, color, angle);
LTIMING("Render glyph");
Point at(font[chr], font.GetLineHeight());
int n = 2 * (at.x + at.y);
return AutoCrop(RenderGlyph(at, angle, chr, font, color, Size(n, n)), RGBAZero());
}
};
@ -27,18 +31,18 @@ void FDraw::DrawTextOp(int x, int y, int angle, const wchar *text, Font font, Co
sMakeGlyph g;
g.font = font;
g.color = ink;
g.angle = angle; // TODO!
g.angle = angle;
for(int i = 0; i < n; i++) {
g.chr = text[i];
RTIMING("Paint glyph");
LTIMING("Paint glyph");
if(font.GetHeight() > 200) {
Size sz(font[g.chr], font.GetLineHeight());
int w = 2 * (sz.cx + sz.cy);
Size bandsz(w, 32);
for(int yy = 0; yy < w; yy += bandsz.cy) {
Image m = RenderGlyph(font, g.chr, ink, angle, bandsz, Point(0, -yy));
if(yy & 1)
SysDrawImageOp(x - (sz.cx + sz.cy), y + yy - (sz.cx + sz.cy), m, m.GetSize(), Null);
Point at(font[g.chr], font.GetLineHeight());
int n = at.x + at.y;
Size bandsz(2 * n, 32);
for(int yy = 0; yy < n; yy += bandsz.cy) {
Image m = RenderGlyph(Point(0, -yy), angle, g.chr, font, ink, bandsz);
DDUMP(m.GetSize());
SysDrawImageOp(x, y + yy, m, m.GetSize(), Null);
}
}
else {