|
@@ -7,8 +7,8 @@ import (
|
|
|
|
|
|
|
|
|
type Point struct {
|
|
|
- X int64
|
|
|
- Y int64
|
|
|
+ X int
|
|
|
+ Y int
|
|
|
}
|
|
|
|
|
|
|
|
@@ -17,7 +17,7 @@ func NewPoint() *Point {
|
|
|
}
|
|
|
|
|
|
|
|
|
-func AsPoint(to ...int64) *Point {
|
|
|
+func AsPoint(to ...int) *Point {
|
|
|
var p *Point = &Point{}
|
|
|
if len(to) == 1 {
|
|
|
p.X = to[0]
|
|
@@ -30,7 +30,7 @@ func AsPoint(to ...int64) *Point {
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (p *Point) Set(to ...int64) *Point {
|
|
|
+func (p *Point) Set(to ...int) *Point {
|
|
|
if len(to) == 1 {
|
|
|
p.X = to[0]
|
|
|
p.Y = to[0]
|
|
@@ -49,7 +49,7 @@ func (p *Point) SetTo(o *Point) *Point {
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (p *Point) Move(by ...int64) *Point {
|
|
|
+func (p *Point) Move(by ...int) *Point {
|
|
|
if len(by) == 1 {
|
|
|
p.X += by[0]
|
|
|
p.Y += by[0]
|
|
@@ -108,17 +108,17 @@ func (p *Point) IsZero() bool {
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (p *Point) IsX(x int64) bool {
|
|
|
+func (p *Point) IsX(x int) bool {
|
|
|
return p.X == x
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (p *Point) IsY(y int64) bool {
|
|
|
+func (p *Point) IsY(y int) bool {
|
|
|
return p.Y == y
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (p *Point) Equal(to ...int64) bool {
|
|
|
+func (p *Point) Equal(to ...int) bool {
|
|
|
if len(to) == 1 {
|
|
|
return p.X == to[0] && p.Y == to[0]
|
|
|
} else if len(to) >= 2 {
|
|
@@ -133,7 +133,7 @@ func (p *Point) EqualTo(o *Point) bool {
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (p *Point) Less(than ...int64) bool {
|
|
|
+func (p *Point) Less(than ...int) bool {
|
|
|
if len(than) == 1 {
|
|
|
return p.X <= than[0] && p.Y <= than[0]
|
|
|
} else if len(than) >= 2 {
|
|
@@ -148,7 +148,7 @@ func (p *Point) LessThan(o *Point) bool {
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (p *Point) Greater(than ...int64) bool {
|
|
|
+func (p *Point) Greater(than ...int) bool {
|
|
|
if len(than) == 1 {
|
|
|
return p.X >= than[0] && p.Y >= than[0]
|
|
|
} else if len(than) >= 2 {
|
|
@@ -180,7 +180,7 @@ func (p *Point) Within(topLeft, botRight *Point) bool {
|
|
|
}
|
|
|
|
|
|
|
|
|
-func (p *Point) Distance(x, y int64) int {
|
|
|
+func (p *Point) Distance(x, y int) int {
|
|
|
a := float64(p.X - x)
|
|
|
b := float64(p.Y - y)
|
|
|
return int(math.Max(math.Abs(a), math.Abs(b)))
|