#39 - adds SceneWithCamera; zoom works

brotherhood-of-recursive-descent · Apr 23, 2023 · 82833c2 · 82833c2
1 parent 99f759f
commit 82833c2
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 67 deletions.
diff --git a/app/camera/main.go b/app/camera/main.go
@@ -7,31 +7,38 @@ import (
 	"github.com/co0p/tankism/game/ecs/components"
 	"github.com/co0p/tankism/game/ecs/systems"
 	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/hajimehoshi/ebiten/v2/inpututil"
+	camera "github.com/melonfunction/ebiten-camera"
 )
 
 type CameraDemo struct {
-	game.GameScene
+	game.GameSceneWithCamera
 	game *game.Game
+
+	cameraComponent *components.Camera
 }
 
 func (s *CameraDemo) Init() error {
 
+	w, h := s.game.WindowSize()
+	s.Camera = *camera.NewCamera(w, h, 0, 0, 0, 1)
+	s.cameraComponent = &components.Camera{Zoom: 1}
+
 	s.Systems = append(s.Systems,
 		&systems.SpriteRenderer{EntityManager: &s.EntityManager},
 		&systems.Controller{EntityManager: &s.EntityManager},
 		&systems.MovementSystem{EntityManager: &s.EntityManager},
-
-		systems.NewCameraSystem(&s.EntityManager, s.game.ScreenWidth, s.game.ScreenHeight),
 		&systems.TextRenderer{EntityManager: &s.EntityManager},
 		&systems.PerformanceMonitor{EntityManager: &s.EntityManager},
+		systems.NewCameraSystem(&s.EntityManager, &s.Camera),
 	)
 
 	fps := s.EntityManager.NewEntity()
 	game.FPSCounter(fps, 1024)
 
 	tank := s.EntityManager.NewEntity()
 	game.NewTankWithPosition(tank, 400, 400)
-	tank.AddComponent(&components.Camera{})
+	tank.AddComponent(s.cameraComponent)
 
 	barrel := s.EntityManager.NewEntity()
 	game.NewDrum(barrel, 100, 100)
@@ -48,6 +55,20 @@ func (s *CameraDemo) Init() error {
 	return nil
 }
 
+func (s *CameraDemo) HandleInput() {
+	if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonLeft) {
+		s.cameraComponent.Zoom += 0.01
+	}
+
+	if inpututil.IsMouseButtonJustPressed(ebiten.MouseButtonRight) {
+		s.cameraComponent.Zoom -= 0.01
+	}
+
+	if inpututil.IsKeyJustPressed(ebiten.KeySpace) {
+		s.cameraComponent.Zoom = 1
+	}
+}
+
 func main() {
 
 	game := game.NewGame()

diff --git a/game/ecs/components/camera.go b/game/ecs/components/camera.go
@@ -2,13 +2,20 @@ package components
 
 import (
 	"github.com/co0p/tankism/lib/ecs"
-	"github.com/co0p/tankism/lib/vector"
 )
 
 const CameraType = "Camera"
 
+type CameraMode int
+
+const (
+	CameraModeDefault = iota
+	CameraModeCenter
+)
+
 type Camera struct {
-	Point vector.Vec2d
+	CameraMode CameraMode
+	Zoom       float64
 }
 
 func (t Camera) Type() ecs.ComponentType {

diff --git a/game/ecs/systems/cameraSystem.go b/game/ecs/systems/cameraSystem.go
@@ -2,92 +2,48 @@ package systems
 
 import (
 	"errors"
-	"fmt"
-	"log"
 
 	"github.com/co0p/tankism/game/ecs/components"
-	"github.com/co0p/tankism/lib"
 	"github.com/co0p/tankism/lib/ecs"
 	"github.com/hajimehoshi/ebiten/v2"
-	"github.com/hajimehoshi/ebiten/v2/ebitenutil"
+	camera "github.com/melonfunction/ebiten-camera"
 )
 
 type CameraSystem struct {
 	EntityManager *ecs.EntityManager
-	surface       *ebiten.Image
+	camera        *camera.Camera
 }
 
-func NewCameraSystem(em *ecs.EntityManager, w, h int) *CameraSystem {
+func NewCameraSystem(em *ecs.EntityManager, cam *camera.Camera) *CameraSystem {
 
 	return &CameraSystem{
 		EntityManager: em,
-		surface:       ebiten.NewImage(w, h),
+		camera:        cam,
 	}
 }
 
-func (s *CameraSystem) Draw(screen *ebiten.Image) {
-
-	if s.surface == nil {
-		panic("CameraSystem not initialized, use NewCameraSystem()")
-	}
-
-	entities := s.EntityManager.FindByComponents(components.CameraType, components.TransformType)
-
-	if len(entities) != 1 {
-		log.Fatalf("expected exactly 1 entity with camera attached")
-		return
-	}
-
-	camera := entities[0].GetComponent(components.CameraType).(*components.Camera)
-
-	_, h := lib.WidthHeight(screen)
-	x, y := camera.Point.XY()
-
-	s.surface.Clear()
-	op := &ebiten.DrawImageOptions{}
-	op.GeoM.Translate(x, y)
-	s.surface.DrawImage(screen, op)
-
-	screen.DrawImage(s.surface, &ebiten.DrawImageOptions{})
-	ebitenutil.DebugPrintAt(screen, fmt.Sprintf("x:%v, y:%v", x, y), 100, h-100)
-}
+func (s *CameraSystem) Draw(screen *ebiten.Image) {}
 
 func (s *CameraSystem) Update() error {
 
 	entities := s.EntityManager.FindByComponents(components.TransformType, components.CameraType)
 
-	if len(entities) == 0 {
-		return nil
-	}
-
-	if len(entities) > 1 {
-		return errors.New("expected max of 1 entity with camera attached")
+	if len(entities) != 1 {
+		return errors.New("expected exactly 1 entity with camera attached")
 	}
 
-	camera := entities[0].GetComponent(components.CameraType).(*components.Camera)
+	cameraComponent := entities[0].GetComponent(components.CameraType).(*components.Camera)
+	transformComponent := entities[0].GetComponent(components.TransformType).(*components.Transform)
 
-	// world coordinates
-	transformTarget := entities[0].GetComponent(components.TransformType).(*components.Transform)
+	x, y := transformComponent.Point.XY()
 
-	// bounce checks for map, ignore for now
-	// target x < view width / 2
-	// do not adjust camera x
+	s.camera.SetZoom(cameraComponent.Zoom)
 
-	// target x + view width / 2 > view width
-	// do not adjust camera x
-
-	// target y < view height / 2
-	// do not adjust camera y
-
-	// target y + view height / 2 > view height
-	// do not adjust camera y
-
-	// avoid race condition when view has not been initialized by first update call
-	if s.surface == nil {
-		return nil
+	switch cameraComponent.CameraMode {
+	case components.CameraModeDefault:
+	case components.CameraModeCenter:
 	}
-
-	camera.Point = transformTarget.Point
+	s.camera.SetPosition(x, y)
 
 	return nil
 }
diff --git a/game/game.go b/game/game.go
@@ -53,8 +53,8 @@ func (g *Game) Update() error {
 
 	// lazy initialization
 	if !g.initialized {
-		for _, i := range g.scenes {
-			if err := i.Init(); err != nil {
+		for _, scene := range g.scenes {
+			if err := scene.Init(); err != nil {
 				return err
 			}
 		}

diff --git a/game/sceneWithCamera.go b/game/sceneWithCamera.go
@@ -0,0 +1,41 @@
+package game
+
+import (
+	"github.com/co0p/tankism/lib/ecs"
+	"github.com/hajimehoshi/ebiten/v2"
+	camera "github.com/melonfunction/ebiten-camera"
+)
+
+type GameSceneWithCamera struct {
+	Systems       []ecs.System
+	EntityManager ecs.EntityManager
+	Camera        camera.Camera // TODO move to own camera wrapping this
+
+	game Game
+}
+
+func (s *GameSceneWithCamera) Init() error {
+	return nil
+}
+
+func (s *GameSceneWithCamera) Draw(screen *ebiten.Image) {
+
+	s.Camera.Surface.Clear()
+
+	for _, v := range s.Systems {
+		v.Draw(s.Camera.Surface)
+	}
+
+	s.Camera.Blit(screen)
+
+}
+
+func (s *GameSceneWithCamera) Update() error {
+	var err error
+	for _, v := range s.Systems {
+		err = v.Update()
+	}
+	return err
+}
+
+func (s *GameSceneWithCamera) HandleInput() {}
diff --git a/go.mod b/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/ebitengine/purego v0.3.0 // indirect
 	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect
 	github.com/jezek/xgb v1.1.0 // indirect
+	github.com/melonfunction/ebiten-camera v0.0.0-20220812153034-695003d18a6d
 	golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect
 	golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c // indirect
 	golang.org/x/sync v0.1.0 // indirect

diff --git a/go.sum b/go.sum
@@ -1,41 +1,78 @@
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/ebitengine/purego v0.3.0 h1:BDv9pD98k6AuGNQf3IF41dDppGBOe0F4AofvhFtBXF4=
 github.com/ebitengine/purego v0.3.0/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
+github.com/hajimehoshi/bitmapfont/v2 v2.1.3/go.mod h1:2BnYrkTQGThpr/CY6LorYtt/zEPNzvE/ND69CRTaHMs=
 github.com/hajimehoshi/bitmapfont/v2 v2.2.3 h1:jmq/TMNj352V062Tr5e3hAoipkoxCbY1JWTzor0zNps=
+github.com/hajimehoshi/ebiten/v2 v2.1.6/go.mod h1:jySpxHAruK+OxqSiU5+ga2OGvlQCIRNlKhDZTIyn9po=
 github.com/hajimehoshi/ebiten/v2 v2.5.2 h1:/NPHsq2EdZ/4yRT6p+I8OHzXgWePl8NYgkg8P3VVdnQ=
 github.com/hajimehoshi/ebiten/v2 v2.5.2/go.mod h1:mnHSOVysTr/nUZrN1lBTRqhK4NG+T9NR3JsJP2rCppk=
+github.com/hajimehoshi/file2byteslice v0.0.0-20200812174855-0e5e8a80490e/go.mod h1:CqqAHp7Dk/AqQiwuhV1yT2334qbA/tFWQW0MD2dGqUE=
+github.com/hajimehoshi/go-mp3 v0.3.2/go.mod h1:qMJj/CSDxx6CGHiZeCgbiq2DSUkbK0UbtXShQcnfyMM=
+github.com/hajimehoshi/oto v0.6.1/go.mod h1:0QXGEkbuJRohbJaxr7ZQSxnju7hEhseiPx2hrh6raOI=
+github.com/hajimehoshi/oto v0.7.1/go.mod h1:wovJ8WWMfFKvP587mhHgot/MBr4DnNy9m6EepeVGnos=
+github.com/jakecoffman/cp v1.1.0/go.mod h1:JjY/Fp6d8E1CHnu74gWNnU0+b9VzEdUVPoJxg2PsTQg=
 github.com/jezek/xgb v1.1.0 h1:wnpxJzP1+rkbGclEkmwpVFQWpuE2PUGNUzP8SbfFobk=
 github.com/jezek/xgb v1.1.0/go.mod h1:nrhwO0FX/enq75I7Y7G8iN1ubpSGZEiA3v9e9GyRFlk=
+github.com/jfreymuth/oggvorbis v1.0.3/go.mod h1:1U4pqWmghcoVsCJJ4fRBKv9peUJMBHixthRlBeD6uII=
+github.com/jfreymuth/vorbis v1.0.2/go.mod h1:DoftRo4AznKnShRl1GxiTFCseHr4zR9BN3TWXyuzrqQ=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/melonfunction/ebiten-camera v0.0.0-20220812153034-695003d18a6d h1:/jJYQGezuhtsXVnaq9HRL9JmhGPw0hPu64fDr/11itY=
+github.com/melonfunction/ebiten-camera v0.0.0-20220812153034-695003d18a6d/go.mod h1:WPLEOO2CeE4zL83xPQM0zD1o8cZ3VSUtG5JEYXvQFT4=
+github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 h1:estk1glOnSVeJ9tdEZZc5mAMDZk5lNJNyJ6DvrBkTEU=
 golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190703141733-d6a02ce849c9/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4=
 golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190415191353-3e0bab5405d6/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mobile v0.0.0-20210220033013-bdb1ca9a1e08/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
 golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c h1:Gk61ECugwEHL6IiyyNLXNzmu8XslmRP2dS0xjIYhbb4=
 golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190429190828-d89cdac9e872/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210415045647-66c3f260301c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -54,6 +91,11 @@ golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=