zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve builtin vector font positioning. 

First, a larger origin offset is applied in ssglWriteText. This moves
the text so that it doesn't overlap the workplane boundary.

Second, a different offset is applied in ssglWriteTextRefCenter.
After this, the middle stroke of "E" is vertically aligned with
the reference point, and the overall label is horizontally aligned
with the reference point more precisely.
pull/4/head
whitequark 2016-04-16 01:47:57 +00:00
parent bcb484e941
commit 0128b86796
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/glhelper.cpp
View File

@ -78,9 +78,8 @@ void ssglWriteTextRefCenter(const std::string &str, double h, Vector t, Vector u
t = t.Plus(u.ScaledBy(-fw/2)); t = t.Plus(u.ScaledBy(-fw/2));
t = t.Plus(v.ScaledBy(-fh/2)); t = t.Plus(v.ScaledBy(-fh/2));
// Undo the (+5, +5) offset that ssglWriteText applies. // Apply additional offset to get an exact center alignment.
t = t.Plus(u.ScaledBy(-5*scale)); t = t.Plus(v.ScaledBy(-18*scale));
t = t.Plus(v.ScaledBy(-5*scale));
ssglWriteText(str, h, t, u, v, fn, fndata); ssglWriteText(str, h, t, u, v, fn, fndata);
} }
@ -153,7 +152,7 @@ void ssglWriteText(const std::string &str, double h, Vector t, Vector u, Vector
v = v.WithMagnitude(1); v = v.WithMagnitude(1);
double scale = FONT_SCALE(h) / SS.GW.scale; double scale = FONT_SCALE(h) / SS.GW.scale;
Vector o = { 5.0, 5.0 }; Vector o = { 15.0, 15.0 };
for(char32_t chr : ReadUTF8(str)) { for(char32_t chr : ReadUTF8(str)) {
const VectorGlyph &glyph = GetVectorGlyph(chr); const VectorGlyph &glyph = GetVectorGlyph(chr);
o.x += ssglDrawCharacter(glyph, t, o, u, v, scale, fn, fndata); o.x += ssglDrawCharacter(glyph, t, o, u, v, scale, fn, fndata);