archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: remove redundant Y bounds calculation for text on path

Browse Source 
Also correct some comments.
This commit is contained in:
Campbell Barton
2020-09-03 12:26:46 +10:00
parent 99c3ac17f2
commit 7ff7a9c8fd
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/font.c
View File

@@ -1244,7 +1244,7 @@ static bool vfont_to_curve(Object *ob,
if (cu->textoncurve->runtime.curve_cache != NULL &&
cu->textoncurve->runtime.curve_cache->path != NULL) {
float distfac, imat[4][4], imat3[3][3], cmat[3][3];
float minx, maxx, miny, maxy;
float minx, maxx;
float timeofs, sizefac;
if (ob != NULL) {
@@ -1259,32 +1259,25 @@ static bool vfont_to_curve(Object *ob,
mul_m3_m3m3(cmat, cmat, imat3);
sizefac = normalize_v3(cmat[0]) / font_size;
minx = miny = 1.0e20f;
maxx = maxy = -1.0e20f;
ct = chartransdata;
for (i = 0; i <= slen; i++, ct++) {
minx = maxx = ct->xof;
for (i = 1; i <= slen; i++, ct++) {
if (minx > ct->xof) {
minx = ct->xof;
}
if (maxx < ct->xof) {
maxx = ct->xof;
}
if (miny > ct->yof) {
miny = ct->yof;
}
if (maxy < ct->yof) {
maxy = ct->yof;
}
}
/* we put the x-coordinaat exact at the curve, the y is rotated */
/* We put the x-coordinate exact at the curve, the y is rotated. */
/* length correction */
distfac = sizefac * cu->textoncurve->runtime.curve_cache->path->totdist / (maxx - minx);
timeofs = 0.0f;
if (distfac > 1.0f) {
/* path longer than text: spacemode involves */
/* Path longer than text: space-mode is involved. */
distfac = 1.0f / distfac;
if (cu->spacemode == CU_ALIGN_X_RIGHT) {
@@ -1310,7 +1303,7 @@ static bool vfont_to_curve(Object *ob,
float ctime, dtime, vec[4], tvec[4], rotvec[3];
float si, co;
/* rotate around center character */
/* Rotate around center character. */
info = &custrinfo[i];
ascii = mem[i];
if (info->flag & CU_CHINFO_SMALLCAPS_CHECK) {