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

Privatise Atlas functions that should only be internal

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-11 20:34:30 +01:00
parent de3c2b9134
commit 8cd7b06c0c
2 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

27
pkg/game/atlas.go
View file

@ -91,12 +91,12 @@ func (a *Atlas) SpawnWalls() error {
// SetTile sets an individual tile's kind // SetTile sets an individual tile's kind
func (a *Atlas) SetTile(v vector.Vector, tile Tile) error { func (a *Atlas) SetTile(v vector.Vector, tile Tile) error {
chunk := a.ToChunk(v) chunk := a.toChunk(v)
if chunk >= len(a.Chunks) { if chunk >= len(a.Chunks) {
return fmt.Errorf("location outside of allocated atlas") return fmt.Errorf("location outside of allocated atlas")
} }
local := a.ToChunkLocal(v) local := a.toChunkLocal(v)
tileId := local.X + local.Y*a.ChunkSize tileId := local.X + local.Y*a.ChunkSize
if tileId >= len(a.Chunks[chunk].Tiles) { if tileId >= len(a.Chunks[chunk].Tiles) {
return fmt.Errorf("location outside of allocated chunk") return fmt.Errorf("location outside of allocated chunk")
@ -107,12 +107,12 @@ func (a *Atlas) SetTile(v vector.Vector, tile Tile) error {
// GetTile will return an individual tile // GetTile will return an individual tile
func (a *Atlas) GetTile(v vector.Vector) (Tile, error) { func (a *Atlas) GetTile(v vector.Vector) (Tile, error) {
chunk := a.ToChunk(v) chunk := a.toChunk(v)
if chunk >= len(a.Chunks) { if chunk >= len(a.Chunks) {
return 0, fmt.Errorf("location outside of allocated atlas") return 0, fmt.Errorf("location outside of allocated atlas")
} }
local := a.ToChunkLocal(v) local := a.toChunkLocal(v)
tileId := local.X + local.Y*a.ChunkSize tileId := local.X + local.Y*a.ChunkSize
if tileId >= len(a.Chunks[chunk].Tiles) { if tileId >= len(a.Chunks[chunk].Tiles) {
return 0, fmt.Errorf("location outside of allocated chunk") return 0, fmt.Errorf("location outside of allocated chunk")
@ -121,19 +121,14 @@ func (a *Atlas) GetTile(v vector.Vector) (Tile, error) {
return a.Chunks[chunk].Tiles[tileId], nil return a.Chunks[chunk].Tiles[tileId], nil
} }
// ToChunkLocal gets a chunk local coordinate for a tile // toChunkLocal gets a chunk local coordinate for a tile
func (a *Atlas) ToChunkLocal(v vector.Vector) vector.Vector { func (a *Atlas) toChunkLocal(v vector.Vector) vector.Vector {
return vector.Vector{X: maths.Pmod(v.X, a.ChunkSize), Y: maths.Pmod(v.Y, a.ChunkSize)} return vector.Vector{X: maths.Pmod(v.X, a.ChunkSize), Y: maths.Pmod(v.Y, a.ChunkSize)}
} }
// GetChunkLocal gets a chunk local coordinate for a tile
func (a *Atlas) ToWorld(local vector.Vector, chunk int) vector.Vector {
return a.ChunkOrigin(chunk).Added(local)
}
// GetChunkID gets the chunk ID for a position in the world // GetChunkID gets the chunk ID for a position in the world
func (a *Atlas) ToChunk(v vector.Vector) int { func (a *Atlas) toChunk(v vector.Vector) int {
local := a.ToChunkLocal(v) local := a.toChunkLocal(v)
// Get the chunk origin itself // Get the chunk origin itself
origin := v.Added(local.Negated()) origin := v.Added(local.Negated())
// Divided it by the number of chunks // Divided it by the number of chunks
@ -144,8 +139,8 @@ func (a *Atlas) ToChunk(v vector.Vector) int {
return (a.Size * origin.Y) + origin.X return (a.Size * origin.Y) + origin.X
} }
// ChunkOrigin gets the chunk origin for a given chunk index // chunkOrigin gets the chunk origin for a given chunk index
func (a *Atlas) ChunkOrigin(chunk int) vector.Vector { func (a *Atlas) chunkOrigin(chunk int) vector.Vector {
v := vector.Vector{ v := vector.Vector{
X: maths.Pmod(chunk, a.Size) - (a.Size / 2), X: maths.Pmod(chunk, a.Size) - (a.Size / 2),
Y: (chunk / a.Size) - (a.Size / 2), Y: (chunk / a.Size) - (a.Size / 2),
@ -185,7 +180,7 @@ func (a *Atlas) Grow(size int) error {
// Copy old chunks into new chunks // Copy old chunks into new chunks
for index, chunk := range a.Chunks { for index, chunk := range a.Chunks {
// Calculate the new chunk location and copy over the data // Calculate the new chunk location and copy over the data
newAtlas.Chunks[newAtlas.ToChunk(a.ChunkOrigin(index))] = chunk newAtlas.Chunks[newAtlas.toChunk(a.chunkOrigin(index))] = chunk
} }
// Copy the new atlas data into this one // Copy the new atlas data into this one

26
pkg/game/atlas_test.go
View file

@ -23,19 +23,19 @@ func TestAtlas_NewAtlas(t *testing.T) {
assert.Equal(t, 16, len(a.Chunks)) assert.Equal(t, 16, len(a.Chunks))
} }
func TestAtlas_ToChunk(t *testing.T) { func TestAtlas_toChunk(t *testing.T) {
a := NewAtlas(2, 1) a := NewAtlas(2, 1)
assert.NotNil(t, a) assert.NotNil(t, a)
// Tiles should look like: 2 | 3 // Tiles should look like: 2 | 3
// ----- // -----
// 0 | 1 // 0 | 1
tile := a.ToChunk(vector.Vector{X: 0, Y: 0}) tile := a.toChunk(vector.Vector{X: 0, Y: 0})
assert.Equal(t, 3, tile) assert.Equal(t, 3, tile)
tile = a.ToChunk(vector.Vector{X: 0, Y: -1}) tile = a.toChunk(vector.Vector{X: 0, Y: -1})
assert.Equal(t, 1, tile) assert.Equal(t, 1, tile)
tile = a.ToChunk(vector.Vector{X: -1, Y: -1}) tile = a.toChunk(vector.Vector{X: -1, Y: -1})
assert.Equal(t, 0, tile) assert.Equal(t, 0, tile)
tile = a.ToChunk(vector.Vector{X: -1, Y: 0}) tile = a.toChunk(vector.Vector{X: -1, Y: 0})
assert.Equal(t, 2, tile) assert.Equal(t, 2, tile)
a = NewAtlas(2, 2) a = NewAtlas(2, 2)
@ -44,13 +44,13 @@ func TestAtlas_ToChunk(t *testing.T) {
// 2 | 3 // 2 | 3
// ----- // -----
// 0 | 1 // 0 | 1
tile = a.ToChunk(vector.Vector{X: 1, Y: 1}) tile = a.toChunk(vector.Vector{X: 1, Y: 1})
assert.Equal(t, 3, tile) assert.Equal(t, 3, tile)
tile = a.ToChunk(vector.Vector{X: 1, Y: -2}) tile = a.toChunk(vector.Vector{X: 1, Y: -2})
assert.Equal(t, 1, tile) assert.Equal(t, 1, tile)
tile = a.ToChunk(vector.Vector{X: -2, Y: -2}) tile = a.toChunk(vector.Vector{X: -2, Y: -2})
assert.Equal(t, 0, tile) assert.Equal(t, 0, tile)
tile = a.ToChunk(vector.Vector{X: -2, Y: 1}) tile = a.toChunk(vector.Vector{X: -2, Y: 1})
assert.Equal(t, 2, tile) assert.Equal(t, 2, tile)
a = NewAtlas(4, 2) a = NewAtlas(4, 2)
@ -63,13 +63,13 @@ func TestAtlas_ToChunk(t *testing.T) {
// 4 | 5 || 6 | 7 // 4 | 5 || 6 | 7
// ---------------- // ----------------
// 0 | 1 || 2 | 3 // 0 | 1 || 2 | 3
tile = a.ToChunk(vector.Vector{X: 1, Y: 3}) tile = a.toChunk(vector.Vector{X: 1, Y: 3})
assert.Equal(t, 14, tile) assert.Equal(t, 14, tile)
tile = a.ToChunk(vector.Vector{X: 1, Y: -3}) tile = a.toChunk(vector.Vector{X: 1, Y: -3})
assert.Equal(t, 2, tile) assert.Equal(t, 2, tile)
tile = a.ToChunk(vector.Vector{X: -1, Y: -1}) tile = a.toChunk(vector.Vector{X: -1, Y: -1})
assert.Equal(t, 5, tile) assert.Equal(t, 5, tile)
tile = a.ToChunk(vector.Vector{X: -2, Y: 2}) tile = a.toChunk(vector.Vector{X: -2, Y: 2})
assert.Equal(t, 13, tile) assert.Equal(t, 13, tile)
} }