|
@@ -1291,7 +1291,7 @@ static struct NVGvertex* nvg__bevelJoin(struct NVGvertex* dst, struct NVGpoint* |
|
|
{ |
|
|
{ |
|
|
float rx0,ry0,rx1,ry1; |
|
|
float rx0,ry0,rx1,ry1; |
|
|
float lx0,ly0,lx1,ly1; |
|
|
float lx0,ly0,lx1,ly1; |
|
|
float mx,my,len,mu; |
|
|
|
|
|
|
|
|
float mx,my,len; |
|
|
float dlx0 = p0->dy; |
|
|
float dlx0 = p0->dy; |
|
|
float dly0 = -p0->dx; |
|
|
float dly0 = -p0->dx; |
|
|
float dlx1 = p1->dy; |
|
|
float dlx1 = p1->dy; |
|
@@ -1309,7 +1309,6 @@ static struct NVGvertex* nvg__bevelJoin(struct NVGvertex* dst, struct NVGpoint* |
|
|
mx = (dlx0 + dlx1) * 0.5f; |
|
|
mx = (dlx0 + dlx1) * 0.5f; |
|
|
my = (dly0 + dly1) * 0.5f; |
|
|
my = (dly0 + dly1) * 0.5f; |
|
|
len = sqrtf(mx*mx + my*my); |
|
|
len = sqrtf(mx*mx + my*my); |
|
|
mu = ru + len*(lu-ru)*0.5f; |
|
|
|
|
|
|
|
|
|
|
|
nvg__vset(dst, lx0, ly0, lu,1); dst++; |
|
|
nvg__vset(dst, lx0, ly0, lu,1); dst++; |
|
|
nvg__vset(dst, p1->x - dlx0*rw, p1->y - dly0*rw, ru,1); dst++; |
|
|
nvg__vset(dst, p1->x - dlx0*rw, p1->y - dly0*rw, ru,1); dst++; |
|
@@ -1344,7 +1343,6 @@ static struct NVGvertex* nvg__bevelJoin(struct NVGvertex* dst, struct NVGpoint* |
|
|
mx = (dlx0 + dlx1) * 0.5f; |
|
|
mx = (dlx0 + dlx1) * 0.5f; |
|
|
my = (dly0 + dly1) * 0.5f; |
|
|
my = (dly0 + dly1) * 0.5f; |
|
|
len = sqrtf(mx*mx + my*my); |
|
|
len = sqrtf(mx*mx + my*my); |
|
|
mu = lu + len*(ru-lu)*0.5f; |
|
|
|
|
|
|
|
|
|
|
|
nvg__vset(dst, p1->x + dlx0*lw, p1->y + dly0*lw, lu,1); dst++; |
|
|
nvg__vset(dst, p1->x + dlx0*lw, p1->y + dly0*lw, lu,1); dst++; |
|
|
nvg__vset(dst, rx0, ry0, ru,1); dst++; |
|
|
nvg__vset(dst, rx0, ry0, ru,1); dst++; |
|
|