diff --git a/go.mod b/go.mod index e956ee2..3a2305f 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/disintegration/imaging v1.6.2 - github.com/stretchr/testify v1.8.2 + github.com/stretchr/testify v1.10.0 ) require ( diff --git a/go.sum b/go.sum index b601967..2826e8d 100644 --- a/go.sum +++ b/go.sum @@ -1,23 +1,16 @@ -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c= github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ= golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/render/renderer.go b/render/renderer.go index 2058502..56d4c48 100644 --- a/render/renderer.go +++ b/render/renderer.go @@ -139,7 +139,6 @@ func (r *Renderer) getTileImage(tile *tiled.LayerTile) (image.Image, error) { } func (r *Renderer) _renderLayer(layer *tiled.Layer) error { - var xs, xe, xi, ys, ye, yi int if r.m.RenderOrder == "" || r.m.RenderOrder == "right-down" { xs = 0 diff --git a/tmx_defaults.go b/tmx_defaults.go index cf20e5a..3c58a3a 100644 --- a/tmx_defaults.go +++ b/tmx_defaults.go @@ -19,18 +19,23 @@ SOFTWARE. package tiled -type aliasGroup Group -type aliasImageLayer ImageLayer -type internalLayer Layer -type aliasLayer struct { - internalLayer - // Layer data in raw format - Data *Data `xml:"data"` -} -type aliasMap Map -type aliasObject Object -type aliasObjectGroup ObjectGroup -type aliasText Text +type ( + aliasGroup Group + aliasImageLayer ImageLayer + internalLayer Layer + aliasLayer struct { + internalLayer + // Layer data in raw format + Data *Data `xml:"data"` + } +) + +type ( + aliasMap Map + aliasObject Object + aliasObjectGroup ObjectGroup + aliasText Text +) // SetDefaults provides default values for Group. func (a *aliasGroup) SetDefaults() { diff --git a/tmx_property_test.go b/tmx_property_test.go index 074246f..466dfbe 100644 --- a/tmx_property_test.go +++ b/tmx_property_test.go @@ -29,7 +29,6 @@ import ( ) func TestGetProperty(t *testing.T) { - props := Properties{ { Name: "string-name", diff --git a/tmx_tileset_test.go b/tmx_tileset_test.go index 2a4ea68..e127d78 100644 --- a/tmx_tileset_test.go +++ b/tmx_tileset_test.go @@ -30,7 +30,6 @@ import ( ) func TestGetTileRect(t *testing.T) { - type Case struct { id uint32 rect image.Rectangle @@ -165,5 +164,4 @@ func TestGetTileRect(t *testing.T) { } }) } - }