Make Atlas grow in X and Y dimensions independently

Fixes exponential growth
This commit is contained in:
Marc Di Luzio 2020-06-27 16:03:53 +01:00
parent b116cdf291
commit 9bb91920c9
3 changed files with 163 additions and 80 deletions

View file

@ -11,54 +11,53 @@ func TestAtlas_NewAtlas(t *testing.T) {
a := NewAtlas(1)
assert.NotNil(t, a)
assert.Equal(t, 1, a.ChunkSize)
assert.Equal(t, 0, len(a.Chunks)) // Should start empty
assert.Equal(t, 1, len(a.Chunks)) // Should start empty
}
func TestAtlas_toChunk(t *testing.T) {
a := NewAtlas(1)
assert.NotNil(t, a)
// We start empty so we'll look like this
chunkID := a.toChunk(vector.Vector{X: 0, Y: 0})
assert.Equal(t, 0, chunkID)
// Get a tile to spawn the chunks
a.GetTile(vector.Vector{})
a.GetTile(vector.Vector{X: -1, Y: -1})
a.GetTile(vector.Vector{X: 0, Y: 0})
// Chunks should look like:
// 2 | 3
// -----
// 0 | 1
chunkID = a.toChunk(vector.Vector{X: 0, Y: 0})
chunkID := a.worldSpaceToChunk(vector.Vector{X: 0, Y: 0})
assert.Equal(t, 3, chunkID)
chunkID = a.toChunk(vector.Vector{X: 0, Y: -1})
chunkID = a.worldSpaceToChunk(vector.Vector{X: 0, Y: -1})
assert.Equal(t, 1, chunkID)
chunkID = a.toChunk(vector.Vector{X: -1, Y: -1})
chunkID = a.worldSpaceToChunk(vector.Vector{X: -1, Y: -1})
assert.Equal(t, 0, chunkID)
chunkID = a.toChunk(vector.Vector{X: -1, Y: 0})
chunkID = a.worldSpaceToChunk(vector.Vector{X: -1, Y: 0})
assert.Equal(t, 2, chunkID)
a = NewAtlas(2)
assert.NotNil(t, a)
// Get a tile to spawn the chunks
a.GetTile(vector.Vector{})
a.GetTile(vector.Vector{X: -2, Y: -2})
a.GetTile(vector.Vector{X: 1, Y: 1})
// Chunks should look like:
// 2 | 3
// -----
// 0 | 1
chunkID = a.toChunk(vector.Vector{X: 1, Y: 1})
chunkID = a.worldSpaceToChunk(vector.Vector{X: 1, Y: 1})
assert.Equal(t, 3, chunkID)
chunkID = a.toChunk(vector.Vector{X: 1, Y: -2})
chunkID = a.worldSpaceToChunk(vector.Vector{X: 1, Y: -2})
assert.Equal(t, 1, chunkID)
chunkID = a.toChunk(vector.Vector{X: -2, Y: -2})
chunkID = a.worldSpaceToChunk(vector.Vector{X: -2, Y: -2})
assert.Equal(t, 0, chunkID)
chunkID = a.toChunk(vector.Vector{X: -2, Y: 1})
chunkID = a.worldSpaceToChunk(vector.Vector{X: -2, Y: 1})
assert.Equal(t, 2, chunkID)
a = NewAtlas(2)
assert.NotNil(t, a)
// Get a tile to spawn the chunks
a.GetTile(vector.Vector{X: 0, Y: 3})
a.GetTile(vector.Vector{X: 5, Y: 5})
a.GetTile(vector.Vector{X: -5, Y: -5})
// Chunks should look like:
// 12| 13|| 14| 15
// ----------------
@ -67,13 +66,13 @@ func TestAtlas_toChunk(t *testing.T) {
// 4 | 5 || 6 | 7
// ----------------
// 0 | 1 || 2 | 3
chunkID = a.toChunk(vector.Vector{X: 1, Y: 3})
chunkID = a.worldSpaceToChunk(vector.Vector{X: 1, Y: 3})
assert.Equal(t, 14, chunkID)
chunkID = a.toChunk(vector.Vector{X: 1, Y: -3})
chunkID = a.worldSpaceToChunk(vector.Vector{X: 1, Y: -3})
assert.Equal(t, 2, chunkID)
chunkID = a.toChunk(vector.Vector{X: -1, Y: -1})
chunkID = a.worldSpaceToChunk(vector.Vector{X: -1, Y: -1})
assert.Equal(t, 5, chunkID)
chunkID = a.toChunk(vector.Vector{X: -2, Y: 2})
chunkID = a.worldSpaceToChunk(vector.Vector{X: -2, Y: 2})
assert.Equal(t, 13, chunkID)
}
@ -96,7 +95,7 @@ func TestAtlas_Grown(t *testing.T) {
// Start with a small example
a := NewAtlas(2)
assert.NotNil(t, a)
assert.Equal(t, 0, len(a.Chunks))
assert.Equal(t, 1, len(a.Chunks))
// Set a few tiles to values
a.SetTile(vector.Vector{X: 0, Y: 0}, 1)