From da91d316491e9bf3ce063775cbb53631a3231083 Mon Sep 17 00:00:00 2001 From: Marc Di Luzio Date: Sun, 19 Jul 2020 12:36:48 +0100 Subject: [PATCH] MOve glyph code into client --- {pkg/atlas => cmd/rove}/glyph.go | 2 +- cmd/rove/main.go | 5 ++--- pkg/atlas/atlas_test.go | 17 +---------------- 3 files changed, 4 insertions(+), 20 deletions(-) rename {pkg/atlas => cmd/rove}/glyph.go (98%) diff --git a/pkg/atlas/glyph.go b/cmd/rove/glyph.go similarity index 98% rename from pkg/atlas/glyph.go rename to cmd/rove/glyph.go index 183f460..57f556d 100644 --- a/pkg/atlas/glyph.go +++ b/cmd/rove/glyph.go @@ -1,4 +1,4 @@ -package atlas +package main import ( "log" diff --git a/cmd/rove/main.go b/cmd/rove/main.go index c782850..e00fd9f 100644 --- a/cmd/rove/main.go +++ b/cmd/rove/main.go @@ -10,7 +10,6 @@ import ( "path/filepath" "time" - "github.com/mdiluz/rove/pkg/atlas" "github.com/mdiluz/rove/pkg/maths" "github.com/mdiluz/rove/pkg/version" "github.com/mdiluz/rove/proto/roveapi" @@ -288,9 +287,9 @@ func InnerMain(command string, args ...string) error { t := response.Tiles[i+num*j] o := response.Objects[i+num*j] if o != roveapi.Object_ObjectUnknown { - fmt.Printf("%c", atlas.ObjectGlyph(o)) + fmt.Printf("%c", ObjectGlyph(o)) } else { - fmt.Printf("%c", atlas.TileGlyph(t)) + fmt.Printf("%c", TileGlyph(t)) } } diff --git a/pkg/atlas/atlas_test.go b/pkg/atlas/atlas_test.go index bc0467a..3d715f1 100644 --- a/pkg/atlas/atlas_test.go +++ b/pkg/atlas/atlas_test.go @@ -1,7 +1,6 @@ package atlas import ( - "fmt" "testing" "github.com/mdiluz/rove/pkg/maths" @@ -252,21 +251,7 @@ func TestAtlas_GetSetCorrect(t *testing.T) { func TestAtlas_WorldGen(t *testing.T) { a := NewChunkAtlas(8) + // Spawn a large world _, _ = 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(maths.Vector{X: i, Y: j}) - if o.Type != roveapi.Object_ObjectUnknown { - fmt.Printf("%c", ObjectGlyph(o.Type)) - } else { - fmt.Printf("%c", TileGlyph(t)) - } - - } - fmt.Print("\n") - } }