joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-03 08:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal/stroke: tiny optimization to approxCubeTo

Browse Source 
Signed-off-by: Egon Elbre <egonelbre@gmail.com>
This commit is contained in:
Egon Elbre
2023-06-27 11:08:02 +03:00
committed by Elias Naur
parent b183774063
commit 0edc00a721
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/stroke/stroke.go
+6 -5
View File
@@ -677,13 +677,14 @@ func SplitCubic(from, ctrl0, ctrl1, to f32.Point, quads []QuadSegment) []QuadSeg
if h := hull.Dy(); h > l { if h := hull.Dy(); h > l {
l = h l = h
} }
approxCubeTo(&quads, 0, l*0.001, from, ctrl0, ctrl1, to) maxDist := l * 0.001
approxCubeTo(&quads, 0, maxDist*maxDist, from, ctrl0, ctrl1, to)
return quads return quads
} }
// approxCubeTo approximates a cubic Bézier by a series of quadratic // approxCubeTo approximates a cubic Bézier by a series of quadratic
// curves. // curves.
func approxCubeTo(quads *[]QuadSegment, splits int, maxDist float32, from, ctrl0, ctrl1, to f32.Point) int { func approxCubeTo(quads *[]QuadSegment, splits int, maxDistSq float32, from, ctrl0, ctrl1, to f32.Point) int {
// The idea is from // The idea is from
// https://caffeineowl.com/graphics/2d/vectorial/cubic2quad01.html // https://caffeineowl.com/graphics/2d/vectorial/cubic2quad01.html
// where a quadratic approximates a cubic by eliminating its t³ term // where a quadratic approximates a cubic by eliminating its t³ term
@@ -722,7 +723,7 @@ func approxCubeTo(quads *[]QuadSegment, splits int, maxDist float32, from, ctrl0
// To save a square root, compare d² with the squared tolerance. // To save a square root, compare d² with the squared tolerance.
v := to.Sub(ctrl1.Mul(3)).Add(ctrl0.Mul(3)).Sub(from) v := to.Sub(ctrl1.Mul(3)).Add(ctrl0.Mul(3)).Sub(from)
d2 := (v.X*v.X + v.Y*v.Y) * 3 / (36 * 36) d2 := (v.X*v.X + v.Y*v.Y) * 3 / (36 * 36)
if d2 <= maxDist*maxDist { if d2 <= maxDistSq {
*quads = append(*quads, QuadSegment{From: from, Ctrl: c, To: to}) *quads = append(*quads, QuadSegment{From: from, Ctrl: c, To: to})
return splits return splits
} }
@@ -735,7 +736,7 @@ func approxCubeTo(quads *[]QuadSegment, splits int, maxDist float32, from, ctrl0
c12 := c1.Add(c2.Sub(c1).Mul(t)) c12 := c1.Add(c2.Sub(c1).Mul(t))
c0112 := c01.Add(c12.Sub(c01).Mul(t)) c0112 := c01.Add(c12.Sub(c01).Mul(t))
splits++ splits++
splits = approxCubeTo(quads, splits, maxDist, from, c0, c01, c0112) splits = approxCubeTo(quads, splits, maxDistSq, from, c0, c01, c0112)
splits = approxCubeTo(quads, splits, maxDist, c0112, c12, c2, to) splits = approxCubeTo(quads, splits, maxDistSq, c0112, c12, c2, to)
return splits return splits
} }