Deps: Use original golang/geo master (now has ConvexHullQuery)

Author: markus-wa

Gopkg.lock

@@ -30,9 +30,8 @@
   version = "1.0.0"
 
 [[constraint]]
-  branch = "convex-hull"
+  branch = "master"
   name = "github.com/golang/geo"
-  source = "github.com/markus-wa/geo"
 
 [[constraint]]
   name = "github.com/markus-wa/gobitread"

Gopkg.toml

@@ -214,8 +214,24 @@ func (inf Inferno) Active() Inferno {
 	return res
 }
 
-// ConvexHull returns the convex hull of all the fires in the inferno.
-func (inf Inferno) ConvexHull() *s2.Loop {
+// ConvexHull2D returns the 2D convex hull of all the fires in the inferno.
+// Useful for drawing on 2D maps.
+func (inf Inferno) ConvexHull2D() *s2.Loop {
+	q := s2.NewConvexHullQuery()
+	for i := range inf.Fires {
+		q.AddPoint(s2.Point{
+			Vector: r3.Vector{
+				X: inf.Fires[i].Vector.X,
+				Y: inf.Fires[i].Vector.Y,
+				Z: 1,
+			},
+		})
+	}
+	return q.ConvexHull()
+}
+
+// ConvexHull3D returns the 3D convex hull of all the fires in the inferno.
+func (inf Inferno) ConvexHull3D() *s2.Loop {
 	q := s2.NewConvexHullQuery()
 	for i := range inf.Fires {
 		q.AddPoint(s2.Point{Vector: inf.Fires[i].Vector})

common/structs.go

@@ -57,10 +57,17 @@ func main() {
 
 	p.RegisterEventHandler(func(e events.NadeProjectileDestroyedEvent) {
 		id := e.Projectile.UniqueID()
+
+		// Sometimes the thrower is nil, in that case we want the team to be unassigned (which is the default value)
+		var team common.Team
+		if e.Projectile.Thrower != nil {
+			team = e.Projectile.Thrower.Team
+		}
+
 		if nadeTrajectories[id] == nil {
 			nadeTrajectories[id] = &nadePath{
 				wep:  e.Projectile.Weapon,
-				team: e.Projectile.Thrower.Team,
+				team: team,
 			}
 		}
 
@@ -131,7 +138,7 @@ func drawInfernos(gc *draw2dimg.GraphicContext, infernos []*common.Inferno) {
 	// Calculate hulls
 	hulls := make([]*s2.Loop, len(infernos))
 	for i := range infernos {
-		hulls[i] = infernos[i].ConvexHull()
+		hulls[i] = infernos[i].ConvexHull2D()
 	}
 
 	for _, hull := range hulls {