Animate sprite

gameobjects/player.go

@@ -7,19 +7,18 @@ import (
 )
 
 type Player struct {
-	X, Y        float64
 	PlayerVec   pixel.Vec
 	sprFrame    int
 	spriteSheet pixel.Picture
 	sprFrames   []pixel.Rect
 	sprite      *pixel.Sprite
 	speed       float64
+	dir         int
+	animation   Animate
 }
 
 func NewPlayer(win *pixelgl.Window, spriteSheet pixel.Picture) Player {
 	var p Player
-	p.X = win.Bounds().Max.X / 2
-	p.Y = win.Bounds().Max.Y / 2
 	p.PlayerVec = pixel.Vec{
 		X: win.Bounds().Max.X / 2,
 		Y: win.Bounds().Max.Y / 2,
@@ -27,7 +26,8 @@ func NewPlayer(win *pixelgl.Window, spriteSheet pixel.Picture) Player {
 	p.sprFrame = 9
 	p.spriteSheet = spriteSheet
 	p.sprFrames = createSpriteFrames(spriteSheet)
-	p.sprite = pixel.NewSprite(spriteSheet, p.sprFrames[p.sprFrame])
+	p.animation = NewAnimation(p.spriteSheet, p.sprFrames)
+	//p.sprite = pixel.NewSprite(spriteSheet, p.sprFrames[p.sprFrame])
 	p.speed = 10.0
 	return p
 }
@@ -38,28 +38,40 @@ func (p *Player) Update(win *pixelgl.Window, dt int64) {
 
 	if win.Pressed(pixelgl.KeyA) { //left
 		p.sprFrame = 6
+		p.dir = 2
 		vecX -= speed
 	}
 	if win.Pressed(pixelgl.KeyD) { //Right
 		p.sprFrame = 3
+		p.dir = 3
 		vecX += speed
 	}
 	if win.Pressed(pixelgl.KeyS) { //Down
 		p.sprFrame = 9
+		p.dir = 1
 		vecY -= speed
 	}
 	if win.Pressed(pixelgl.KeyW) { //up
 		p.sprFrame = 0
+		p.dir = 0
 		vecY += speed
 	}
-	p.sprite.Set(p.spriteSheet, p.sprFrames[p.sprFrame])
+	if vecY == 0 && vecX == 0 {
+		p.animation.Idle = true
+	} else {
+		p.animation.Idle = false
+	}
+	//p.sprite.Set(p.spriteSheet, p.sprFrames[p.sprFrame])
+	p.animation.Dir = p.dir
+	p.animation.Update(dt)
 
 	p.PlayerVec.X += vecX
 	p.PlayerVec.Y += vecY
 }
 
 func (p *Player) Render(win *pixelgl.Window) { //include batch later
-	p.sprite.Draw(win, pixel.IM.Scaled(pixel.ZV, 4).Moved(p.PlayerVec))
+	//p.sprite.Draw(win, pixel.IM.Scaled(pixel.ZV, 4).Moved(p.PlayerVec))
+	p.animation.Render(win, p.PlayerVec)
 }
 
 func createSpriteFrames(spriteSheet pixel.Picture) []pixel.Rect {