From c8aeb965fa223e3145d7ca494f642be18e25982f Mon Sep 17 00:00:00 2001 From: duysqubix Date: Fri, 6 Oct 2023 14:41:38 -0500 Subject: [PATCH 1/3] updated references to use gopxl --- circle_test.go | 2 +- color_test.go | 2 +- data_test.go | 2 +- drawer_test.go | 2 +- examples/guide/01_creating_a_window/main.go | 4 +- examples/guide/02_drawing_a_sprite/main.go | 4 +- .../main.go | 4 +- .../main.go | 4 +- .../05_drawing_efficiently_with_batch/main.go | 4 +- .../06_drawing_shapes_with_imdraw/main.go | 6 +-- .../07_typing_text_on_the_screen/main.go | 6 +-- examples/lights/main.go | 6 +-- examples/multiwindows/main.go | 6 +-- examples/platformer/main.go | 6 +-- examples/shader/exposure/main.go | 6 +-- examples/shader/exposure/psutil.go | 4 +- examples/shader/fastblur/main.go | 6 +-- examples/shader/grayscale/main.go | 4 +- examples/shader/wavy/main.go | 6 +-- geometry_test.go | 2 +- go.mod | 16 +++--- go.sum | 50 ++++++------------- imdraw/imdraw.go | 2 +- imdraw/imdraw_test.go | 4 +- line_test.go | 2 +- math_test.go | 2 +- matrix_test.go | 2 +- pixel_test.go | 4 +- pixelgl/canvas.go | 2 +- pixelgl/glframe.go | 2 +- pixelgl/glpicture.go | 2 +- pixelgl/gltriangles.go | 2 +- pixelgl/input.go | 2 +- pixelgl/util.go | 2 +- pixelgl/window.go | 2 +- rectangle_test.go | 2 +- text/atlas.go | 2 +- text/atlas_test.go | 2 +- text/text.go | 2 +- text/text_test.go | 4 +- vector_test.go | 2 +- 41 files changed, 87 insertions(+), 109 deletions(-) diff --git a/circle_test.go b/circle_test.go index b6ce317..3dfa8f9 100644 --- a/circle_test.go +++ b/circle_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) func TestC(t *testing.T) { diff --git a/color_test.go b/color_test.go index 2a6ad72..2de2511 100644 --- a/color_test.go +++ b/color_test.go @@ -5,7 +5,7 @@ import ( "image/color" "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) func BenchmarkColorToRGBA(b *testing.B) { diff --git a/data_test.go b/data_test.go index f35d20b..415c7e7 100644 --- a/data_test.go +++ b/data_test.go @@ -3,7 +3,7 @@ package pixel_test import ( "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) func BenchmarkMakeTrianglesData(b *testing.B) { diff --git a/drawer_test.go b/drawer_test.go index f10cd5c..50613eb 100644 --- a/drawer_test.go +++ b/drawer_test.go @@ -4,7 +4,7 @@ import ( "image" "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) func BenchmarkSpriteDrawBatch(b *testing.B) { diff --git a/examples/guide/01_creating_a_window/main.go b/examples/guide/01_creating_a_window/main.go index 178fda7..ad9c49d 100644 --- a/examples/guide/01_creating_a_window/main.go +++ b/examples/guide/01_creating_a_window/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/02_drawing_a_sprite/main.go b/examples/guide/02_drawing_a_sprite/main.go index 21f6307..6739d5e 100644 --- a/examples/guide/02_drawing_a_sprite/main.go +++ b/examples/guide/02_drawing_a_sprite/main.go @@ -6,8 +6,8 @@ import ( _ "image/png" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/03_moving_scaling_and_rotating_with_matrix/main.go b/examples/guide/03_moving_scaling_and_rotating_with_matrix/main.go index 13c91a5..e1a9b5f 100644 --- a/examples/guide/03_moving_scaling_and_rotating_with_matrix/main.go +++ b/examples/guide/03_moving_scaling_and_rotating_with_matrix/main.go @@ -7,8 +7,8 @@ import ( _ "image/png" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/04_pressing_keys_and_clicking_mouse/main.go b/examples/guide/04_pressing_keys_and_clicking_mouse/main.go index 03f7afb..d8a7747 100644 --- a/examples/guide/04_pressing_keys_and_clicking_mouse/main.go +++ b/examples/guide/04_pressing_keys_and_clicking_mouse/main.go @@ -9,8 +9,8 @@ import ( _ "image/png" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/05_drawing_efficiently_with_batch/main.go b/examples/guide/05_drawing_efficiently_with_batch/main.go index 119374c..e182455 100644 --- a/examples/guide/05_drawing_efficiently_with_batch/main.go +++ b/examples/guide/05_drawing_efficiently_with_batch/main.go @@ -10,8 +10,8 @@ import ( _ "image/png" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/06_drawing_shapes_with_imdraw/main.go b/examples/guide/06_drawing_shapes_with_imdraw/main.go index 809b26e..e96a8ef 100644 --- a/examples/guide/06_drawing_shapes_with_imdraw/main.go +++ b/examples/guide/06_drawing_shapes_with_imdraw/main.go @@ -3,9 +3,9 @@ package main import ( "math" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/imdraw" + "github.com/gopxl/pixel2/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/07_typing_text_on_the_screen/main.go b/examples/guide/07_typing_text_on_the_screen/main.go index 07e4b5c..1c9469a 100644 --- a/examples/guide/07_typing_text_on_the_screen/main.go +++ b/examples/guide/07_typing_text_on_the_screen/main.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" - "github.com/duysqubix/pixel2/text" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel2/text" "github.com/golang/freetype/truetype" "golang.org/x/image/colornames" "golang.org/x/image/font" diff --git a/examples/lights/main.go b/examples/lights/main.go index 2b5d7d3..0c97745 100644 --- a/examples/lights/main.go +++ b/examples/lights/main.go @@ -9,9 +9,9 @@ import ( _ "image/jpeg" _ "image/png" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/imdraw" + "github.com/gopxl/pixel2/pixelgl" ) func loadPicture(path string) (pixel.Picture, error) { diff --git a/examples/multiwindows/main.go b/examples/multiwindows/main.go index 7984619..635742f 100644 --- a/examples/multiwindows/main.go +++ b/examples/multiwindows/main.go @@ -3,9 +3,9 @@ package main import ( "fmt" - pixel "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" - "github.com/duysqubix/pixel2/text" + pixel "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel2/text" ) type EasyWindow1 struct { diff --git a/examples/platformer/main.go b/examples/platformer/main.go index f07ad7e..3921e21 100644 --- a/examples/platformer/main.go +++ b/examples/platformer/main.go @@ -13,9 +13,9 @@ import ( _ "image/png" - pixel "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" - "github.com/duysqubix/pixel2/pixelgl" + pixel "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/imdraw" + "github.com/gopxl/pixel2/pixelgl" "github.com/pkg/errors" "golang.org/x/image/colornames" ) diff --git a/examples/shader/exposure/main.go b/examples/shader/exposure/main.go index 11f250c..8d23a12 100644 --- a/examples/shader/exposure/main.go +++ b/examples/shader/exposure/main.go @@ -12,9 +12,9 @@ import ( "math" "time" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/imdraw" + "github.com/gopxl/pixel2/pixelgl" ) var ( diff --git a/examples/shader/exposure/psutil.go b/examples/shader/exposure/psutil.go index 0c29e38..3657ceb 100644 --- a/examples/shader/exposure/psutil.go +++ b/examples/shader/exposure/psutil.go @@ -3,8 +3,8 @@ package main import ( "io/ioutil" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" ) // Pixel Shader utility functions diff --git a/examples/shader/fastblur/main.go b/examples/shader/fastblur/main.go index 0a90d48..7b93cd7 100644 --- a/examples/shader/fastblur/main.go +++ b/examples/shader/fastblur/main.go @@ -10,9 +10,9 @@ import ( "math" "time" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/imdraw" + "github.com/gopxl/pixel2/pixelgl" "github.com/go-gl/mathgl/mgl32" ) diff --git a/examples/shader/grayscale/main.go b/examples/shader/grayscale/main.go index b597cd0..394acff 100644 --- a/examples/shader/grayscale/main.go +++ b/examples/shader/grayscale/main.go @@ -4,8 +4,8 @@ import ( "image/png" "os" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" ) var gopherimg *pixel.Sprite diff --git a/examples/shader/wavy/main.go b/examples/shader/wavy/main.go index 945a4ff..8cdcfe2 100644 --- a/examples/shader/wavy/main.go +++ b/examples/shader/wavy/main.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/imdraw" + "github.com/gopxl/pixel2/pixelgl" ) var gopherimg *pixel.Sprite diff --git a/geometry_test.go b/geometry_test.go index 4b9f5e6..e5cb0cc 100644 --- a/geometry_test.go +++ b/geometry_test.go @@ -3,7 +3,7 @@ package pixel_test import ( "testing" - pixel "github.com/duysqubix/pixel2" + pixel "github.com/gopxl/pixel2" ) type sub struct { diff --git a/go.mod b/go.mod index 7d42916..e2009c2 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,21 @@ -module github.com/duysqubix/pixel2 +module github.com/gopxl/pixel2 go 1.21 require ( github.com/faiface/glhf v0.0.0-20211013000516-57b20770c369 github.com/faiface/mainthread v0.0.0-20171120011319-8b78f0a41ae3 - github.com/go-gl/gl v0.0.0-20210905235341-f7a045908259 - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20210727001814-0db043d8d5be - github.com/go-gl/mathgl v1.0.0 + github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b + github.com/go-gl/mathgl v1.1.0 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 github.com/pkg/errors v0.9.1 - github.com/stretchr/testify v1.7.0 - golang.org/x/image v0.5.0 + github.com/stretchr/testify v1.8.4 + golang.org/x/image v0.13.0 ) require ( - github.com/davecgh/go-spew v1.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index 309cd0e..44ed4ba 100644 --- a/go.sum +++ b/go.sum @@ -1,53 +1,31 @@ -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= -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/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/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/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/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/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/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/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/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 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/imdraw/imdraw.go b/imdraw/imdraw.go index b5bcaf3..571c638 100644 --- a/imdraw/imdraw.go +++ b/imdraw/imdraw.go @@ -6,7 +6,7 @@ import ( "image/color" "math" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) // IMDraw is an immediate-mode-like shape drawer and BasicTarget. IMDraw supports TrianglesPosition, diff --git a/imdraw/imdraw_test.go b/imdraw/imdraw_test.go index 2076b95..c206e08 100644 --- a/imdraw/imdraw_test.go +++ b/imdraw/imdraw_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "testing" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/imdraw" ) func BenchmarkPush(b *testing.B) { diff --git a/line_test.go b/line_test.go index 898f48d..988adfd 100644 --- a/line_test.go +++ b/line_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) func TestLine_Bounds(t *testing.T) { diff --git a/math_test.go b/math_test.go index 0369605..99252fb 100644 --- a/math_test.go +++ b/math_test.go @@ -5,7 +5,7 @@ import ( "math" "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) // closeEnough will shift the decimal point by the accuracy required, truncates the results and compares them. diff --git a/matrix_test.go b/matrix_test.go index d4c4998..35b2001 100644 --- a/matrix_test.go +++ b/matrix_test.go @@ -6,7 +6,7 @@ import ( "math/rand" "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" "github.com/stretchr/testify/assert" ) diff --git a/pixel_test.go b/pixel_test.go index 2132642..7e51fcd 100644 --- a/pixel_test.go +++ b/pixel_test.go @@ -8,8 +8,8 @@ import ( _ "image/png" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/pixelgl" ) // onePixelImage is the byte representation of a 1x1 solid white png file diff --git a/pixelgl/canvas.go b/pixelgl/canvas.go index cf10337..b913e73 100644 --- a/pixelgl/canvas.go +++ b/pixelgl/canvas.go @@ -6,7 +6,7 @@ import ( "github.com/faiface/glhf" "github.com/faiface/mainthread" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" "github.com/go-gl/mathgl/mgl32" "github.com/pkg/errors" ) diff --git a/pixelgl/glframe.go b/pixelgl/glframe.go index 22950b9..cdca246 100644 --- a/pixelgl/glframe.go +++ b/pixelgl/glframe.go @@ -3,7 +3,7 @@ package pixelgl import ( "github.com/faiface/glhf" "github.com/faiface/mainthread" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) // GLFrame is a type that helps implementing OpenGL Targets. It implements most common methods to diff --git a/pixelgl/glpicture.go b/pixelgl/glpicture.go index 4a027fe..63a19b2 100644 --- a/pixelgl/glpicture.go +++ b/pixelgl/glpicture.go @@ -5,7 +5,7 @@ import ( "github.com/faiface/glhf" "github.com/faiface/mainthread" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) // GLPicture is a pixel.PictureColor with a Texture. All OpenGL Targets should implement and accept diff --git a/pixelgl/gltriangles.go b/pixelgl/gltriangles.go index 346eb5c..999064e 100644 --- a/pixelgl/gltriangles.go +++ b/pixelgl/gltriangles.go @@ -5,7 +5,7 @@ import ( "github.com/faiface/glhf" "github.com/faiface/mainthread" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) // GLTriangles are OpenGL triangles implemented using glhf.VertexSlice. diff --git a/pixelgl/input.go b/pixelgl/input.go index 7c7c387..4be7cea 100644 --- a/pixelgl/input.go +++ b/pixelgl/input.go @@ -4,7 +4,7 @@ import ( "time" "github.com/faiface/mainthread" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" "github.com/go-gl/glfw/v3.3/glfw" ) diff --git a/pixelgl/util.go b/pixelgl/util.go index d85afd9..b980eae 100644 --- a/pixelgl/util.go +++ b/pixelgl/util.go @@ -3,7 +3,7 @@ package pixelgl import ( "math" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) func intBounds(bounds pixel.Rect) (x, y, w, h int) { diff --git a/pixelgl/window.go b/pixelgl/window.go index 338257d..3c31a9e 100644 --- a/pixelgl/window.go +++ b/pixelgl/window.go @@ -6,7 +6,7 @@ import ( "image/color" "runtime" - pixel "github.com/duysqubix/pixel2" + pixel "github.com/gopxl/pixel2" "github.com/faiface/glhf" "github.com/faiface/mainthread" "github.com/go-gl/gl/v3.3-core/gl" diff --git a/rectangle_test.go b/rectangle_test.go index 0fbb91b..5b6fe17 100644 --- a/rectangle_test.go +++ b/rectangle_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) func TestRect_Resize(t *testing.T) { diff --git a/text/atlas.go b/text/atlas.go index 12ad5ac..a18c3bd 100644 --- a/text/atlas.go +++ b/text/atlas.go @@ -6,7 +6,7 @@ import ( "sort" "unicode" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" "golang.org/x/image/font" "golang.org/x/image/math/fixed" ) diff --git a/text/atlas_test.go b/text/atlas_test.go index 1681304..8ae3f16 100644 --- a/text/atlas_test.go +++ b/text/atlas_test.go @@ -3,7 +3,7 @@ package text_test import ( "testing" - "github.com/duysqubix/pixel2/text" + "github.com/gopxl/pixel2/text" "golang.org/x/image/font/inconsolata" ) diff --git a/text/text.go b/text/text.go index 1e10701..f3a2da9 100644 --- a/text/text.go +++ b/text/text.go @@ -6,7 +6,7 @@ import ( "unicode" "unicode/utf8" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" "golang.org/x/image/font/basicfont" ) diff --git a/text/text_test.go b/text/text_test.go index baf1890..536c267 100644 --- a/text/text_test.go +++ b/text/text_test.go @@ -9,8 +9,8 @@ import ( "golang.org/x/image/font/basicfont" "golang.org/x/image/font/gofont/goregular" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/text" + "github.com/gopxl/pixel2" + "github.com/gopxl/pixel2/text" "github.com/golang/freetype/truetype" ) diff --git a/vector_test.go b/vector_test.go index eba19e9..712c29e 100644 --- a/vector_test.go +++ b/vector_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/duysqubix/pixel2" + "github.com/gopxl/pixel2" ) type floorTest struct { From 890d0fad90d3106cd612938d595a0a48c5e8e14e Mon Sep 17 00:00:00 2001 From: duysqubix Date: Fri, 6 Oct 2023 16:21:40 -0500 Subject: [PATCH 2/3] updated references to original gopxl/pixel for release for a v1 --- circle_test.go | 2 +- color_test.go | 2 +- data_test.go | 2 +- drawer_test.go | 2 +- examples/guide/01_creating_a_window/main.go | 4 ++-- examples/guide/02_drawing_a_sprite/main.go | 4 ++-- .../03_moving_scaling_and_rotating_with_matrix/main.go | 4 ++-- examples/guide/04_pressing_keys_and_clicking_mouse/main.go | 4 ++-- examples/guide/05_drawing_efficiently_with_batch/main.go | 4 ++-- examples/guide/06_drawing_shapes_with_imdraw/main.go | 6 +++--- examples/guide/07_typing_text_on_the_screen/main.go | 6 +++--- examples/lights/main.go | 6 +++--- examples/multiwindows/main.go | 6 +++--- examples/platformer/main.go | 6 +++--- examples/shader/exposure/main.go | 6 +++--- examples/shader/exposure/psutil.go | 4 ++-- examples/shader/fastblur/main.go | 6 +++--- examples/shader/grayscale/main.go | 4 ++-- examples/shader/wavy/main.go | 6 +++--- geometry_test.go | 2 +- go.mod | 2 +- imdraw/imdraw.go | 2 +- imdraw/imdraw_test.go | 4 ++-- line_test.go | 2 +- math_test.go | 2 +- matrix_test.go | 2 +- pixel_test.go | 4 ++-- pixelgl/canvas.go | 2 +- pixelgl/glframe.go | 2 +- pixelgl/glpicture.go | 2 +- pixelgl/gltriangles.go | 2 +- pixelgl/input.go | 2 +- pixelgl/util.go | 2 +- pixelgl/window.go | 2 +- rectangle_test.go | 2 +- text/atlas.go | 2 +- text/atlas_test.go | 2 +- text/text.go | 2 +- text/text_test.go | 4 ++-- vector_test.go | 2 +- 40 files changed, 66 insertions(+), 66 deletions(-) diff --git a/circle_test.go b/circle_test.go index 3dfa8f9..32563a6 100644 --- a/circle_test.go +++ b/circle_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) func TestC(t *testing.T) { diff --git a/color_test.go b/color_test.go index 2de2511..9012d9a 100644 --- a/color_test.go +++ b/color_test.go @@ -5,7 +5,7 @@ import ( "image/color" "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) func BenchmarkColorToRGBA(b *testing.B) { diff --git a/data_test.go b/data_test.go index 415c7e7..f54c2ca 100644 --- a/data_test.go +++ b/data_test.go @@ -3,7 +3,7 @@ package pixel_test import ( "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) func BenchmarkMakeTrianglesData(b *testing.B) { diff --git a/drawer_test.go b/drawer_test.go index 50613eb..ffb4bb8 100644 --- a/drawer_test.go +++ b/drawer_test.go @@ -4,7 +4,7 @@ import ( "image" "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) func BenchmarkSpriteDrawBatch(b *testing.B) { diff --git a/examples/guide/01_creating_a_window/main.go b/examples/guide/01_creating_a_window/main.go index ad9c49d..be73b2c 100644 --- a/examples/guide/01_creating_a_window/main.go +++ b/examples/guide/01_creating_a_window/main.go @@ -1,8 +1,8 @@ package main import ( - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/02_drawing_a_sprite/main.go b/examples/guide/02_drawing_a_sprite/main.go index 6739d5e..f1ce974 100644 --- a/examples/guide/02_drawing_a_sprite/main.go +++ b/examples/guide/02_drawing_a_sprite/main.go @@ -6,8 +6,8 @@ import ( _ "image/png" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/03_moving_scaling_and_rotating_with_matrix/main.go b/examples/guide/03_moving_scaling_and_rotating_with_matrix/main.go index e1a9b5f..f767857 100644 --- a/examples/guide/03_moving_scaling_and_rotating_with_matrix/main.go +++ b/examples/guide/03_moving_scaling_and_rotating_with_matrix/main.go @@ -7,8 +7,8 @@ import ( _ "image/png" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/04_pressing_keys_and_clicking_mouse/main.go b/examples/guide/04_pressing_keys_and_clicking_mouse/main.go index d8a7747..8a327f1 100644 --- a/examples/guide/04_pressing_keys_and_clicking_mouse/main.go +++ b/examples/guide/04_pressing_keys_and_clicking_mouse/main.go @@ -9,8 +9,8 @@ import ( _ "image/png" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/05_drawing_efficiently_with_batch/main.go b/examples/guide/05_drawing_efficiently_with_batch/main.go index e182455..ab2d2a4 100644 --- a/examples/guide/05_drawing_efficiently_with_batch/main.go +++ b/examples/guide/05_drawing_efficiently_with_batch/main.go @@ -10,8 +10,8 @@ import ( _ "image/png" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/06_drawing_shapes_with_imdraw/main.go b/examples/guide/06_drawing_shapes_with_imdraw/main.go index e96a8ef..69ad7a1 100644 --- a/examples/guide/06_drawing_shapes_with_imdraw/main.go +++ b/examples/guide/06_drawing_shapes_with_imdraw/main.go @@ -3,9 +3,9 @@ package main import ( "math" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/imdraw" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" + "github.com/gopxl/pixel/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/guide/07_typing_text_on_the_screen/main.go b/examples/guide/07_typing_text_on_the_screen/main.go index 1c9469a..51df8ce 100644 --- a/examples/guide/07_typing_text_on_the_screen/main.go +++ b/examples/guide/07_typing_text_on_the_screen/main.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" - "github.com/gopxl/pixel2/text" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" + "github.com/gopxl/pixel/text" "github.com/golang/freetype/truetype" "golang.org/x/image/colornames" "golang.org/x/image/font" diff --git a/examples/lights/main.go b/examples/lights/main.go index 0c97745..61cedbd 100644 --- a/examples/lights/main.go +++ b/examples/lights/main.go @@ -9,9 +9,9 @@ import ( _ "image/jpeg" _ "image/png" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/imdraw" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" + "github.com/gopxl/pixel/pixelgl" ) func loadPicture(path string) (pixel.Picture, error) { diff --git a/examples/multiwindows/main.go b/examples/multiwindows/main.go index 635742f..cb2ec82 100644 --- a/examples/multiwindows/main.go +++ b/examples/multiwindows/main.go @@ -3,9 +3,9 @@ package main import ( "fmt" - pixel "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" - "github.com/gopxl/pixel2/text" + pixel "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" + "github.com/gopxl/pixel/text" ) type EasyWindow1 struct { diff --git a/examples/platformer/main.go b/examples/platformer/main.go index 3921e21..4bf2177 100644 --- a/examples/platformer/main.go +++ b/examples/platformer/main.go @@ -13,9 +13,9 @@ import ( _ "image/png" - pixel "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/imdraw" - "github.com/gopxl/pixel2/pixelgl" + pixel "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" + "github.com/gopxl/pixel/pixelgl" "github.com/pkg/errors" "golang.org/x/image/colornames" ) diff --git a/examples/shader/exposure/main.go b/examples/shader/exposure/main.go index 8d23a12..8492490 100644 --- a/examples/shader/exposure/main.go +++ b/examples/shader/exposure/main.go @@ -12,9 +12,9 @@ import ( "math" "time" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/imdraw" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" + "github.com/gopxl/pixel/pixelgl" ) var ( diff --git a/examples/shader/exposure/psutil.go b/examples/shader/exposure/psutil.go index 3657ceb..8fa82e4 100644 --- a/examples/shader/exposure/psutil.go +++ b/examples/shader/exposure/psutil.go @@ -3,8 +3,8 @@ package main import ( "io/ioutil" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" ) // Pixel Shader utility functions diff --git a/examples/shader/fastblur/main.go b/examples/shader/fastblur/main.go index 7b93cd7..eee144a 100644 --- a/examples/shader/fastblur/main.go +++ b/examples/shader/fastblur/main.go @@ -10,9 +10,9 @@ import ( "math" "time" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/imdraw" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" + "github.com/gopxl/pixel/pixelgl" "github.com/go-gl/mathgl/mgl32" ) diff --git a/examples/shader/grayscale/main.go b/examples/shader/grayscale/main.go index 394acff..fd057d9 100644 --- a/examples/shader/grayscale/main.go +++ b/examples/shader/grayscale/main.go @@ -4,8 +4,8 @@ import ( "image/png" "os" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" ) var gopherimg *pixel.Sprite diff --git a/examples/shader/wavy/main.go b/examples/shader/wavy/main.go index 8cdcfe2..d22b073 100644 --- a/examples/shader/wavy/main.go +++ b/examples/shader/wavy/main.go @@ -5,9 +5,9 @@ import ( "os" "time" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/imdraw" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" + "github.com/gopxl/pixel/pixelgl" ) var gopherimg *pixel.Sprite diff --git a/geometry_test.go b/geometry_test.go index e5cb0cc..0978169 100644 --- a/geometry_test.go +++ b/geometry_test.go @@ -3,7 +3,7 @@ package pixel_test import ( "testing" - pixel "github.com/gopxl/pixel2" + pixel "github.com/gopxl/pixel" ) type sub struct { diff --git a/go.mod b/go.mod index e2009c2..4aac57b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/gopxl/pixel2 +module github.com/gopxl/pixel go 1.21 diff --git a/imdraw/imdraw.go b/imdraw/imdraw.go index 571c638..d3021b7 100644 --- a/imdraw/imdraw.go +++ b/imdraw/imdraw.go @@ -6,7 +6,7 @@ import ( "image/color" "math" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) // IMDraw is an immediate-mode-like shape drawer and BasicTarget. IMDraw supports TrianglesPosition, diff --git a/imdraw/imdraw_test.go b/imdraw/imdraw_test.go index c206e08..4b815a4 100644 --- a/imdraw/imdraw_test.go +++ b/imdraw/imdraw_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "testing" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/imdraw" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" ) func BenchmarkPush(b *testing.B) { diff --git a/line_test.go b/line_test.go index 988adfd..628f26d 100644 --- a/line_test.go +++ b/line_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) func TestLine_Bounds(t *testing.T) { diff --git a/math_test.go b/math_test.go index 99252fb..c334d73 100644 --- a/math_test.go +++ b/math_test.go @@ -5,7 +5,7 @@ import ( "math" "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) // closeEnough will shift the decimal point by the accuracy required, truncates the results and compares them. diff --git a/matrix_test.go b/matrix_test.go index 35b2001..d69357f 100644 --- a/matrix_test.go +++ b/matrix_test.go @@ -6,7 +6,7 @@ import ( "math/rand" "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" "github.com/stretchr/testify/assert" ) diff --git a/pixel_test.go b/pixel_test.go index 7e51fcd..6a785d1 100644 --- a/pixel_test.go +++ b/pixel_test.go @@ -8,8 +8,8 @@ import ( _ "image/png" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" ) // onePixelImage is the byte representation of a 1x1 solid white png file diff --git a/pixelgl/canvas.go b/pixelgl/canvas.go index b913e73..992756c 100644 --- a/pixelgl/canvas.go +++ b/pixelgl/canvas.go @@ -6,7 +6,7 @@ import ( "github.com/faiface/glhf" "github.com/faiface/mainthread" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" "github.com/go-gl/mathgl/mgl32" "github.com/pkg/errors" ) diff --git a/pixelgl/glframe.go b/pixelgl/glframe.go index cdca246..d79b56a 100644 --- a/pixelgl/glframe.go +++ b/pixelgl/glframe.go @@ -3,7 +3,7 @@ package pixelgl import ( "github.com/faiface/glhf" "github.com/faiface/mainthread" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) // GLFrame is a type that helps implementing OpenGL Targets. It implements most common methods to diff --git a/pixelgl/glpicture.go b/pixelgl/glpicture.go index 63a19b2..0cf832d 100644 --- a/pixelgl/glpicture.go +++ b/pixelgl/glpicture.go @@ -5,7 +5,7 @@ import ( "github.com/faiface/glhf" "github.com/faiface/mainthread" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) // GLPicture is a pixel.PictureColor with a Texture. All OpenGL Targets should implement and accept diff --git a/pixelgl/gltriangles.go b/pixelgl/gltriangles.go index 999064e..423be13 100644 --- a/pixelgl/gltriangles.go +++ b/pixelgl/gltriangles.go @@ -5,7 +5,7 @@ import ( "github.com/faiface/glhf" "github.com/faiface/mainthread" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) // GLTriangles are OpenGL triangles implemented using glhf.VertexSlice. diff --git a/pixelgl/input.go b/pixelgl/input.go index 4be7cea..01f8f46 100644 --- a/pixelgl/input.go +++ b/pixelgl/input.go @@ -4,7 +4,7 @@ import ( "time" "github.com/faiface/mainthread" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" "github.com/go-gl/glfw/v3.3/glfw" ) diff --git a/pixelgl/util.go b/pixelgl/util.go index b980eae..013e9a3 100644 --- a/pixelgl/util.go +++ b/pixelgl/util.go @@ -3,7 +3,7 @@ package pixelgl import ( "math" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) func intBounds(bounds pixel.Rect) (x, y, w, h int) { diff --git a/pixelgl/window.go b/pixelgl/window.go index 3c31a9e..a94956d 100644 --- a/pixelgl/window.go +++ b/pixelgl/window.go @@ -6,7 +6,7 @@ import ( "image/color" "runtime" - pixel "github.com/gopxl/pixel2" + pixel "github.com/gopxl/pixel" "github.com/faiface/glhf" "github.com/faiface/mainthread" "github.com/go-gl/gl/v3.3-core/gl" diff --git a/rectangle_test.go b/rectangle_test.go index 5b6fe17..e59d44e 100644 --- a/rectangle_test.go +++ b/rectangle_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) func TestRect_Resize(t *testing.T) { diff --git a/text/atlas.go b/text/atlas.go index a18c3bd..023094f 100644 --- a/text/atlas.go +++ b/text/atlas.go @@ -6,7 +6,7 @@ import ( "sort" "unicode" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" "golang.org/x/image/font" "golang.org/x/image/math/fixed" ) diff --git a/text/atlas_test.go b/text/atlas_test.go index 8ae3f16..90e873c 100644 --- a/text/atlas_test.go +++ b/text/atlas_test.go @@ -3,7 +3,7 @@ package text_test import ( "testing" - "github.com/gopxl/pixel2/text" + "github.com/gopxl/pixel/text" "golang.org/x/image/font/inconsolata" ) diff --git a/text/text.go b/text/text.go index f3a2da9..294bea4 100644 --- a/text/text.go +++ b/text/text.go @@ -6,7 +6,7 @@ import ( "unicode" "unicode/utf8" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" "golang.org/x/image/font/basicfont" ) diff --git a/text/text_test.go b/text/text_test.go index 536c267..9f48efb 100644 --- a/text/text_test.go +++ b/text/text_test.go @@ -9,8 +9,8 @@ import ( "golang.org/x/image/font/basicfont" "golang.org/x/image/font/gofont/goregular" - "github.com/gopxl/pixel2" - "github.com/gopxl/pixel2/text" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/text" "github.com/golang/freetype/truetype" ) diff --git a/vector_test.go b/vector_test.go index 712c29e..dd696a9 100644 --- a/vector_test.go +++ b/vector_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/gopxl/pixel2" + "github.com/gopxl/pixel" ) type floorTest struct { From d9dac5907dc33e219568fa6a6de6c7bb558ed90a Mon Sep 17 00:00:00 2001 From: duysqubix Date: Fri, 6 Oct 2023 16:29:46 -0500 Subject: [PATCH 3/3] updated some more references --- CHANGELOG.md | 4 +-- CONTRIBUTING.md | 2 +- README.md | 44 +++++++++++++++--------------- examples/README.md | 2 +- examples/shader/fastblur/psutil.go | 4 +-- examples/smoke/main.go | 4 +-- examples/typewriter/main.go | 8 +++--- examples/xor/main.go | 6 ++-- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4aed752..e594886 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -59,8 +59,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Changelog for this and older versions can be found on the corresponding [GitHub releases](https://github.com/faiface/pixel/releases). -[Unreleased]: https://github.com/duysqubix/pixel2/compare/v0.12.0...HEAD -[v0.12.0]: https://github.com/duysqubix/pixel2/compare/v0.12.0...dev +[Unreleased]: https://github.com/gopxl/pixel/compare/v0.12.0...HEAD +[v0.12.0]: https://github.com/gopxl/pixel/compare/v0.12.0...dev [v0.10.0]: https://github.com/faiface/pixel/compare/v0.10.0-beta...v0.10.0 [v0.10.0-beta]: https://github.com/faiface/pixel/compare/v0.10.0-alpha...v0.10.0-beta [v0.10.0-alpha]: https://github.com/faiface/pixel/compare/v0.9.0...v0.10.0-alpha diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 17cdead..32093f8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,4 +13,4 @@ Go gives you a nice surprise when attempting to make a PR on Github. The thing is, that when user _xyz_ forks Pixel on Github, it ends up in _github.com/xyz/pixel_, which conflicts with your import paths. Here's how you deal with that: https://www.reddit.com/r/golang/comments/2jdcw1/how_do_you_deal_with_github_forking/. -[examples]: https://github.com/duysqubix/pixel2/tree/master/examples/community +[examples]: https://github.com/gopxl/pixel/tree/master/examples/community diff --git a/README.md b/README.md index f46b29d..2201ab4 100644 --- a/README.md +++ b/README.md @@ -5,19 +5,19 @@ Revived fork of the original [Pixel](https://github.com/faiface/pixel) library b

-# Pixel 2 [![Build Status](https://travis-ci.org/faiface/pixel.svg?branch=master)](https://travis-ci.org/faiface/pixel) [![GoDoc](https://godoc.org/github.com/duysqubix/pixel2?status.svg)](https://godoc.org/github.com/duysqubix/pixel2) [![Go Report Card](https://goreportcard.com/badge/github.com/duysqubix/pixel2)](https://goreportcard.com/report/github.com/duysqubix/pixel2) [![Join the chat at https://gitter.im/pixellib/Lobby](https://badges.gitter.im/pixellib/Lobby.svg)](https://gitter.im/pixellib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Discord Chat](https://img.shields.io/discord/699679031603494954)](https://discord.gg/q2DK4MP) +# Pixel 2 [![Build Status](https://travis-ci.org/faiface/pixel.svg?branch=master)](https://travis-ci.org/faiface/pixel) [![GoDoc](https://godoc.org/github.com/gopxl/pixel?status.svg)](https://godoc.org/github.com/gopxl/pixel) [![Go Report Card](https://goreportcard.com/badge/github.com/gopxl/pixel)](https://goreportcard.com/report/github.com/gopxl/pixel) [![Join the chat at https://gitter.im/pixellib/Lobby](https://badges.gitter.im/pixellib/Lobby.svg)](https://gitter.im/pixellib/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Discord Chat](https://img.shields.io/discord/699679031603494954)](https://discord.gg/q2DK4MP) A hand-crafted 2D game library in Go. Take a look into the [features](#features) to see what it can do. ``` -go get github.com/duysqubix/pixel2 +go get github.com/gopxl/pixel ``` If you are using Modules (Go 1.11 or higher) and want a mutable copy of the source code: ``` -git clone https://github.com/duysqubix/pixel2 # clone outside of $GOPATH +git clone https://github.com/gopxl/pixel # clone outside of $GOPATH cd pixel2 go install ./... ``` @@ -28,17 +28,17 @@ Take a look at [CHANGELOG.md](CHANGELOG.md) for upcoming releases and history. ## Tutorial -The [Wiki of this repo](https://github.com/duysqubix/pixel2/wiki) contains an extensive tutorial +The [Wiki of this repo](https://github.com/gopxl/pixel/wiki) contains an extensive tutorial covering several topics of Pixel. Here's the content of the tutorial parts so far: -- [Creating a Window](https://github.com/duysqubix/pixel2/wiki/Creating-a-Window) -- [Drawing a Sprite](https://github.com/duysqubix/pixel2/wiki/Drawing-a-Sprite) -- [Moving, scaling and rotating with Matrix](https://github.com/duysqubix/pixel2/wiki/Moving,-scaling-and-rotating-with-Matrix) -- [Pressing keys and clicking mouse](https://github.com/duysqubix/pixel2/wiki/Pressing-keys-and-clicking-mouse) -- [Drawing efficiently with Batch](https://github.com/duysqubix/pixel2/wiki/Drawing-efficiently-with-Batch) -- [Drawing shapes with IMDraw](https://github.com/duysqubix/pixel2/wiki/Drawing-shapes-with-IMDraw) -- [Typing text on the screen](https://github.com/duysqubix/pixel2/wiki/Typing-text-on-the-screen) -- [Using a custom fragment shader](https://github.com/duysqubix/pixel2/wiki/Using-a-custom-fragment-shader) +- [Creating a Window](https://github.com/gopxl/pixel/wiki/Creating-a-Window) +- [Drawing a Sprite](https://github.com/gopxl/pixel/wiki/Drawing-a-Sprite) +- [Moving, scaling and rotating with Matrix](https://github.com/gopxl/pixel/wiki/Moving,-scaling-and-rotating-with-Matrix) +- [Pressing keys and clicking mouse](https://github.com/gopxl/pixel/wiki/Pressing-keys-and-clicking-mouse) +- [Drawing efficiently with Batch](https://github.com/gopxl/pixel/wiki/Drawing-efficiently-with-Batch) +- [Drawing shapes with IMDraw](https://github.com/gopxl/pixel/wiki/Drawing-shapes-with-IMDraw) +- [Typing text on the screen](https://github.com/gopxl/pixel/wiki/Typing-text-on-the-screen) +- [Using a custom fragment shader](https://github.com/gopxl/pixel/wiki/Using-a-custom-fragment-shader) ## [Examples](https://github.com/faiface/pixel-examples) @@ -77,15 +77,15 @@ Here's the list of the main features in Pixel. Although Pixel is still under hea - Fast 2D graphics - Sprites - Primitive shapes with immediate mode style - [IMDraw](https://github.com/duysqubix/pixel2/wiki/Drawing-shapes-with-IMDraw) (circles, rectangles, + [IMDraw](https://github.com/gopxl/pixel/wiki/Drawing-shapes-with-IMDraw) (circles, rectangles, lines, ...) - - Optimized drawing with [Batch](https://github.com/duysqubix/pixel2/wiki/Drawing-efficiently-with-Batch) - - Text drawing with [text](https://godoc.org/github.com/duysqubix/pixel2/text) package + - Optimized drawing with [Batch](https://github.com/gopxl/pixel/wiki/Drawing-efficiently-with-Batch) + - Text drawing with [text](https://godoc.org/github.com/gopxl/pixel/text) package - Audio through a separate [Beep](https://github.com/faiface/beep) library. - Simple and convenient API - Drawing a sprite to a window is as simple as `sprite.Draw(window, matrix)` - Wanna know where the center of a window is? `window.Bounds().Center()` - - [...](https://godoc.org/github.com/duysqubix/pixel2) + - [...](https://godoc.org/github.com/gopxl/pixel) - Full documentation and tutorial - Works on Linux, macOS and Windows - Window creation and manipulation (resizing, fullscreen, multiple windows, ...) @@ -97,7 +97,7 @@ Here's the list of the main features in Pixel. Although Pixel is still under hea multiplication and a few more features - Pixel uses `float64` throughout the library, compatible with `"math"` package - Geometry transformations with - [Matrix](https://github.com/duysqubix/pixel2/wiki/Moving,-scaling-and-rotating-with-Matrix) + [Matrix](https://github.com/gopxl/pixel/wiki/Moving,-scaling-and-rotating-with-Matrix) - Moving, scaling, rotating - Easy camera implementation - Off-screen drawing to Canvas or any other target (Batch, IMDraw, ...) @@ -107,7 +107,7 @@ Here's the list of the main features in Pixel. Although Pixel is still under hea - Cutting holes into objects - Much more... - Pixel let's you draw stuff and do your job, it doesn't impose any particular style or paradigm -- Platform and backend independent [core](https://godoc.org/github.com/duysqubix/pixel2) +- Platform and backend independent [core](https://godoc.org/github.com/gopxl/pixel) - Core Target/Triangles/Picture pattern makes it easy to create new drawing targets that do arbitrarily crazy stuff (e.g. graphical effects) - Small codebase, ~5K lines of code, including the backend [glhf](https://github.com/faiface/glhf) @@ -141,10 +141,10 @@ possible! ## Requirements If you're using Windows and having trouble building Pixel, please check [this -guide](https://github.com/duysqubix/pixel2/wiki/Building-Pixel-on-Windows) on the -[wiki](https://github.com/duysqubix/pixel2/wiki). +guide](https://github.com/gopxl/pixel/wiki/Building-Pixel-on-Windows) on the +[wiki](https://github.com/gopxl/pixel/wiki). -[PixelGL](https://godoc.org/github.com/duysqubix/pixel2/pixelgl) backend uses OpenGL to render +[PixelGL](https://godoc.org/github.com/gopxl/pixel/pixelgl) backend uses OpenGL to render graphics. Because of that, OpenGL development libraries are needed for compilation. The dependencies are same as for [GLFW](https://github.com/go-gl/glfw). @@ -158,7 +158,7 @@ The OpenGL version used is **OpenGL 3.3**. - See [here](http://www.glfw.org/docs/latest/compile.html#compile_deps) for full details. **The combination of Go 1.8, macOS and latest XCode seems to be problematic** as mentioned in issue -[#7](https://github.com/duysqubix/pixel2/issues/7). This issue is probably not related to Pixel. +[#7](https://github.com/gopxl/pixel/issues/7). This issue is probably not related to Pixel. **Upgrading to Go 1.8.1 fixes the issue.** ## Contributing diff --git a/examples/README.md b/examples/README.md index ae399be..7df2397 100644 --- a/examples/README.md +++ b/examples/README.md @@ -1,6 +1,6 @@ ## Pixel 2 Examples -This repository contains a few examples demonstrating [Pixel2](https://github.com/duysqubix/pixel2)'s functionality. +This repository contains a few examples demonstrating [Pixel2](https://github.com/gopxl/pixel)'s functionality. **To run an example**, navigate to its directory, then `go run` the `main.go` file. For example: diff --git a/examples/shader/fastblur/psutil.go b/examples/shader/fastblur/psutil.go index 0c29e38..8fa82e4 100644 --- a/examples/shader/fastblur/psutil.go +++ b/examples/shader/fastblur/psutil.go @@ -3,8 +3,8 @@ package main import ( "io/ioutil" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" ) // Pixel Shader utility functions diff --git a/examples/smoke/main.go b/examples/smoke/main.go index c58a76a..9296a40 100644 --- a/examples/smoke/main.go +++ b/examples/smoke/main.go @@ -13,8 +13,8 @@ import ( _ "image/png" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/pixelgl" "golang.org/x/image/colornames" ) diff --git a/examples/typewriter/main.go b/examples/typewriter/main.go index 2e12bcc..ce32bdc 100644 --- a/examples/typewriter/main.go +++ b/examples/typewriter/main.go @@ -8,10 +8,10 @@ import ( "time" "unicode" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" - "github.com/duysqubix/pixel2/pixelgl" - "github.com/duysqubix/pixel2/text" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" + "github.com/gopxl/pixel/pixelgl" + "github.com/gopxl/pixel/text" "github.com/golang/freetype/truetype" "golang.org/x/image/colornames" "golang.org/x/image/font" diff --git a/examples/xor/main.go b/examples/xor/main.go index 252ae37..2a1591d 100644 --- a/examples/xor/main.go +++ b/examples/xor/main.go @@ -4,9 +4,9 @@ import ( "math" "time" - "github.com/duysqubix/pixel2" - "github.com/duysqubix/pixel2/imdraw" - "github.com/duysqubix/pixel2/pixelgl" + "github.com/gopxl/pixel" + "github.com/gopxl/pixel/imdraw" + "github.com/gopxl/pixel/pixelgl" "golang.org/x/image/colornames" )