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

gpu,internal/ops: decode scene commands directly, not through quads

Browse Source 
We're about to let clip.Path use more of the compute renderer features
(lines, cubic béziers). This change prepares the gpu package for reading
one of several commands types, not just the quadratic béziers of before.

The old Quad type is still the basis for the stroking algorithms, but
this change moves it into package gpu which is the only user.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-03-11 13:47:33 +01:00
parent 07572387e3
commit eb9bf60b09
7 changed files with 116 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gpu/stroke.go
+9 -9
View File
@@ -27,7 +27,7 @@ import (
"math"
"gioui.org/f32"
"gioui.org/internal/ops"
"gioui.org/internal/scene"
"gioui.org/op"
"gioui.org/op/clip"
)
@@ -43,7 +43,7 @@ const strokeTolerance = 0.01
type strokeQuad struct {
contour uint32
quad ops.Quad
quad quadSegment
}
type strokeState struct {
@@ -74,7 +74,7 @@ func (qs *strokeQuads) closed() bool {
func (qs *strokeQuads) lineTo(pt f32.Point) {
end := qs.pen()
*qs = append(*qs, strokeQuad{
quad: ops.Quad{
quad: quadSegment{
From: end,
Ctrl: end.Add(pt).Mul(0.5),
To: pt,
@@ -94,9 +94,9 @@ func (qs *strokeQuads) arc(f1, f2 f32.Point, angle float32) {
end := len(o.Data())
raw := o.Data()[beg:end]
for qi := 0; len(raw) >= (ops.QuadSize + 4); qi++ {
quad := ops.DecodeQuad(raw[4:])
raw = raw[ops.QuadSize+4:]
for qi := 0; len(raw) >= (scene.CommandSize + 4); qi++ {
quad := decodeQuad(raw[4:])
raw = raw[scene.CommandSize+4:]
*qs = append(*qs, strokeQuad{
quad: quad,
})
@@ -240,7 +240,7 @@ func (qs *strokeQuads) close() {
}
*qs = append(*qs, strokeQuad{
quad: ops.Quad{
quad: quadSegment{
From: p0,
Ctrl: p0.Add(p1).Mul(0.5),
To: p1,
@@ -293,7 +293,7 @@ func (qs strokeQuads) append(ps strokeQuads) strokeQuads {
p1 := ps[0].quad.From
if p0 != p1 && lenPt(p0.Sub(p1)) < strokeTolerance {
qs = append(qs, strokeQuad{
quad: ops.Quad{
quad: quadSegment{
From: p0,
Ctrl: p0.Add(p1).Mul(0.5),
To: p1,
@@ -477,7 +477,7 @@ func (qs *strokeQuads) addLine(p0, ctrl, p1 f32.Point, t, d float32) {
*qs = append(*qs,
strokeQuad{
quad: ops.Quad{
quad: quadSegment{
From: p0,
Ctrl: p0.Add(p1).Mul(0.5),
To: p1,