diff --git a/pkg/atlas/atlas.go b/pkg/atlas/atlas.go index dfdcb74..05012aa 100644 --- a/pkg/atlas/atlas.go +++ b/pkg/atlas/atlas.go @@ -1,27 +1,10 @@ package atlas import ( - "log" - "github.com/mdiluz/rove/pkg/maths" "github.com/mdiluz/rove/proto/roveapi" ) -// TileGlyph returns the glyph for this tile type -func TileGlyph(t roveapi.Tile) Glyph { - switch t { - case roveapi.Tile_Rock: - return GlyphGroundRock - case roveapi.Tile_Gravel: - return GlyphGroundGravel - case roveapi.Tile_Sand: - return GlyphGroundSand - } - - log.Fatalf("Unknown tile type: %c", t) - return 0 -} - // Atlas represents a 2D world atlas of tiles and objects type Atlas interface { // SetTile sets a location on the Atlas to a type of tile diff --git a/pkg/atlas/glyph.go b/pkg/atlas/glyph.go index ff186e3..183f460 100644 --- a/pkg/atlas/glyph.go +++ b/pkg/atlas/glyph.go @@ -1,5 +1,11 @@ package atlas +import ( + "log" + + "github.com/mdiluz/rove/proto/roveapi" +) + // Glyph represents the text representation of something in the game type Glyph byte @@ -22,3 +28,33 @@ const ( // GlyphRockLarge is a large blocking rock GlyphRockLarge = Glyph('O') ) + +// TileGlyph returns the glyph for this tile type +func TileGlyph(t roveapi.Tile) Glyph { + switch t { + case roveapi.Tile_Rock: + return GlyphGroundRock + case roveapi.Tile_Gravel: + return GlyphGroundGravel + case roveapi.Tile_Sand: + return GlyphGroundSand + } + + log.Fatalf("Unknown tile type: %c", t) + return 0 +} + +// ObjectGlyph returns the glyph for this object type +func ObjectGlyph(o roveapi.Object) Glyph { + switch o { + case roveapi.Object_RoverLive: + return GlyphRoverLive + case roveapi.Object_RockSmall: + return GlyphRockSmall + case roveapi.Object_RockLarge: + return GlyphRockLarge + } + + log.Fatalf("Unknown object type: %c", o) + return 0 +} diff --git a/pkg/atlas/objects.go b/pkg/atlas/objects.go index 269beb4..e1b6730 100644 --- a/pkg/atlas/objects.go +++ b/pkg/atlas/objects.go @@ -1,26 +1,9 @@ package atlas import ( - "log" - "github.com/mdiluz/rove/proto/roveapi" ) -// ObjectGlyph returns the glyph for this object type -func ObjectGlyph(o roveapi.Object) Glyph { - switch o { - case roveapi.Object_RoverLive: - return GlyphRoverLive - case roveapi.Object_RockSmall: - return GlyphRockSmall - case roveapi.Object_RockLarge: - return GlyphRockLarge - } - - log.Fatalf("Unknown object type: %c", o) - return 0 -} - // Object represents an object in the world type Object struct { // The type of the object