mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-11 19:48:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

examples/2048: Refactoring

Browse Source
This commit is contained in:
Hajime Hoshi 2016-08-01 01:23:40 +09:00
parent b3cd2000af
commit ced66ff319
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/2048/2048/board.go
View File

@ -53,8 +53,7 @@ func (b *Board) Update(input *Input) error {
} }
if 0 < len(b.tasks) { if 0 < len(b.tasks) {
t := b.tasks[0] t := b.tasks[0]
err := t() if err := t(); err == taskTerminated {
if err == taskTerminated {
b.tasks = b.tasks[1:] b.tasks = b.tasks[1:]
} else if err != nil { } else if err != nil {
return err return err
@ -103,7 +102,7 @@ func (b *Board) Move(dir Dir) error {
}) })
b.tasks = append(b.tasks, func() error { b.tasks = append(b.tasks, func() error {
for t := range b.tiles { for t := range b.tiles {
if t.isPopping() { if t.isAnimating() {
return nil return nil
} }
} }

4
examples/2048/2048/tile.go
View File

@ -70,8 +70,8 @@ func (t *Tile) IsMoving() bool {
return 0 < t.movingCount return 0 < t.movingCount
} }
func (t *Tile) isPopping() bool { func (t *Tile) isAnimating() bool {
return 0 < t.poppingCount return 0 < t.movingCount || 0 < t.startPoppingCount || 0 < t.poppingCount
} }
func tileAt(tiles map[*Tile]struct{}, x, y int) *Tile { func tileAt(tiles map[*Tile]struct{}, x, y int) *Tile {