Merge branch 'update_dependencies'

Updated to latest modules and other depdendencies.
See repo site for more information.

cmd/gobc/gobc.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	// putils "github.com/dusk125/pixelutils"
-	"github.com/gopxl/pixel/v2/pixelgl"
+	pixelgl "github.com/gopxl/pixel/v2/backends/opengl"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 

go.mod

@@ -1,10 +1,10 @@
 module github.com/duysqubix/gobc
 
-go 1.21.0
+go 1.23.0
 
 require (
 	github.com/chigopher/pathlib v0.15.0
-	github.com/gopxl/pixel/v2 v2.0.0-20231009002706-2b64a9e94b34
+	github.com/gopxl/pixel/v2 v2.2.0
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/afero v1.10.0
@@ -14,11 +14,11 @@ require (
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
-	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-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/gopxl/glhf/v2 v2.0.0 // indirect
+	github.com/gopxl/mainthread/v2 v2.0.0 // indirect
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect

go.sum

@@ -59,20 +59,13 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m
 github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-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/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-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-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-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 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=
@@ -131,8 +124,12 @@ github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gopxl/pixel/v2 v2.0.0-20231009002706-2b64a9e94b34 h1:842yRCDZQffK0JaR+0OSLs2WKXPNy6RgQS8bJniEakM=
-github.com/gopxl/pixel/v2 v2.0.0-20231009002706-2b64a9e94b34/go.mod h1:puouaRVeB1S5xO1Fl8PHm7SqFRwbuQRfnxme/iXOJy0=
+github.com/gopxl/glhf/v2 v2.0.0 h1:SJtNy+TXuTBRjMersNx722VDJ0XHIooMH2+7+99LPIc=
+github.com/gopxl/glhf/v2 v2.0.0/go.mod h1:InKwj5OoVdOAkpzsS0ILwpB+RrWBLw1i7aFefiGmrp8=
+github.com/gopxl/mainthread/v2 v2.0.0 h1:jRbeWFzX6/UyhRab00xS3xIVYywBgc0DgwPgwS6EVYw=
+github.com/gopxl/mainthread/v2 v2.0.0/go.mod h1:/uFQhUiSP53SSU/RQ5w0FFkljRArJlaQkDPza3zE2V8=
+github.com/gopxl/pixel/v2 v2.2.0 h1:vI03uykcvLcW4rxZJ4DbbWjY4oZeEBDs6ZqCp4eba2g=
+github.com/gopxl/pixel/v2 v2.2.0/go.mod h1:CW+IT9K0F1N3govjPTWmh3DHcF28nHPjvsF3oFDCJ9U=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

internal/windows/cartview.go

@@ -6,8 +6,8 @@ import (
 	"github.com/duysqubix/gobc/internal"
 	"github.com/duysqubix/gobc/internal/cartridge"
 	pixel "github.com/gopxl/pixel/v2"
-	"github.com/gopxl/pixel/v2/pixelgl"
-	"github.com/gopxl/pixel/v2/text"
+	pixelgl "github.com/gopxl/pixel/v2/backends/opengl"
+	"github.com/gopxl/pixel/v2/ext/text"
 	"github.com/olekukonko/tablewriter"
 	"golang.org/x/image/colornames"
 	"golang.org/x/image/font/basicfont"
@@ -98,30 +98,30 @@ func (mw *CartViewWindow) Finalize() {
 func (mw *CartViewWindow) Update() error {
 	maxYOffset := float64(int(cartridge.RAM_BANK_SIZE-1)-(cartMaxRows-cartAddrOffset-1)*0x10) / float64(0x10)
 
-	if mw.Window.JustPressed(pixelgl.KeyRight) || mw.Window.Repeated(pixelgl.KeyRight) {
+	if mw.Window.JustPressed(pixel.KeyRight) || mw.Window.Repeated(pixel.KeyRight) {
 		mw.YOffset += float64(cartMaxRows) - float64(cartAddrOffset) - 1
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyUp) || mw.Window.Repeated(pixelgl.KeyUp) {
+	if mw.Window.JustPressed(pixel.KeyUp) || mw.Window.Repeated(pixel.KeyUp) {
 		mw.YOffset -= 1
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyLeft) || mw.Window.Repeated(pixelgl.KeyLeft) {
+	if mw.Window.JustPressed(pixel.KeyLeft) || mw.Window.Repeated(pixel.KeyLeft) {
 		mw.YOffset -= float64(cartMaxRows) - float64(cartAddrOffset) - 1
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyDown) || mw.Window.Repeated(pixelgl.KeyDown) {
+	if mw.Window.JustPressed(pixel.KeyDown) || mw.Window.Repeated(pixel.KeyDown) {
 		mw.YOffset += 1
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyRightBracket) || mw.Window.Repeated(pixelgl.KeyRightBracket) {
+	if mw.Window.JustPressed(pixel.KeyRightBracket) || mw.Window.Repeated(pixel.KeyRightBracket) {
 		cartRambank++
 		if cartRambank >= 16 {
 			cartRambank = 0
 		}
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyLeftBracket) || mw.Window.Repeated(pixelgl.KeyLeftBracket) {
+	if mw.Window.JustPressed(pixel.KeyLeftBracket) || mw.Window.Repeated(pixel.KeyLeftBracket) {
 		cartRambank--
 		if cartRambank < 0 {
 			cartRambank = 15

internal/windows/cpuview.go

@@ -6,8 +6,8 @@ import (
 	"github.com/duysqubix/gobc/internal"
 	"github.com/duysqubix/gobc/internal/motherboard"
 	pixel "github.com/gopxl/pixel/v2"
-	"github.com/gopxl/pixel/v2/pixelgl"
-	"github.com/gopxl/pixel/v2/text"
+	pixelgl "github.com/gopxl/pixel/v2/backends/opengl"
+	"github.com/gopxl/pixel/v2/ext/text"
 	"github.com/olekukonko/tablewriter"
 	"golang.org/x/image/colornames"
 	"golang.org/x/image/font/basicfont"

internal/windows/ioview.go

@@ -7,8 +7,8 @@ import (
 	"github.com/duysqubix/gobc/internal"
 	"github.com/duysqubix/gobc/internal/motherboard"
 	"github.com/gopxl/pixel/v2"
-	"github.com/gopxl/pixel/v2/pixelgl"
-	"github.com/gopxl/pixel/v2/text"
+	pixelgl "github.com/gopxl/pixel/v2/backends/opengl"
+	"github.com/gopxl/pixel/v2/ext/text"
 	"github.com/olekukonko/tablewriter"
 	"golang.org/x/image/colornames"
 	"golang.org/x/image/font/basicfont"

internal/windows/mainview.go

@@ -8,9 +8,9 @@ import (
 	"github.com/duysqubix/gobc/internal"
 	"github.com/duysqubix/gobc/internal/motherboard"
 	pixel "github.com/gopxl/pixel/v2"
-	"github.com/gopxl/pixel/v2/imdraw"
-	"github.com/gopxl/pixel/v2/pixelgl"
-	"github.com/gopxl/pixel/v2/text"
+	"github.com/gopxl/pixel/v2/ext/imdraw"
+	pixelgl "github.com/gopxl/pixel/v2/backends/opengl"
+	"github.com/gopxl/pixel/v2/ext/text"
 	"github.com/spf13/afero"
 	"golang.org/x/image/colornames"
 	"golang.org/x/image/font/basicfont"
@@ -56,7 +56,7 @@ func (mw *MainGameWindow) SetUp() {
 }
 
 func (mw *MainGameWindow) handleInput() {
-	if mw.Window.JustPressed(pixelgl.KeyR) || mw.Window.Repeated(pixelgl.KeyR) {
+	if mw.Window.JustPressed(pixel.KeyR) || mw.Window.Repeated(pixel.KeyR) {
 		mw.hw.Reset()
 	}
 

internal/windows/mainview_input.go

@@ -6,7 +6,7 @@ import (
 	"github.com/duysqubix/gobc/internal"
 	"github.com/duysqubix/gobc/internal/cartridge"
 	"github.com/duysqubix/gobc/internal/motherboard"
-	"github.com/gopxl/pixel/v2/pixelgl"
+	pixelgl "github.com/gopxl/pixel/v2"
 )
 
 func (mw *MainGameWindow) _handleDebugInput() {

internal/windows/memoryview.go

@@ -6,8 +6,8 @@ import (
 	"github.com/duysqubix/gobc/internal"
 	"github.com/duysqubix/gobc/internal/motherboard"
 	pixel "github.com/gopxl/pixel/v2"
-	"github.com/gopxl/pixel/v2/pixelgl"
-	"github.com/gopxl/pixel/v2/text"
+	pixelgl "github.com/gopxl/pixel/v2/backends/opengl"
+	"github.com/gopxl/pixel/v2/ext/text"
 	"github.com/olekukonko/tablewriter"
 	"golang.org/x/image/colornames"
 	"golang.org/x/image/font/basicfont"
@@ -107,19 +107,19 @@ func (mw *MemoryViewWindow) Update() error {
 
 	maxYOffset := float64(0xffff-(max_rows-addr_offset-1)*0x10) / float64(0x10)
 
-	if mw.Window.JustPressed(pixelgl.KeyRight) || mw.Window.Repeated(pixelgl.KeyRight) {
+	if mw.Window.JustPressed(pixel.KeyRight) || mw.Window.Repeated(pixel.KeyRight) {
 		mw.YOffset += float64(max_rows) - float64(addr_offset) - 1
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyUp) || mw.Window.Repeated(pixelgl.KeyUp) {
+	if mw.Window.JustPressed(pixel.KeyUp) || mw.Window.Repeated(pixel.KeyUp) {
 		mw.YOffset -= 1
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyLeft) || mw.Window.Repeated(pixelgl.KeyLeft) {
+	if mw.Window.JustPressed(pixel.KeyLeft) || mw.Window.Repeated(pixel.KeyLeft) {
 		mw.YOffset -= float64(max_rows) - float64(addr_offset) - 1
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyDown) || mw.Window.Repeated(pixelgl.KeyDown) {
+	if mw.Window.JustPressed(pixel.KeyDown) || mw.Window.Repeated(pixel.KeyDown) {
 		mw.YOffset += 1
 	}
 

internal/windows/vramview.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/duysqubix/gobc/internal"
 	pixel "github.com/gopxl/pixel/v2"
-	"github.com/gopxl/pixel/v2/imdraw"
-	"github.com/gopxl/pixel/v2/pixelgl"
-	"github.com/gopxl/pixel/v2/text"
+	"github.com/gopxl/pixel/v2/ext/imdraw"
+	pixelgl "github.com/gopxl/pixel/v2/backends/opengl"
+	"github.com/gopxl/pixel/v2/ext/text"
 
 	"golang.org/x/image/colornames"
 	"golang.org/x/image/font/basicfont"
@@ -125,23 +125,23 @@ var tileAddressingMode uint16
 
 func (mw *VramViewWindow) Update() error {
 
-	if mw.Window.JustPressed(pixelgl.KeyT) || mw.Window.Repeated(pixelgl.KeyT) {
+	if mw.Window.JustPressed(pixel.KeyT) || mw.Window.Repeated(pixel.KeyT) {
 		internal.ToggleBit(&vramTileAddressingMode, 0)
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyB) || mw.Window.Repeated(pixelgl.KeyB) {
+	if mw.Window.JustPressed(pixel.KeyB) || mw.Window.Repeated(pixel.KeyB) {
 		internal.ToggleBit(&vramBgAddressingMode, 0)
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyG) || mw.Window.Repeated(pixelgl.KeyG) {
+	if mw.Window.JustPressed(pixel.KeyG) || mw.Window.Repeated(pixel.KeyG) {
 		vramShowGrid = !vramShowGrid
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyH) || mw.Window.Repeated(pixelgl.KeyH) {
+	if mw.Window.JustPressed(pixel.KeyH) || mw.Window.Repeated(pixel.KeyH) {
 		vramShowHelp = !vramShowHelp
 	}
 
-	if mw.Window.JustPressed(pixelgl.KeyV) || mw.Window.Repeated(pixelgl.KeyV) {
+	if mw.Window.JustPressed(pixel.KeyV) || mw.Window.Repeated(pixel.KeyV) {
 		vramTileDataBank = (vramTileDataBank + 1) % 2
 	}
 

internal/windows/windows.go

@@ -6,7 +6,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gopxl/pixel/v2/pixelgl"
+	pixelgl "github.com/gopxl/pixel/v2/backends/opengl"
 	"github.com/urfave/cli/v2"
 )