Skip to content
This repository was archived by the owner on Aug 12, 2024. It is now read-only.

Commit 1f8a536

Browse files
soypatsoypat
committed
eliminate usage of deprecated r3/r2 Vec methods
1 parent ea867bb commit 1f8a536

File tree

15 files changed

+87
-94
lines changed

15 files changed

+87
-94
lines changed

‎form2/must2/basic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (s *line) Evaluate(p r2.Vec) float64 {
8888
if p.X <= s.l {
8989
return p.Y - s.round
9090
}
91-
return r2.Norm(p.Sub(r2.Vec{s.l, 0})) - s.round
91+
return r2.Norm(r2.Sub(p, r2.Vec{s.l, 0})) - s.round
9292
}
9393

9494
// BoundingBox returns the bounding box for a 2d line.

‎form2/must2/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func ErrMsg(msg string) error {
2020

2121
func sdfBox2d(p, s r2.Vec) float64 {
2222
p = d2.AbsElem(p)
23-
d := p.Sub(s)
23+
d := r2.Sub(p, s)
2424
k := s.Y - s.X
2525
if d.X > 0 && d.Y > 0 {
2626
return r2.Norm(d) //d.Length()

‎form2/must2/poly.go

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func Polygon(vertex []r2.Vec) sdf.SDF2 {
4141
vmax := s.vertex[0]
4242

4343
for i := 0; i < nsegs; i++ {
44-
l := s.vertex[i+1].Sub(s.vertex[i])
44+
l := r2.Sub(s.vertex[i+1], s.vertex[i])
4545
s.length[i] = r2.Norm(l)
4646
s.vector[i] = r2.Unit(l)
4747
vmin = d2.MinElem(vmin, s.vertex[i])
@@ -59,17 +59,17 @@ func (s *polygon) Evaluate(p r2.Vec) float64 {
5959

6060
// iterate over the line segments
6161
nsegs := len(s.vertex) - 1
62-
pb := p.Sub(s.vertex[0])
62+
pb := r2.Sub(p, s.vertex[0])
6363

6464
for i := 0; i < nsegs; i++ {
6565
a := s.vertex[i]
6666
b := s.vertex[i+1]
6767

6868
pa := pb
69-
pb = p.Sub(b)
69+
pb = r2.Sub(p, b)
7070

71-
t := pa.Dot(s.vector[i]) // t-parameter of projection onto line
72-
dn := pa.Dot(r2.Vec{s.vector[i].Y, -s.vector[i].X}) // normal distance from p to line
71+
t := r2.Dot(pa, s.vector[i]) // t-parameter of projection onto line
72+
dn := r2.Dot(pa, r2.Vec{s.vector[i].Y, -s.vector[i].X}) // normal distance from p to line
7373

7474
// Distance to line segment
7575
if t < 0 {
@@ -230,28 +230,28 @@ func (p *PolygonBuilder) arcVertex(i int) bool {
230230
a := pv.vertex
231231
b := v.vertex
232232
// Normal to chord
233-
ba := r2.Unit(b.Sub(a)) //.Normalize()
233+
ba := r2.Unit(r2.Sub(b, a)) //.Normalize()
234234
n := r2.Scale(side, r2.Vec{ba.Y, -ba.X})
235235
// midpoint
236-
mid := r2.Scale(0.5, a.Add(b))
236+
mid := r2.Scale(0.5, r2.Add(a, b))
237237
// distance from a to midpoint
238-
dMid := r2.Norm(mid.Sub(a))
238+
dMid := r2.Norm(r2.Sub(mid, a))
239239
// distance from midpoint to center of arc
240240
dCenter := math.Sqrt((radius * radius) - (dMid * dMid))
241241
// center of arc
242-
c := mid.Add(r2.Scale(dCenter, n))
242+
c := r2.Add(mid, r2.Scale(dCenter, n))
243243
// work out the angle
244-
ac := r2.Unit(a.Sub(c))
245-
bc := r2.Unit(b.Sub(c))
246-
dtheta := -side * math.Acos(ac.Dot(bc)) / float64(v.facets)
244+
ac := r2.Unit(r2.Sub(a, c))
245+
bc := r2.Unit(r2.Sub(b, c))
246+
dtheta := -side * math.Acos(r2.Dot(ac, bc)) / float64(v.facets)
247247
// rotation matrix
248248
m := sdf.Rotate(dtheta)
249249
// radius vector
250-
rv := m.MulPosition(a.Sub(c))
250+
rv := m.MulPosition(r2.Sub(a, c))
251251
// work out the new vertices
252252
vlist := make([]polygonVertex, v.facets-1)
253253
for j := range vlist {
254-
vlist[j] = polygonVertex{vertex: c.Add(rv)}
254+
vlist[j] = polygonVertex{vertex: r2.Add(c, rv)}
255255
rv = m.MulPosition(rv)
256256
}
257257
// insert the new vertices between the arc endpoints
@@ -290,32 +290,32 @@ func (p *PolygonBuilder) smoothVertex(i int) bool {
290290
return false
291291
}
292292
// work out the angle
293-
v0 := r2.Unit(vp.vertex.Sub(v.vertex))
294-
v1 := r2.Unit(vn.vertex.Sub(v.vertex))
295-
theta := math.Acos(v0.Dot(v1))
293+
v0 := r2.Unit(r2.Sub(vp.vertex, v.vertex))
294+
v1 := r2.Unit(r2.Sub(vn.vertex, v.vertex))
295+
theta := math.Acos(r2.Dot(v0, v1))
296296
// distance from vertex to circle tangent
297297
d1 := v.radius / math.Tan(theta/2.0)
298-
if d1 > r2.Norm(vp.vertex.Sub(v.vertex)) || d1 > r2.Norm(vn.vertex.Sub(v.vertex)) {
298+
if d1 > r2.Norm(r2.Sub(vp.vertex, v.vertex)) || d1 > r2.Norm(r2.Sub(vn.vertex, v.vertex)) {
299299
// unable to smooth - radius is too large
300300
return false
301301
}
302302
// tangent points
303-
p0 := v.vertex.Add(r2.Scale(d1, v0))
303+
p0 := r2.Add(v.vertex, r2.Scale(d1, v0))
304304
// distance from vertex to circle center
305305
d2 := v.radius / math.Sin(theta/2.0)
306306
// center of circle
307-
vc := r2.Unit(v0.Add(v1))
308-
c := v.vertex.Add(r2.Scale(d2, vc))
307+
vc := r2.Unit(r2.Add(v0, v1))
308+
c := r2.Add(v.vertex, r2.Scale(d2, vc))
309309
// rotation angle
310-
dtheta := Sign(v1.Cross(v0)) * (math.Pi - theta) / float64(v.facets)
310+
dtheta := Sign(r2.Cross(v1, v0)) * (math.Pi - theta) / float64(v.facets)
311311
// rotation matrix
312312
rm := sdf.Rotate(dtheta)
313313
// radius vector
314-
rv := p0.Sub(c)
314+
rv := r2.Sub(p0, c)
315315
// work out the new points
316316
points := make([]polygonVertex, v.facets+1)
317317
for j := range points {
318-
points[j] = polygonVertex{vertex: c.Add(rv)}
318+
points[j] = polygonVertex{vertex: r2.Add(c, rv)}
319319
rv = rm.MulPosition(rv)
320320
}
321321
// replace the old point with the new points
@@ -345,7 +345,7 @@ func (p *PolygonBuilder) relToAbs() error {
345345
if pv.relative {
346346
return fmt.Errorf("relative vertex needs an absolute reference")
347347
}
348-
v.vertex = v.vertex.Add(pv.vertex)
348+
v.vertex = r2.Add(v.vertex, pv.vertex)
349349
v.relative = false
350350
}
351351
}

‎form3/must3/cylinders.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,14 @@ func Cone(height, r0, r1, round float64) *cone {
149149
s.height = (height / 2) - round
150150
s.round = round
151151
// cone slope vector and normal
152-
s.u = r2.Unit(r2.Vec{r1, height / 2}.Sub(r2.Vec{r0, -height / 2}))
152+
s.u = r2.Unit(r2.Sub(r2.Vec{r1, height / 2}, r2.Vec{r0, -height / 2}))
153153
s.n = r2.Vec{s.u.Y, -s.u.X}
154154
// inset the radii for the rounding
155155
ofs := round / s.n.X
156156
s.r0 = r0 - (1+s.n.Y)*ofs
157157
s.r1 = r1 - (1-s.n.Y)*ofs
158158
// cone slope length
159-
s.l = r2.Norm(r2.Vec{s.r1, s.height}.Sub(r2.Vec{s.r0, -s.height}))
159+
s.l = r2.Norm(r2.Sub(r2.Vec{s.r1, s.height}, r2.Vec{s.r0, -s.height}))
160160
// work out the bounding box
161161
r := math.Max(s.r0+round, s.r1+round)
162162
s.bb = r3.Box{r3.Vec{-r, -r, -height / 2}, r3.Vec{r, r, height / 2}}
@@ -176,14 +176,14 @@ func (s *cone) Evaluate(p r3.Vec) float64 {
176176
return -p2.Y - s.height - s.round
177177
}
178178
// distance to slope line
179-
v := p2.Sub(r2.Vec{s.r0, -s.height})
180-
dSlope := v.Dot(s.n)
179+
v := r2.Sub(p2, r2.Vec{s.r0, -s.height})
180+
dSlope := r2.Dot(v, s.n)
181181
// is p2 inside the cone?
182182
if dSlope < 0 && math.Abs(p2.Y) < s.height {
183183
return -math.Min(-dSlope, s.height-math.Abs(p2.Y)) - s.round
184184
}
185185
// is p2 closest to the slope line?
186-
t := v.Dot(s.u)
186+
t := r2.Dot(v, s.u)
187187
if t >= 0 && t <= s.l {
188188
return dSlope - s.round
189189
}
@@ -192,7 +192,7 @@ func (s *cone) Evaluate(p r3.Vec) float64 {
192192
return r2.Norm(v) - s.round
193193
}
194194
// p2 is closest to the top radius vertex
195-
return r2.Norm(p2.Sub(r2.Vec{s.r1, s.height})) - s.round
195+
return r2.Norm(r2.Sub(p2, r2.Vec{s.r1, s.height})) - s.round
196196
}
197197

198198
// BoundingBox return the bounding box for the trucated cone..

‎form3/must3/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
func sdfBox2d(p, s r2.Vec) float64 {
99
p = d2.AbsElem(p)
10-
d := p.Sub(s)
10+
d := r2.Sub(p, s)
1111
k := s.Y - s.X
1212
if d.X > 0 && d.Y > 0 {
1313
return r2.Norm(d) //d.Length()

‎go.mod

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,14 @@ require (
1212
)
1313

1414
require (
15-
git.sr.ht/~sbinet/gg v0.3.1 // indirect
1615
github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b // indirect
1716
github.com/dhconnelly/rtreego v1.1.0 // indirect
1817
github.com/fogleman/simplify v0.0.0-20170216171241-d32f302d5046 // indirect
19-
github.com/go-fonts/liberation v0.2.0 // indirect
20-
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 // indirect
21-
github.com/go-pdf/fpdf v0.6.0 // indirect
2218
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
2319
github.com/hschendel/stl v1.0.4 // indirect
2420
github.com/llgcode/draw2d v0.0.0-20200930101115-bfaf5d914d1e // indirect
2521
github.com/yofu/dxf v0.0.0-20190710012328-5a6d1e83f16c // indirect
2622
golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d // indirect
2723
golang.org/x/image v0.0.0-20220617043117-41969df76e82 // indirect
28-
golang.org/x/text v0.3.7 // indirect
29-
golang.org/x/tools v0.1.11 // indirect
3024
rsc.io/pdf v0.1.1 // indirect
3125
)

‎go.sum

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
22
gioui.org v0.0.0-20210308172011-57750fc8a0a6/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
3-
git.sr.ht/~sbinet/gg v0.3.1 h1:LNhjNn8DerC8f9DHLz6lS0YYul/b602DUxDgGkd/Aik=
43
git.sr.ht/~sbinet/gg v0.3.1/go.mod h1:KGYtlADtqsqANL9ueOFkWymvzUvLMQllU5Ixo+8v3pc=
54
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
65
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -29,21 +28,19 @@ github.com/fogleman/simplify v0.0.0-20170216171241-d32f302d5046/go.mod h1:KDwyDq
2928
github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
3029
github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
3130
github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
32-
github.com/go-fonts/liberation v0.2.0 h1:jAkAWJP4S+OsrPLZM4/eC9iW7CtHy+HBXrEwZXWo5VM=
3331
github.com/go-fonts/liberation v0.2.0/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
3432
github.com/go-fonts/stix v0.1.0/go.mod h1:w/c1f0ldAUlJmLBvlbkvVXLAD+tAMqobIIQpmnUIzUY=
3533
github.com/go-gl/gl v0.0.0-20180407155706-68e253793080/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
3634
github.com/go-gl/glfw v0.0.0-20180426074136-46a8d530c326/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
3735
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
3836
github.com/go-latex/latex v0.0.0-20210118124228-b3d85cf34e07/go.mod h1:CO1AlKB2CSIqUrmQPqA0gdRIlnLEY0gK5JGjh37zN5U=
39-
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81 h1:6zl3BbBhdnMkpSj2YY30qV3gDcVBGtFgVsV3+/i+mKQ=
4037
github.com/go-latex/latex v0.0.0-20210823091927-c0d11ff05a81/go.mod h1:SX0U8uGpxhq9o2S/CELCSUxEWWAuoCUcVCQWv7G2OCk=
4138
github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
42-
github.com/go-pdf/fpdf v0.6.0 h1:MlgtGIfsdMEEQJr2le6b/HNr1ZlQwxyWr77r2aj2U/8=
4339
github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
4440
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
4541
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
4642
github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
43+
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
4744
github.com/hschendel/stl v1.0.4 h1:DXT5rkiXMUkbKw4Ndi1OYZ/a5SLR35TzxGj46p5Qyf8=
4845
github.com/hschendel/stl v1.0.4/go.mod h1:XQFFLKrq9YTaBpmouDui4JSaxMyAYkpD7elGSSj/y3M=
4946
github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes=
@@ -76,11 +73,11 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
7673
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
7774
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
7875
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
76+
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
7977
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
8078
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
8179
golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
8280
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
83-
golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 h1:n9HxLrNxWWtEb1cA950nuEEj3QnKbtsCJ6KjcgisNUs=
8481
golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
8582
golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d h1:vtUKgx8dahOomfFzLREU8nSv25YHnTgLBn4rDnWZdU0=
8683
golang.org/x/exp v0.0.0-20220613132600-b0d781184e0d/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA=
@@ -96,17 +93,18 @@ golang.org/x/image v0.0.0-20210216034530-4410531fe030/go.mod h1:FeLwcggjj3mMvU+o
9693
golang.org/x/image v0.0.0-20210607152325-775e3b0c77b9/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
9794
golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
9895
golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
99-
golang.org/x/image v0.0.0-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
10096
golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
10197
golang.org/x/image v0.0.0-20220617043117-41969df76e82 h1:KpZB5pUSBvrHltNEdK/tw0xlPeD13M6M6aGP32gKqiw=
10298
golang.org/x/image v0.0.0-20220617043117-41969df76e82/go.mod h1:doUCurBvlfPMKfmIpRIywoHmhN3VyhnoFDbvIEWF4hY=
10399
golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
104100
golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
105101
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
106102
golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
103+
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
107104
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
108105
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
109106
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
107+
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
110108
golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
111109
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
112110
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -119,13 +117,13 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
119117
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
120118
golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
121119
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
120+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
122121
golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
123122
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
124123
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
125124
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
126125
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
127126
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
128-
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
129127
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
130128
golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
131129
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -134,16 +132,14 @@ golang.org/x/tools v0.0.0-20190927191325-030b2cf1153e/go.mod h1:b+2E5dAYhXwXZwtn
134132
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
135133
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
136134
golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
137-
golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY=
138-
golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
135+
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
139136
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
140137
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
141138
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
142139
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
143140
gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
144141
gonum.org/v1/gonum v0.8.2/go.mod h1:oe/vMfY3deqTw+1EZJhuvEW2iwGF1bW9wwu7XCu0+v0=
145142
gonum.org/v1/gonum v0.9.3/go.mod h1:TZumC3NeyVQskjXqmyWt4S3bINhy7B4eYwW69EbyX+0=
146-
gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E=
147143
gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=
148144
gonum.org/v1/gonum v0.11.1-0.20220625074215-67f3e1dbfccc h1:ADX7LJ8SknE89dXBcPhZGGV60cMUzqB9XcaNKuHZxy4=
149145
gonum.org/v1/gonum v0.11.1-0.20220625074215-67f3e1dbfccc/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=

‎internal/d2/box.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ type Box r2.Box
1313
// NewBox2 creates a 2d box with a given center and size.
1414
func NewBox2(center, size r2.Vec) Box {
1515
half := r2.Scale(0.5, size)
16-
return Box{center.Sub(half), center.Add(half)}
16+
return Box{r2.Sub(center, half), r2.Add(center, half)}
1717
}
1818

1919
// Equals test the equality of 2d boxes.
@@ -36,17 +36,17 @@ func (a Box) Include(v r2.Vec) Box {
3636

3737
// Translate translates a 2d box.
3838
func (a Box) Translate(v r2.Vec) Box {
39-
return Box{a.Min.Add(v), a.Max.Add(v)}
39+
return Box{r2.Add(a.Min, v), r2.Add(a.Max, v)}
4040
}
4141

4242
// Size returns the size of a 2d box.
4343
func (a Box) Size() r2.Vec {
44-
return a.Max.Sub(a.Min)
44+
return r2.Sub(a.Max, a.Min)
4545
}
4646

4747
// Center returns the center of a 2d box.
4848
func (a Box) Center() r2.Vec {
49-
return a.Min.Add(r2.Scale(0.5, a.Size()))
49+
return r2.Add(a.Min, r2.Scale(0.5, a.Size()))
5050
// return a.Min.Add(a.Size().MulScalar(0.5))
5151
}
5252

@@ -59,7 +59,7 @@ func (a Box) ScaleAboutCenter(k float64) Box {
5959
// Enlarge returns a new 2d box enlarged by a size vector.
6060
func (a Box) Enlarge(v r2.Vec) Box {
6161
v = r2.Scale(0.5, v)
62-
return Box{a.Min.Sub(v), a.Max.Add(v)}
62+
return Box{r2.Sub(a.Min, v), r2.Add(a.Max, v)}
6363
}
6464

6565
// Contains checks if the 2d box contains the given vector (considering bounds as inside).

‎internal/d2/transform.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ func (a Transform) ApplyBox(box Box) Box {
103103
yb := r2.Scale(box.Max.Y, u)
104104
xa, xb = MinElem(xa, xb), MaxElem(xa, xb)
105105
ya, yb = MinElem(ya, yb), MaxElem(ya, yb)
106-
min := xa.Add(ya).Add(t)
107-
max := xb.Add(yb).Add(t)
106+
min := r2.Add(t, r2.Add(xa, ya))
107+
max := r2.Add(t, r2.Add(xb, yb))
108108
return Box{min, max}
109109
}
110110

‎internal/d3/box.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ func (a Box) Include(v r3.Vec) Box {
4747

4848
// Translate translates a 3d box.
4949
func (a Box) Translate(v r3.Vec) Box {
50-
return Box{a.Min.Add(v), a.Max.Add(v)}
50+
return Box{r3.Add(a.Min, v), r3.Add(a.Max, v)}
5151
}
5252

5353
// Size returns the size of a 3d box.
5454
func (a Box) Size() r3.Vec {
55-
return a.Max.Sub(a.Min)
55+
return r3.Sub(a.Max, a.Min)
5656
}
5757

5858
// Center returns the center of a 3d box.

0 commit comments

Comments
 (0)