From 44c9fb7448abfa7a12e1e547e269fe8618b0bec6 Mon Sep 17 00:00:00 2001
From: Andy Balholm <andy@balholm.com>
Date: Fri, 4 Feb 2022 15:22:05 -0800
Subject: [PATCH] internal/stroke: don't draw round join if angle is NaN

References: https://todo.sr.ht/~eliasnaur/gio/331
Signed-off-by: Andy Balholm <andy@balholm.com>
---
 gpu/internal/rendertest/clip_test.go          |  26 ++++++++++++++++++
 .../refs/TestStrokedPathBalloon.png           | Bin 0 -> 1977 bytes
 internal/stroke/stroke.go                     |   8 ++++--
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 gpu/internal/rendertest/refs/TestStrokedPathBalloon.png

diff --git a/gpu/internal/rendertest/clip_test.go b/gpu/internal/rendertest/clip_test.go
index 4275a7cf..3a147312 100644
--- a/gpu/internal/rendertest/clip_test.go
+++ b/gpu/internal/rendertest/clip_test.go
@@ -207,6 +207,32 @@ func TestStrokedPathCoincidentControlPoint(t *testing.T) {
 	})
 }
 
+func TestStrokedPathBalloon(t *testing.T) {
+	run(t, func(o *op.Ops) {
+		// This shape is based on the one drawn by the Bubble function in
+		// github.com/llgcode/draw2d/samples/geometry/geometry.go.
+		p := new(clip.Path)
+		p.Begin(o)
+		p.MoveTo(f32.Pt(42.69375, 10.5))
+		p.CubeTo(f32.Pt(42.69375, 10.5), f32.Pt(14.85, 10.5), f32.Pt(14.85, 31.5))
+		p.CubeTo(f32.Pt(14.85, 31.5), f32.Pt(14.85, 52.5), f32.Pt(28.771875, 52.5))
+		p.CubeTo(f32.Pt(28.771875, 52.5), f32.Pt(28.771875, 63.7), f32.Pt(17.634375, 66.5))
+		p.CubeTo(f32.Pt(17.634375, 66.5), f32.Pt(34.340626, 63.7), f32.Pt(37.125, 52.5))
+		p.CubeTo(f32.Pt(37.125, 52.5), f32.Pt(70.5375, 52.5), f32.Pt(70.5375, 31.5))
+		p.CubeTo(f32.Pt(70.5375, 31.5), f32.Pt(70.5375, 10.5), f32.Pt(42.69375, 10.5))
+		cl := clip.Stroke{
+			Path:  p.End(),
+			Width: 2.83,
+		}.Op().Push(o)
+		paint.Fill(o, black)
+		cl.Pop()
+	}, func(r result) {
+		r.expect(0, 0, transparent)
+		r.expect(70, 52, colornames.Black)
+		r.expect(70, 90, transparent)
+	})
+}
+
 func TestPathReuse(t *testing.T) {
 	run(t, func(o *op.Ops) {
 		var path clip.Path
diff --git a/gpu/internal/rendertest/refs/TestStrokedPathBalloon.png b/gpu/internal/rendertest/refs/TestStrokedPathBalloon.png
new file mode 100644
index 0000000000000000000000000000000000000000..a9a57b28ebb26dd6331071820e07c7d09cefa9c0
GIT binary patch
literal 1977
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

literal 0
HcmV?d00001

diff --git a/internal/stroke/stroke.go b/internal/stroke/stroke.go
index 47db6cad..741e56a1 100644
--- a/internal/stroke/stroke.go
+++ b/internal/stroke/stroke.go
@@ -510,14 +510,18 @@ func strokePathRoundJoin(rhs, lhs *StrokeQuads, hw float32, pivot, n0, n1 f32.Po
 		// Path bends to the right, ie. CW (or 180 degree turn).
 		c := pivot.Sub(lhs.pen())
 		angle := -math.Acos(float64(cosPt(n0, n1)))
-		lhs.arc(c, c, float32(angle))
+		if !math.IsNaN(angle) {
+			lhs.arc(c, c, float32(angle))
+		}
 		lhs.lineTo(lp) // Add a line to accommodate for rounding errors.
 		rhs.lineTo(rp)
 	default:
 		// Path bends to the left, ie. CCW.
 		angle := math.Acos(float64(cosPt(n0, n1)))
 		c := pivot.Sub(rhs.pen())
-		rhs.arc(c, c, float32(angle))
+		if !math.IsNaN(angle) {
+			rhs.arc(c, c, float32(angle))
+		}
 		rhs.lineTo(rp) // Add a line to accommodate for rounding errors.
 		lhs.lineTo(lp)
 	}