From ef6ad0d7d39a4760e84ea351ca5722c8db443939 Mon Sep 17 00:00:00 2001 From: Ben Cragg Date: Mon, 9 Oct 2023 09:26:23 +0100 Subject: [PATCH] upgrading to permanent pixel 2 repo --- examples/basics/basics.go | 4 ++-- examples/wiki/basics.go | 4 ++-- go.mod | 10 ++++---- go.sum | 48 ++++++++++++--------------------------- image.go | 2 +- imagelayer.go | 2 +- map.go | 5 ++-- map_test.go | 4 ++-- object.go | 2 +- object_i_test.go | 2 +- point.go | 2 +- tile.go | 2 +- tilelayer.go | 2 +- tileset.go | 2 +- utilities.go | 2 +- 15 files changed, 36 insertions(+), 57 deletions(-) diff --git a/examples/basics/basics.go b/examples/basics/basics.go index c3b10a4..0871aff 100644 --- a/examples/basics/basics.go +++ b/examples/basics/basics.go @@ -9,8 +9,8 @@ import ( "github.com/bcvery1/tilepix" - pixel "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" ) var ( diff --git a/examples/wiki/basics.go b/examples/wiki/basics.go index 83b9155..fa96441 100644 --- a/examples/wiki/basics.go +++ b/examples/wiki/basics.go @@ -7,8 +7,8 @@ import ( "github.com/bcvery1/tilepix" - pixel "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" ) var ( diff --git a/go.mod b/go.mod index 6fafdea..7ff491d 100644 --- a/go.mod +++ b/go.mod @@ -3,18 +3,18 @@ module github.com/bcvery1/tilepix go 1.21 require ( - github.com/duysqubix/pixel2 v0.12.0 + github.com/gopxl/pixel v1.0.0 github.com/sirupsen/logrus v1.4.1 ) require ( github.com/faiface/glhf v0.0.0-20211013000516-57b20770c369 // indirect github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 // indirect - github.com/go-gl/gl v0.0.0-20210905235341-f7a045908259 // indirect - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be // indirect - github.com/go-gl/mathgl v1.0.0 // indirect + github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b // indirect + github.com/go-gl/mathgl v1.1.0 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect - golang.org/x/image v0.5.0 // indirect + golang.org/x/image v0.13.0 // indirect golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect ) diff --git a/go.sum b/go.sum index 0e6cf22..5e19368 100644 --- a/go.sum +++ b/go.sum @@ -1,18 +1,20 @@ 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/duysqubix/pixel2 v0.12.0 h1:PDp94ZsyzMs+li/d5MkfiqTXwAKzjcWLxGNe1cju6pM= -github.com/duysqubix/pixel2 v0.12.0/go.mod h1:jt+Jagr/JKOrI38G2T/emhmHMemy+zNxiU0/P9VngA0= github.com/faiface/glhf v0.0.0-20211013000516-57b20770c369 h1:gv4BgP50atccdK/1tZHDyP6rMwiiutR2HPreR/OyLzI= github.com/faiface/glhf v0.0.0-20211013000516-57b20770c369/go.mod h1:dDdUO+G9ZnJ9sc8nIUvhLkE45k8PEKW6+A3TdWsfpV0= github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 h1:baVdMKlASEHrj19iqjARrPbaRisD7EuZEVJj6ZMLl1Q= github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3/go.mod h1:VEPNJUlxl5KdWjDvz6Q1l+rJlxF2i6xqDeGuGAxa87M= -github.com/go-gl/gl v0.0.0-20210905235341-f7a045908259 h1:8q7+xl2D2qHPLTII1t4vSMNP2VKwDcn+Avf2WXvdB1A= github.com/go-gl/gl v0.0.0-20210905235341-f7a045908259/go.mod h1:wjpnOv6ONl2SuJSxqCPVaPZibGFdSci9HFocT9qtVYM= +github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk= +github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= github.com/go-gl/glfw v0.0.0-20210727001814-0db043d8d5be/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be h1:vEIVIuBApEBQTEJt19GfhoU+zFSV+sNTa9E9FdnRYfk= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/mathgl v1.0.0 h1:t9DznWJlXxxjeeKLIdovCOVJQk/GzDEL7h/h+Ro2B68= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/mathgl v1.0.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ= +github.com/go-gl/mathgl v1.1.0 h1:0lzZ+rntPX3/oGrDzYGdowSLC2ky8Osirvf5uAwfIEA= +github.com/go-gl/mathgl v1.1.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ= +github.com/gopxl/pixel v1.0.0 h1:ZON6ll6/tI6sO8fwrlj93GVUcXReTST5//iKv6lcd8g= +github.com/gopxl/pixel v1.0.0/go.mod h1:kPUBG2He7/+alwmi5z0IwnpAc6pw2N7eA08cdBfoE/Q= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -24,36 +26,14 @@ github.com/sirupsen/logrus v1.4.1 h1:GL2rEmy6nsikmW0r8opw9JIRScdMF5hA8cOYLH7In1k github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI= -golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg= +golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= -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/image.go b/image.go index 3207ad9..98ce2f9 100644 --- a/image.go +++ b/image.go @@ -4,7 +4,7 @@ import ( "fmt" "path/filepath" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" log "github.com/sirupsen/logrus" ) diff --git a/imagelayer.go b/imagelayer.go index 6c2303d..6d4ac34 100644 --- a/imagelayer.go +++ b/imagelayer.go @@ -3,7 +3,7 @@ package tilepix import ( "fmt" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" log "github.com/sirupsen/logrus" ) diff --git a/map.go b/map.go index c0b2416..51e65b3 100644 --- a/map.go +++ b/map.go @@ -4,9 +4,8 @@ import ( "fmt" "image/color" - pixel "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" - + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" log "github.com/sirupsen/logrus" ) diff --git a/map_test.go b/map_test.go index 673811d..3dd8202 100644 --- a/map_test.go +++ b/map_test.go @@ -8,8 +8,8 @@ import ( _ "image/png" "github.com/bcvery1/tilepix" - pixel "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" ) func TestMain(m *testing.M) { diff --git a/object.go b/object.go index f61938d..c3f5dc6 100644 --- a/object.go +++ b/object.go @@ -3,7 +3,7 @@ package tilepix import ( "fmt" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" log "github.com/sirupsen/logrus" ) diff --git a/object_i_test.go b/object_i_test.go index 6768109..fff4da7 100644 --- a/object_i_test.go +++ b/object_i_test.go @@ -8,7 +8,7 @@ import ( _ "image/png" "github.com/bcvery1/tilepix" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" ) func TestObject_GetEllipse(t *testing.T) { diff --git a/point.go b/point.go index 09e8ebe..4cfe0a4 100644 --- a/point.go +++ b/point.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" log "github.com/sirupsen/logrus" ) diff --git a/tile.go b/tile.go index cf7665b..fb561ec 100644 --- a/tile.go +++ b/tile.go @@ -4,7 +4,7 @@ import ( "fmt" "math" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" ) /* diff --git a/tilelayer.go b/tilelayer.go index 7431352..63d9983 100644 --- a/tilelayer.go +++ b/tilelayer.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" log "github.com/sirupsen/logrus" ) diff --git a/tileset.go b/tileset.go index 93ee014..8cb18c6 100644 --- a/tileset.go +++ b/tileset.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" log "github.com/sirupsen/logrus" ) diff --git a/utilities.go b/utilities.go index 4395a0c..f6ae2a9 100644 --- a/utilities.go +++ b/utilities.go @@ -5,7 +5,7 @@ import ( "io" "os" - pixel "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel" log "github.com/sirupsen/logrus" )