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

Split out maths functions into maths, vector and bearing

Browse source
This commit is contained in:
Marc Di Luzio 2020-06-09 18:08:07 +01:00
parent aae668fb57
commit 51fe918090
14 changed files with 335 additions and 273 deletions
Download patch file Download diff file Expand all files Collapse all files

59
pkg/game/atlas_test.go
View file

@ -3,6 +3,7 @@ package game
import (
"testing"
"github.com/mdiluz/rove/pkg/vector"
"github.com/stretchr/testify/assert"
)
@ -28,13 +29,13 @@ func TestAtlas_ToChunk(t *testing.T) {
// Tiles should look like: 2 | 3
// -----
// 0 | 1
tile := a.ToChunk(Vector{0, 0})
tile := a.ToChunk(vector.Vector{X: 0, Y: 0})
assert.Equal(t, 3, tile)
tile = a.ToChunk(Vector{0, -1})
tile = a.ToChunk(vector.Vector{X: 0, Y: -1})
assert.Equal(t, 1, tile)
tile = a.ToChunk(Vector{-1, -1})
tile = a.ToChunk(vector.Vector{X: -1, Y: -1})
assert.Equal(t, 0, tile)
tile = a.ToChunk(Vector{-1, 0})
tile = a.ToChunk(vector.Vector{X: -1, Y: 0})
assert.Equal(t, 2, tile)
a = NewAtlas(2, 2)
@ -43,13 +44,13 @@ func TestAtlas_ToChunk(t *testing.T) {
// 2 | 3
// -----
// 0 | 1
tile = a.ToChunk(Vector{1, 1})
tile = a.ToChunk(vector.Vector{X: 1, Y: 1})
assert.Equal(t, 3, tile)
tile = a.ToChunk(Vector{1, -2})
tile = a.ToChunk(vector.Vector{X: 1, Y: -2})
assert.Equal(t, 1, tile)
tile = a.ToChunk(Vector{-2, -2})
tile = a.ToChunk(vector.Vector{X: -2, Y: -2})
assert.Equal(t, 0, tile)
tile = a.ToChunk(Vector{-2, 1})
tile = a.ToChunk(vector.Vector{X: -2, Y: 1})
assert.Equal(t, 2, tile)
a = NewAtlas(4, 2)
@ -62,13 +63,13 @@ func TestAtlas_ToChunk(t *testing.T) {
// 4 | 5 || 6 | 7
// ----------------
// 0 | 1 || 2 | 3
tile = a.ToChunk(Vector{1, 3})
tile = a.ToChunk(vector.Vector{X: 1, Y: 3})
assert.Equal(t, 14, tile)
tile = a.ToChunk(Vector{1, -3})
tile = a.ToChunk(vector.Vector{X: 1, Y: -3})
assert.Equal(t, 2, tile)
tile = a.ToChunk(Vector{-1, -1})
tile = a.ToChunk(vector.Vector{X: -1, Y: -1})
assert.Equal(t, 5, tile)
tile = a.ToChunk(Vector{-2, 2})
tile = a.ToChunk(vector.Vector{X: -2, Y: 2})
assert.Equal(t, 13, tile)
}
@ -77,14 +78,14 @@ func TestAtlas_GetSetTile(t *testing.T) {
assert.NotNil(t, a)
// Set the origin tile to 1 and test it
assert.NoError(t, a.SetTile(Vector{0, 0}, 1))
tile, err := a.GetTile(Vector{0, 0})
assert.NoError(t, a.SetTile(vector.Vector{X: 0, Y: 0}, 1))
tile, err := a.GetTile(vector.Vector{X: 0, Y: 0})
assert.NoError(t, err)
assert.Equal(t, Tile(1), tile)
// Set another tile to 1 and test it
assert.NoError(t, a.SetTile(Vector{5, -2}, 2))
tile, err = a.GetTile(Vector{5, -2})
assert.NoError(t, a.SetTile(vector.Vector{X: 5, Y: -2}, 2))
tile, err = a.GetTile(vector.Vector{X: 5, Y: -2})
assert.NoError(t, err)
assert.Equal(t, Tile(2), tile)
}
@ -96,24 +97,24 @@ func TestAtlas_Grown(t *testing.T) {
assert.Equal(t, 4, len(a.Chunks))
// Set a few tiles to values
assert.NoError(t, a.SetTile(Vector{0, 0}, 1))
assert.NoError(t, a.SetTile(Vector{-1, -1}, 2))
assert.NoError(t, a.SetTile(Vector{1, -2}, 3))
assert.NoError(t, a.SetTile(vector.Vector{X: 0, Y: 0}, 1))
assert.NoError(t, a.SetTile(vector.Vector{X: -1, Y: -1}, 2))
assert.NoError(t, a.SetTile(vector.Vector{X: 1, Y: -2}, 3))
// Grow once to just double it
err := a.Grow(4)
assert.NoError(t, err)
assert.Equal(t, 16, len(a.Chunks))
tile, err := a.GetTile(Vector{0, 0})
tile, err := a.GetTile(vector.Vector{X: 0, Y: 0})
assert.NoError(t, err)
assert.Equal(t, Tile(1), tile)
tile, err = a.GetTile(Vector{-1, -1})
tile, err = a.GetTile(vector.Vector{X: -1, Y: -1})
assert.NoError(t, err)
assert.Equal(t, Tile(2), tile)
tile, err = a.GetTile(Vector{1, -2})
tile, err = a.GetTile(vector.Vector{X: 1, Y: -2})
assert.NoError(t, err)
assert.Equal(t, Tile(3), tile)
@ -122,15 +123,15 @@ func TestAtlas_Grown(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, 100, len(a.Chunks))
tile, err = a.GetTile(Vector{0, 0})
tile, err = a.GetTile(vector.Vector{X: 0, Y: 0})
assert.NoError(t, err)
assert.Equal(t, Tile(1), tile)
tile, err = a.GetTile(Vector{-1, -1})
tile, err = a.GetTile(vector.Vector{X: -1, Y: -1})
assert.NoError(t, err)
assert.Equal(t, Tile(2), tile)
tile, err = a.GetTile(Vector{1, -2})
tile, err = a.GetTile(vector.Vector{X: 1, Y: -2})
assert.NoError(t, err)
assert.Equal(t, Tile(3), tile)
}
@ -143,25 +144,25 @@ func TestAtlas_SpawnWorld(t *testing.T) {
assert.NoError(t, a.SpawnWalls())
for i := -4; i < 4; i++ {
tile, err := a.GetTile(Vector{i, -4})
tile, err := a.GetTile(vector.Vector{X: i, Y: -4})
assert.NoError(t, err)
assert.Equal(t, TileWall, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(Vector{-4, i})
tile, err := a.GetTile(vector.Vector{X: -4, Y: i})
assert.NoError(t, err)
assert.Equal(t, TileWall, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(Vector{3, i})
tile, err := a.GetTile(vector.Vector{X: 3, Y: i})
assert.NoError(t, err)
assert.Equal(t, TileWall, tile)
}
for i := -4; i < 4; i++ {
tile, err := a.GetTile(Vector{i, 3})
tile, err := a.GetTile(vector.Vector{X: i, Y: 3})
assert.NoError(t, err)
assert.Equal(t, TileWall, tile)
}