mdiluz/rove
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor tiles to objects to be re-used

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-26 19:45:24 +01:00
parent 8b1eca0aee
commit 2846ed796e
6 changed files with 69 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkg/atlas/atlas.go
View file

@ -6,6 +6,7 @@ import (
"math/rand"
"github.com/mdiluz/rove/pkg/maths"
"github.com/mdiluz/rove/pkg/objects"
"github.com/mdiluz/rove/pkg/vector"
)
@ -44,7 +45,7 @@ func NewAtlas(size, chunkSize int) Atlas {
for i := range a.Chunks {
tiles := make([]byte, chunkSize*chunkSize)
for i := 0; i < len(tiles); i++ {
tiles[i] = TileEmpty
tiles[i] = objects.Empty
}
a.Chunks[i] = Chunk{
Tiles: tiles,
@ -62,7 +63,7 @@ func (a *Atlas) SpawnRocks() error {
for i := -extent; i < extent; i++ {
for j := -extent; j < extent; j++ {
if rand.Intn(16) == 0 {
if err := a.SetTile(vector.Vector{X: i, Y: j}, TileSmallRock); err != nil {
if err := a.SetTile(vector.Vector{X: i, Y: j}, objects.SmallRock); err != nil {
return err
}
}
@ -79,13 +80,13 @@ func (a *Atlas) SpawnWalls() error {
// Surround the atlas in walls
for i := -extent; i < extent; i++ {
if err := a.SetTile(vector.Vector{X: i, Y: extent - 1}, TileLargeRock); err != nil { // N
if err := a.SetTile(vector.Vector{X: i, Y: extent - 1}, objects.LargeRock); err != nil { // N
return err
} else if err := a.SetTile(vector.Vector{X: extent - 1, Y: i}, TileLargeRock); err != nil { // E
} else if err := a.SetTile(vector.Vector{X: extent - 1, Y: i}, objects.LargeRock); err != nil { // E
return err
} else if err := a.SetTile(vector.Vector{X: i, Y: -extent}, TileLargeRock); err != nil { // S
} else if err := a.SetTile(vector.Vector{X: i, Y: -extent}, objects.LargeRock); err != nil { // S
return err
} else if err := a.SetTile(vector.Vector{X: -extent, Y: i}, TileLargeRock); err != nil { // W
} else if err := a.SetTile(vector.Vector{X: -extent, Y: i}, objects.LargeRock); err != nil { // W
return err
}
}

9
pkg/atlas/atlas_test.go
View file

@ -3,6 +3,7 @@ package atlas
import (
"testing"
"github.com/mdiluz/rove/pkg/objects"
"github.com/mdiluz/rove/pkg/vector"
"github.com/stretchr/testify/assert"
)
@ -146,24 +147,24 @@ func TestAtlas_SpawnWorld(t *testing.T) {
for i := -4; i < 4; i++ {
tile, err := a.GetTile(vector.Vector{X: i, Y: -4})
assert.NoError(t, err)
assert.Equal(t, TileLargeRock, tile)
assert.Equal(t, objects.LargeRock, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(vector.Vector{X: -4, Y: i})
assert.NoError(t, err)
assert.Equal(t, TileLargeRock, tile)
assert.Equal(t, objects.LargeRock, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(vector.Vector{X: 3, Y: i})
assert.NoError(t, err)
assert.Equal(t, TileLargeRock, tile)
assert.Equal(t, objects.LargeRock, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(vector.Vector{X: i, Y: 3})
assert.NoError(t, err)
assert.Equal(t, TileLargeRock, tile)
assert.Equal(t, objects.LargeRock, tile)
}
}

23
pkg/atlas/tile.go
View file

@ -1,23 +0,0 @@
package atlas
const (
TileEmpty = byte(' ')
TileRover = byte('R')
TileSmallRock = byte('o')
TileLargeRock = byte('O')
)
// BlockingTiles describes any tiles that block
var BlockingTiles = [...]byte{
TileLargeRock,
}
// Check if a tile is a blocking tile
func IsBlocking(tile byte) bool {
for _, t := range BlockingTiles {
if tile == t {
return true
}
}
return false
}