Move vector into maths package
This commit is contained in:
parent
97d3be000b
commit
5b1fe61097
11 changed files with 131 additions and 134 deletions
|
|
@ -4,8 +4,8 @@ import (
|
|||
"fmt"
|
||||
"testing"
|
||||
|
||||
"github.com/mdiluz/rove/pkg/maths"
|
||||
"github.com/mdiluz/rove/pkg/objects"
|
||||
"github.com/mdiluz/rove/pkg/vector"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
|
@ -21,49 +21,49 @@ func TestAtlas_toChunk(t *testing.T) {
|
|||
assert.NotNil(t, a)
|
||||
|
||||
// Get a tile to spawn the chunks
|
||||
a.QueryPosition(vector.Vector{X: -1, Y: -1})
|
||||
a.QueryPosition(vector.Vector{X: 0, Y: 0})
|
||||
a.QueryPosition(maths.Vector{X: -1, Y: -1})
|
||||
a.QueryPosition(maths.Vector{X: 0, Y: 0})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
|
||||
// Chunks should look like:
|
||||
// 2 | 3
|
||||
// -----
|
||||
// 0 | 1
|
||||
chunkID := a.worldSpaceToChunkIndex(vector.Vector{X: 0, Y: 0})
|
||||
chunkID := a.worldSpaceToChunkIndex(maths.Vector{X: 0, Y: 0})
|
||||
assert.Equal(t, 3, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 0, Y: -1})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 0, Y: -1})
|
||||
assert.Equal(t, 1, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: -1, Y: -1})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: -1, Y: -1})
|
||||
assert.Equal(t, 0, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: -1, Y: 0})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: -1, Y: 0})
|
||||
assert.Equal(t, 2, chunkID)
|
||||
|
||||
a = NewChunkAtlas(2).(*chunkBasedAtlas)
|
||||
assert.NotNil(t, a)
|
||||
// Get a tile to spawn the chunks
|
||||
a.QueryPosition(vector.Vector{X: -2, Y: -2})
|
||||
a.QueryPosition(maths.Vector{X: -2, Y: -2})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
a.QueryPosition(vector.Vector{X: 1, Y: 1})
|
||||
a.QueryPosition(maths.Vector{X: 1, Y: 1})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
// Chunks should look like:
|
||||
// 2 | 3
|
||||
// -----
|
||||
// 0 | 1
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 1, Y: 1})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 1, Y: 1})
|
||||
assert.Equal(t, 3, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 1, Y: -2})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 1, Y: -2})
|
||||
assert.Equal(t, 1, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: -2, Y: -2})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: -2, Y: -2})
|
||||
assert.Equal(t, 0, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: -2, Y: 1})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: -2, Y: 1})
|
||||
assert.Equal(t, 2, chunkID)
|
||||
|
||||
a = NewChunkAtlas(2).(*chunkBasedAtlas)
|
||||
assert.NotNil(t, a)
|
||||
// Get a tile to spawn a 4x4 grid of chunks
|
||||
a.QueryPosition(vector.Vector{X: 3, Y: 3})
|
||||
a.QueryPosition(maths.Vector{X: 3, Y: 3})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
a.QueryPosition(vector.Vector{X: -3, Y: -3})
|
||||
a.QueryPosition(maths.Vector{X: -3, Y: -3})
|
||||
assert.Equal(t, 4*4, len(a.Chunks))
|
||||
|
||||
// Chunks should look like:
|
||||
|
|
@ -74,19 +74,19 @@ func TestAtlas_toChunk(t *testing.T) {
|
|||
// 4 | 5 || 6 | 7
|
||||
// ----------------
|
||||
// 0 | 1 || 2 | 3
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 1, Y: 3})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 1, Y: 3})
|
||||
assert.Equal(t, 14, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 1, Y: -3})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 1, Y: -3})
|
||||
assert.Equal(t, 2, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: -1, Y: -1})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: -1, Y: -1})
|
||||
assert.Equal(t, 5, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: -2, Y: 2})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: -2, Y: 2})
|
||||
assert.Equal(t, 13, chunkID)
|
||||
|
||||
a = NewChunkAtlas(3).(*chunkBasedAtlas)
|
||||
assert.NotNil(t, a)
|
||||
// Get a tile to spawn a 4x4 grid of chunks
|
||||
a.QueryPosition(vector.Vector{X: 3, Y: 3})
|
||||
a.QueryPosition(maths.Vector{X: 3, Y: 3})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
|
||||
// Chunks should look like:
|
||||
|
|
@ -94,13 +94,13 @@ func TestAtlas_toChunk(t *testing.T) {
|
|||
// -------
|
||||
// || 0| 1
|
||||
// =======
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 1, Y: 1})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 1, Y: 1})
|
||||
assert.Equal(t, 0, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 3, Y: 1})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 3, Y: 1})
|
||||
assert.Equal(t, 1, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 1, Y: 4})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 1, Y: 4})
|
||||
assert.Equal(t, 2, chunkID)
|
||||
chunkID = a.worldSpaceToChunkIndex(vector.Vector{X: 5, Y: 5})
|
||||
chunkID = a.worldSpaceToChunkIndex(maths.Vector{X: 5, Y: 5})
|
||||
assert.Equal(t, 3, chunkID)
|
||||
}
|
||||
|
||||
|
|
@ -109,36 +109,36 @@ func TestAtlas_toWorld(t *testing.T) {
|
|||
assert.NotNil(t, a)
|
||||
|
||||
// Get a tile to spawn some chunks
|
||||
a.QueryPosition(vector.Vector{X: -1, Y: -1})
|
||||
a.QueryPosition(maths.Vector{X: -1, Y: -1})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
|
||||
// Chunks should look like:
|
||||
// 2 | 3
|
||||
// -----
|
||||
// 0 | 1
|
||||
assert.Equal(t, vector.Vector{X: -1, Y: -1}, a.chunkOriginInWorldSpace(0))
|
||||
assert.Equal(t, vector.Vector{X: 0, Y: -1}, a.chunkOriginInWorldSpace(1))
|
||||
assert.Equal(t, maths.Vector{X: -1, Y: -1}, a.chunkOriginInWorldSpace(0))
|
||||
assert.Equal(t, maths.Vector{X: 0, Y: -1}, a.chunkOriginInWorldSpace(1))
|
||||
|
||||
a = NewChunkAtlas(2).(*chunkBasedAtlas)
|
||||
assert.NotNil(t, a)
|
||||
// Get a tile to spawn the chunks
|
||||
a.QueryPosition(vector.Vector{X: -2, Y: -2})
|
||||
a.QueryPosition(maths.Vector{X: -2, Y: -2})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
a.QueryPosition(vector.Vector{X: 1, Y: 1})
|
||||
a.QueryPosition(maths.Vector{X: 1, Y: 1})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
// Chunks should look like:
|
||||
// 2 | 3
|
||||
// -----
|
||||
// 0 | 1
|
||||
assert.Equal(t, vector.Vector{X: -2, Y: -2}, a.chunkOriginInWorldSpace(0))
|
||||
assert.Equal(t, vector.Vector{X: -2, Y: 0}, a.chunkOriginInWorldSpace(2))
|
||||
assert.Equal(t, maths.Vector{X: -2, Y: -2}, a.chunkOriginInWorldSpace(0))
|
||||
assert.Equal(t, maths.Vector{X: -2, Y: 0}, a.chunkOriginInWorldSpace(2))
|
||||
|
||||
a = NewChunkAtlas(2).(*chunkBasedAtlas)
|
||||
assert.NotNil(t, a)
|
||||
// Get a tile to spawn a 4x4 grid of chunks
|
||||
a.QueryPosition(vector.Vector{X: 3, Y: 3})
|
||||
a.QueryPosition(maths.Vector{X: 3, Y: 3})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
a.QueryPosition(vector.Vector{X: -3, Y: -3})
|
||||
a.QueryPosition(maths.Vector{X: -3, Y: -3})
|
||||
assert.Equal(t, 4*4, len(a.Chunks))
|
||||
|
||||
// Chunks should look like:
|
||||
|
|
@ -149,13 +149,13 @@ func TestAtlas_toWorld(t *testing.T) {
|
|||
// 4 | 5 || 6 | 7
|
||||
// ----------------
|
||||
// 0 | 1 || 2 | 3
|
||||
assert.Equal(t, vector.Vector{X: -4, Y: -4}, a.chunkOriginInWorldSpace(0))
|
||||
assert.Equal(t, vector.Vector{X: 2, Y: -2}, a.chunkOriginInWorldSpace(7))
|
||||
assert.Equal(t, maths.Vector{X: -4, Y: -4}, a.chunkOriginInWorldSpace(0))
|
||||
assert.Equal(t, maths.Vector{X: 2, Y: -2}, a.chunkOriginInWorldSpace(7))
|
||||
|
||||
a = NewChunkAtlas(3).(*chunkBasedAtlas)
|
||||
assert.NotNil(t, a)
|
||||
// Get a tile to spawn a 4x4 grid of chunks
|
||||
a.QueryPosition(vector.Vector{X: 3, Y: 3})
|
||||
a.QueryPosition(maths.Vector{X: 3, Y: 3})
|
||||
assert.Equal(t, 2*2, len(a.Chunks))
|
||||
|
||||
// Chunks should look like:
|
||||
|
|
@ -163,7 +163,7 @@ func TestAtlas_toWorld(t *testing.T) {
|
|||
// -------
|
||||
// || 0| 1
|
||||
// =======
|
||||
assert.Equal(t, vector.Vector{X: 0, Y: 0}, a.chunkOriginInWorldSpace(0))
|
||||
assert.Equal(t, maths.Vector{X: 0, Y: 0}, a.chunkOriginInWorldSpace(0))
|
||||
}
|
||||
|
||||
func TestAtlas_GetSetTile(t *testing.T) {
|
||||
|
|
@ -171,13 +171,13 @@ func TestAtlas_GetSetTile(t *testing.T) {
|
|||
assert.NotNil(t, a)
|
||||
|
||||
// Set the origin tile to 1 and test it
|
||||
a.SetTile(vector.Vector{X: 0, Y: 0}, 1)
|
||||
tile, _ := a.QueryPosition(vector.Vector{X: 0, Y: 0})
|
||||
a.SetTile(maths.Vector{X: 0, Y: 0}, 1)
|
||||
tile, _ := a.QueryPosition(maths.Vector{X: 0, Y: 0})
|
||||
assert.Equal(t, byte(1), tile)
|
||||
|
||||
// Set another tile to 1 and test it
|
||||
a.SetTile(vector.Vector{X: 5, Y: -2}, 2)
|
||||
tile, _ = a.QueryPosition(vector.Vector{X: 5, Y: -2})
|
||||
a.SetTile(maths.Vector{X: 5, Y: -2}, 2)
|
||||
tile, _ = a.QueryPosition(maths.Vector{X: 5, Y: -2})
|
||||
assert.Equal(t, byte(2), tile)
|
||||
}
|
||||
|
||||
|
|
@ -186,13 +186,13 @@ func TestAtlas_GetSetObject(t *testing.T) {
|
|||
assert.NotNil(t, a)
|
||||
|
||||
// Set the origin tile to 1 and test it
|
||||
a.SetObject(vector.Vector{X: 0, Y: 0}, objects.Object{Type: objects.LargeRock})
|
||||
_, obj := a.QueryPosition(vector.Vector{X: 0, Y: 0})
|
||||
a.SetObject(maths.Vector{X: 0, Y: 0}, objects.Object{Type: objects.LargeRock})
|
||||
_, obj := a.QueryPosition(maths.Vector{X: 0, Y: 0})
|
||||
assert.Equal(t, objects.Object{Type: objects.LargeRock}, obj)
|
||||
|
||||
// Set another tile to 1 and test it
|
||||
a.SetObject(vector.Vector{X: 5, Y: -2}, objects.Object{Type: objects.SmallRock})
|
||||
_, obj = a.QueryPosition(vector.Vector{X: 5, Y: -2})
|
||||
a.SetObject(maths.Vector{X: 5, Y: -2}, objects.Object{Type: objects.SmallRock})
|
||||
_, obj = a.QueryPosition(maths.Vector{X: 5, Y: -2})
|
||||
assert.Equal(t, objects.Object{Type: objects.SmallRock}, obj)
|
||||
}
|
||||
|
||||
|
|
@ -203,27 +203,27 @@ func TestAtlas_Grown(t *testing.T) {
|
|||
assert.Equal(t, 1, len(a.Chunks))
|
||||
|
||||
// Set a few tiles to values
|
||||
a.SetTile(vector.Vector{X: 0, Y: 0}, 1)
|
||||
a.SetTile(vector.Vector{X: -1, Y: -1}, 2)
|
||||
a.SetTile(vector.Vector{X: 1, Y: -2}, 3)
|
||||
a.SetTile(maths.Vector{X: 0, Y: 0}, 1)
|
||||
a.SetTile(maths.Vector{X: -1, Y: -1}, 2)
|
||||
a.SetTile(maths.Vector{X: 1, Y: -2}, 3)
|
||||
|
||||
// Check tile values
|
||||
tile, _ := a.QueryPosition(vector.Vector{X: 0, Y: 0})
|
||||
tile, _ := a.QueryPosition(maths.Vector{X: 0, Y: 0})
|
||||
assert.Equal(t, byte(1), tile)
|
||||
|
||||
tile, _ = a.QueryPosition(vector.Vector{X: -1, Y: -1})
|
||||
tile, _ = a.QueryPosition(maths.Vector{X: -1, Y: -1})
|
||||
assert.Equal(t, byte(2), tile)
|
||||
|
||||
tile, _ = a.QueryPosition(vector.Vector{X: 1, Y: -2})
|
||||
tile, _ = a.QueryPosition(maths.Vector{X: 1, Y: -2})
|
||||
assert.Equal(t, byte(3), tile)
|
||||
|
||||
tile, _ = a.QueryPosition(vector.Vector{X: 0, Y: 0})
|
||||
tile, _ = a.QueryPosition(maths.Vector{X: 0, Y: 0})
|
||||
assert.Equal(t, byte(1), tile)
|
||||
|
||||
tile, _ = a.QueryPosition(vector.Vector{X: -1, Y: -1})
|
||||
tile, _ = a.QueryPosition(maths.Vector{X: -1, Y: -1})
|
||||
assert.Equal(t, byte(2), tile)
|
||||
|
||||
tile, _ = a.QueryPosition(vector.Vector{X: 1, Y: -2})
|
||||
tile, _ = a.QueryPosition(maths.Vector{X: 1, Y: -2})
|
||||
assert.Equal(t, byte(3), tile)
|
||||
}
|
||||
|
||||
|
|
@ -237,7 +237,7 @@ func TestAtlas_GetSetCorrect(t *testing.T) {
|
|||
assert.NotNil(t, a)
|
||||
assert.Equal(t, 1, len(a.Chunks))
|
||||
|
||||
pos := vector.Vector{X: x, Y: y}
|
||||
pos := maths.Vector{X: x, Y: y}
|
||||
a.SetTile(pos, TileRock)
|
||||
a.SetObject(pos, objects.Object{Type: objects.LargeRock})
|
||||
tile, obj := a.QueryPosition(pos)
|
||||
|
|
@ -253,13 +253,13 @@ func TestAtlas_GetSetCorrect(t *testing.T) {
|
|||
func TestAtlas_WorldGen(t *testing.T) {
|
||||
a := NewChunkAtlas(8)
|
||||
// Spawn a large world
|
||||
_, _ = a.QueryPosition(vector.Vector{X: 20, Y: 20})
|
||||
_, _ = a.QueryPosition(maths.Vector{X: 20, Y: 20})
|
||||
|
||||
// Print out the world for manual evaluation
|
||||
num := 20
|
||||
for j := num - 1; j >= 0; j-- {
|
||||
for i := 0; i < num; i++ {
|
||||
t, o := a.QueryPosition(vector.Vector{X: i, Y: j})
|
||||
t, o := a.QueryPosition(maths.Vector{X: i, Y: j})
|
||||
if o.Type != objects.None {
|
||||
fmt.Printf("%c", o.Type)
|
||||
} else if t != byte(TileNone) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue