From 3e3a9aaa48ee574c762470bf6792c9eab4a04bac Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 29 Jul 2017 00:35:00 +1200 Subject: [PATCH 1/2] fix operation order for rectangle resize function, add tests --- geometry.go | 4 ++-- geometry_test.go | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 geometry_test.go diff --git a/geometry.go b/geometry.go index 99514cc..52dfa73 100644 --- a/geometry.go +++ b/geometry.go @@ -236,8 +236,8 @@ func (r Rect) Resized(anchor, size Vec) Rect { } fraction := Vec{size.X / r.W(), size.Y / r.H()} return Rect{ - Min: anchor.Add(r.Min.Sub(anchor)).ScaledXY(fraction), - Max: anchor.Add(r.Max.Sub(anchor)).ScaledXY(fraction), + Min: anchor.Add(r.Min.Sub(anchor).ScaledXY(fraction)), + Max: anchor.Add(r.Max.Sub(anchor).ScaledXY(fraction)), } } diff --git a/geometry_test.go b/geometry_test.go new file mode 100644 index 0000000..4cd4464 --- /dev/null +++ b/geometry_test.go @@ -0,0 +1,31 @@ +package pixel_test + +import ( + "testing" + + "github.com/faiface/pixel" +) + +func TestResizeRect(t *testing.T) { + testCases := []pixel.Rect{ + pixel.R(-10, -10, 10, 10), + pixel.R(10, 10, 30, 30), + } + + answers := []pixel.Rect{ + pixel.R(-5, -5, 5, 5), + pixel.R(15, 15, 25, 25), + } + + for i, rect := range testCases { + answer := answers[i] + + // resize rectangle by 50% anchored at it's current center point + resizedRect := rect.Resized(rect.Center(), rect.Size().Scaled(0.5)) + + if resizedRect != answer { + t.Errorf("Rectangle resize was incorrect, got %v, want: %v.", resizedRect, answer) + } + } + +} From e3d056d36fb35bf24a3dd58a89071dc7dc91d935 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 29 Jul 2017 01:12:07 +1200 Subject: [PATCH 2/2] add more test transforms, now includes: center, origin, min, max and middle of side --- geometry_test.go | 67 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/geometry_test.go b/geometry_test.go index 4cd4464..85a21ce 100644 --- a/geometry_test.go +++ b/geometry_test.go @@ -12,13 +12,13 @@ func TestResizeRect(t *testing.T) { pixel.R(10, 10, 30, 30), } - answers := []pixel.Rect{ + resizeAroundCenterAnswers := []pixel.Rect{ pixel.R(-5, -5, 5, 5), pixel.R(15, 15, 25, 25), } for i, rect := range testCases { - answer := answers[i] + answer := resizeAroundCenterAnswers[i] // resize rectangle by 50% anchored at it's current center point resizedRect := rect.Resized(rect.Center(), rect.Size().Scaled(0.5)) @@ -28,4 +28,67 @@ func TestResizeRect(t *testing.T) { } } + resizeAroundMinAnswers := []pixel.Rect{ + pixel.R(-10, -10, 0, 0), + pixel.R(10, 10, 20, 20), + } + + for i, rect := range testCases { + answer := resizeAroundMinAnswers[i] + + // resize rectangle by 50% anchored at it's Min coordinate + resizedRect := rect.Resized(rect.Min, rect.Size().Scaled(0.5)) + + if resizedRect != answer { + t.Errorf("Rectangle resize was incorrect, got %v, want: %v.", resizedRect, answer) + } + } + + resizeAroundMaxAnswers := []pixel.Rect{ + pixel.R(0, 0, 10, 10), + pixel.R(20, 20, 30, 30), + } + + for i, rect := range testCases { + answer := resizeAroundMaxAnswers[i] + + // resize rectangle by 50% anchored at it's Max coordinate + resizedRect := rect.Resized(rect.Max, rect.Size().Scaled(0.5)) + + if resizedRect != answer { + t.Errorf("Rectangle resize was incorrect, got %v, want: %v.", resizedRect, answer) + } + } + + resizeAroundMiddleOfLeftSideAnswers := []pixel.Rect{ + pixel.R(-10, -5, 0, 5), + pixel.R(10, 15, 20, 25), + } + + for i, rect := range testCases { + answer := resizeAroundMiddleOfLeftSideAnswers[i] + + // resize rectangle by 50% anchored at the middle of it's left side + resizedRect := rect.Resized(pixel.V(rect.Min.X, rect.Center().Y), rect.Size().Scaled(0.5)) + + if resizedRect != answer { + t.Errorf("Rectangle resize was incorrect, got %v, want: %v.", resizedRect, answer) + } + } + + resizeAroundOriginAnswers := []pixel.Rect{ + pixel.R(-5, -5, 5, 5), + pixel.R(5, 5, 15, 15), + } + + for i, rect := range testCases { + answer := resizeAroundOriginAnswers[i] + + // resize rectangle by 50% anchored at the origin + resizedRect := rect.Resized(pixel.ZV, rect.Size().Scaled(0.5)) + + if resizedRect != answer { + t.Errorf("Rectangle resize was incorrect, got %v, want: %v.", resizedRect, answer) + } + } }