From 6a71f07d1221454f9d0651c797dba0be023c0fb5 Mon Sep 17 00:00:00 2001 From: "Alex R. Delp" Date: Sat, 9 May 2020 12:43:38 -0700 Subject: [PATCH 1/6] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index f8f5fd8..5118169 100644 --- a/README.md +++ b/README.md @@ -172,10 +172,6 @@ better result. Take a look at [CONTRIBUTING.md](CONTRIBUTING.md) for further information. -For any kind of discussion, feel free to use our -[Gitter](https://gitter.im/pixellib/Lobby) -community. - ## License [MIT](LICENSE) From d2d1f03c32421f241a2b30ae87afb23feb12085d Mon Sep 17 00:00:00 2001 From: "Alex R. Delp" Date: Sat, 9 May 2020 12:46:09 -0700 Subject: [PATCH 2/6] Add a clarifying comment in imdraw push --- imdraw/imdraw.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/imdraw/imdraw.go b/imdraw/imdraw.go index e616c39..9de21c9 100644 --- a/imdraw/imdraw.go +++ b/imdraw/imdraw.go @@ -128,7 +128,9 @@ func (imd *IMDraw) Draw(t pixel.Target) { // Push adds some points to the IM queue. All Pushed points will have the same properties except for // the position. func (imd *IMDraw) Push(pts ...pixel.Vec) { + //Assert that Color is of type pixel.RGBA, if _, ok := imd.Color.(pixel.RGBA); !ok { + //otherwise cast it imd.Color = pixel.ToRGBA(imd.Color) } opts := point{ From 8792d4436c3725964ef097acda9c32cb54ce8dec Mon Sep 17 00:00:00 2001 From: Ben Cragg Date: Sun, 10 May 2020 14:13:46 +0100 Subject: [PATCH 3/6] Adding vert and horz tests --- geometry_test.go | 72 ++++++++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 27 deletions(-) diff --git a/geometry_test.go b/geometry_test.go index e3af737..91cf81e 100644 --- a/geometry_test.go +++ b/geometry_test.go @@ -1002,6 +1002,18 @@ func TestLine_Closest(t *testing.T) { args: args{v: pixel.V(20, 20)}, want: pixel.V(10, 10), }, + { + name: "Vertical line", + fields: fields{A: pixel.V(0, -10), B: pixel.V(0, 10)}, + args: args{v: pixel.V(-1, 0)}, + want: pixel.V(0, 0), + }, + { + name: "Horizontal line", + fields: fields{A: pixel.V(-10, 0), B: pixel.V(10, 0)}, + args: args{v: pixel.V(0, -1)}, + want: pixel.V(0, 0), + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -1267,36 +1279,42 @@ func TestLine_IntersectRect(t *testing.T) { args args want pixel.Vec }{ + //{ + // name: "Line through rect vertically", + // fields: fields{A: pixel.V(0, 0), B: pixel.V(0, 10)}, + // args: args{r: pixel.R(-1, 1, 5, 5)}, + // want: pixel.V(-1, 0), + //}, + //{ + // name: "Line through rect horizontally", + // fields: fields{A: pixel.V(0, 1), B: pixel.V(10, 1)}, + // args: args{r: pixel.R(1, 0, 5, 5)}, + // want: pixel.V(0, -1), + //}, + //{ + // name: "Line through rect diagonally bottom and left edges", + // fields: fields{A: pixel.V(0, 0), B: pixel.V(10, 10)}, + // args: args{r: pixel.R(0, 2, 3, 3)}, + // want: pixel.V(-1, 1), + //}, + //{ + // name: "Line through rect diagonally top and right edges", + // fields: fields{A: pixel.V(10, 0), B: pixel.V(0, 10)}, + // args: args{r: pixel.R(5, 0, 8, 3)}, + // want: pixel.V(-2.5, -2.5), + //}, + //{ + // name: "Line with not rect intersect", + // fields: fields{A: pixel.V(0, 0), B: pixel.V(10, 10)}, + // args: args{r: pixel.R(20, 20, 21, 21)}, + // want: pixel.ZV, + //}, { - name: "Line through rect vertically", - fields: fields{A: pixel.V(0, 0), B: pixel.V(0, 10)}, - args: args{r: pixel.R(-1, 1, 5, 5)}, + name: "Line intersects at 0,0", + fields: fields{A: pixel.V(0, -10), B: pixel.V(0, 10)}, + args: args{r: pixel.R(-1, 0, 2, 2)}, want: pixel.V(-1, 0), }, - { - name: "Line through rect horizontally", - fields: fields{A: pixel.V(0, 1), B: pixel.V(10, 1)}, - args: args{r: pixel.R(1, 0, 5, 5)}, - want: pixel.V(0, -1), - }, - { - name: "Line through rect diagonally bottom and left edges", - fields: fields{A: pixel.V(0, 0), B: pixel.V(10, 10)}, - args: args{r: pixel.R(0, 2, 3, 3)}, - want: pixel.V(-1, 1), - }, - { - name: "Line through rect diagonally top and right edges", - fields: fields{A: pixel.V(10, 0), B: pixel.V(0, 10)}, - args: args{r: pixel.R(5, 0, 8, 3)}, - want: pixel.V(-2.5, -2.5), - }, - { - name: "Line with not rect intersect", - fields: fields{A: pixel.V(0, 0), B: pixel.V(10, 10)}, - args: args{r: pixel.R(20, 20, 21, 21)}, - want: pixel.ZV, - }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { From 76534cb8d07813b9f5528ad621423d982b5f2c28 Mon Sep 17 00:00:00 2001 From: Ben Cragg Date: Sun, 10 May 2020 14:24:07 +0100 Subject: [PATCH 4/6] Removing commented out tests --- geometry_test.go | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/geometry_test.go b/geometry_test.go index 91cf81e..da63314 100644 --- a/geometry_test.go +++ b/geometry_test.go @@ -1279,36 +1279,36 @@ func TestLine_IntersectRect(t *testing.T) { args args want pixel.Vec }{ - //{ - // name: "Line through rect vertically", - // fields: fields{A: pixel.V(0, 0), B: pixel.V(0, 10)}, - // args: args{r: pixel.R(-1, 1, 5, 5)}, - // want: pixel.V(-1, 0), - //}, - //{ - // name: "Line through rect horizontally", - // fields: fields{A: pixel.V(0, 1), B: pixel.V(10, 1)}, - // args: args{r: pixel.R(1, 0, 5, 5)}, - // want: pixel.V(0, -1), - //}, - //{ - // name: "Line through rect diagonally bottom and left edges", - // fields: fields{A: pixel.V(0, 0), B: pixel.V(10, 10)}, - // args: args{r: pixel.R(0, 2, 3, 3)}, - // want: pixel.V(-1, 1), - //}, - //{ - // name: "Line through rect diagonally top and right edges", - // fields: fields{A: pixel.V(10, 0), B: pixel.V(0, 10)}, - // args: args{r: pixel.R(5, 0, 8, 3)}, - // want: pixel.V(-2.5, -2.5), - //}, - //{ - // name: "Line with not rect intersect", - // fields: fields{A: pixel.V(0, 0), B: pixel.V(10, 10)}, - // args: args{r: pixel.R(20, 20, 21, 21)}, - // want: pixel.ZV, - //}, + { + name: "Line through rect vertically", + fields: fields{A: pixel.V(0, 0), B: pixel.V(0, 10)}, + args: args{r: pixel.R(-1, 1, 5, 5)}, + want: pixel.V(-1, 0), + }, + { + name: "Line through rect horizontally", + fields: fields{A: pixel.V(0, 1), B: pixel.V(10, 1)}, + args: args{r: pixel.R(1, 0, 5, 5)}, + want: pixel.V(0, -1), + }, + { + name: "Line through rect diagonally bottom and left edges", + fields: fields{A: pixel.V(0, 0), B: pixel.V(10, 10)}, + args: args{r: pixel.R(0, 2, 3, 3)}, + want: pixel.V(-1, 1), + }, + { + name: "Line through rect diagonally top and right edges", + fields: fields{A: pixel.V(10, 0), B: pixel.V(0, 10)}, + args: args{r: pixel.R(5, 0, 8, 3)}, + want: pixel.V(-2.5, -2.5), + }, + { + name: "Line with not rect intersect", + fields: fields{A: pixel.V(0, 0), B: pixel.V(10, 10)}, + args: args{r: pixel.R(20, 20, 21, 21)}, + want: pixel.ZV, + }, { name: "Line intersects at 0,0", fields: fields{A: pixel.V(0, -10), B: pixel.V(0, 10)}, From 5254b4eb62ae6f24f2635314c141fb5e73636900 Mon Sep 17 00:00:00 2001 From: Ben Cragg Date: Sun, 10 May 2020 14:25:05 +0100 Subject: [PATCH 5/6] Fixing 0,0 being legit closest point --- geometry.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/geometry.go b/geometry.go index 2d902dc..a98b78c 100644 --- a/geometry.go +++ b/geometry.go @@ -406,12 +406,12 @@ func (l Line) IntersectRect(r Rect) Vec { // - the point is contained by the rectangle // - the point is not the corner itself corners := r.Vertices() - closest := ZV + var closest *Vec closestCorner := corners[0] for _, c := range corners { cc := l.Closest(c) - if closest == ZV || (closest.Len() > cc.Len() && r.Contains(cc)) { - closest = cc + if closest == nil || (closest.Len() > cc.Len() && r.Contains(cc)) { + closest = &cc closestCorner = c } } From 6b712453243e2ff071d64ebcc97cd476c7d20fce Mon Sep 17 00:00:00 2001 From: Ben Cragg Date: Sun, 10 May 2020 14:34:10 +0100 Subject: [PATCH 6/6] Updated change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ed4ade..e3232c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] - Gamepad API? +- Fixed Line intersects failing on lines passing through (0, 0) ## [v0.10.0-alpha] 2020-05-08 - Upgrade to GLFW 3.3! :tada: