From bf515bb594f9ab5098bab5d6e6f51e6a0a319edf Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sun, 4 Oct 2020 02:35:13 +0900 Subject: [PATCH] Update version to v2.0.0-alpha --- .travis.yml | 97 ------------------- audio/audio_test.go | 2 +- audio/context.go | 2 +- audio/internal/convert/float32_test.go | 2 +- audio/internal/convert/resampling_test.go | 4 +- audio/internal/convert/stereo16.go | 2 +- audio/loop_test.go | 2 +- audio/mp3/decode_gopherjs.go | 2 +- audio/mp3/decode_notgopherjs.go | 4 +- audio/vorbis/vorbis.go | 4 +- audio/vorbis/vorbis_gopherjs.go | 4 +- audio/vorbis/vorbis_notgopherjs.go | 2 +- audio/vorbis/vorbis_test.go | 4 +- audio/wav/decode.go | 4 +- cmd/ebitenmobile/main.go | 2 +- colorm.go | 2 +- colorm_test.go | 2 +- cursormode.go | 2 +- ebitenutil/debugprint.go | 4 +- ebitenutil/gif.go | 2 +- ebitenutil/loadimage.go | 2 +- ebitenutil/shapes.go | 4 +- ebitenutil/url.go | 2 +- examples/2048/2048/board.go | 2 +- examples/2048/2048/game.go | 2 +- examples/2048/2048/input.go | 4 +- examples/2048/2048/tile.go | 6 +- examples/2048/2048/tile_test.go | 2 +- examples/2048/main.go | 4 +- examples/additive/main.go | 4 +- examples/address/main.go | 6 +- examples/airship/main.go | 6 +- examples/alphablending/main.go | 4 +- examples/animation/main.go | 4 +- examples/audio/main.go | 16 +-- examples/audioinfiniteloop/main.go | 10 +- examples/audiopanning/main.go | 12 +-- examples/blocks/blocks/field.go | 2 +- examples/blocks/blocks/font.go | 6 +- examples/blocks/blocks/game.go | 2 +- examples/blocks/blocks/gamepad.go | 4 +- examples/blocks/blocks/gamepadscene.go | 4 +- examples/blocks/blocks/gamescene.go | 8 +- examples/blocks/blocks/input.go | 4 +- examples/blocks/blocks/piece.go | 4 +- examples/blocks/blocks/scenemanager.go | 2 +- examples/blocks/blocks/titlescene.go | 6 +- examples/blocks/main.go | 4 +- examples/blur/main.go | 6 +- examples/camera/main.go | 8 +- examples/chipmunk/main.go | 4 +- examples/contextlost/main.go | 8 +- examples/doomfire/main.go | 2 +- examples/drag/main.go | 8 +- examples/filter/main.go | 6 +- examples/flappy/main.go | 20 ++-- examples/flood/main.go | 4 +- examples/font/main.go | 6 +- examples/fullscreen/main.go | 8 +- examples/gamepad/main.go | 6 +- examples/highdpi/main.go | 4 +- examples/hsv/main.go | 8 +- examples/hue/main.go | 4 +- examples/infinitescroll/main.go | 6 +- examples/keyboard/keyboard/gen.go | 6 +- examples/keyboard/keyboard/keyrects.go | 2 +- examples/keyboard/main.go | 8 +- examples/life/main.go | 2 +- examples/mandelbrot/main.go | 2 +- examples/mascot/main.go | 4 +- examples/masking/main.go | 4 +- examples/minify/main.go | 8 +- examples/moire/main.go | 4 +- examples/mosaic/main.go | 4 +- examples/noise/main.go | 4 +- examples/paint/main.go | 4 +- examples/particles/main.go | 6 +- examples/pcm/main.go | 6 +- examples/perspective/main.go | 4 +- examples/piano/main.go | 12 +-- examples/platformer/main.go | 8 +- examples/polygons/main.go | 6 +- examples/raycasting/main.go | 8 +- examples/rotate/main.go | 4 +- examples/set/main.go | 4 +- examples/shader/main.go | 8 +- examples/shapes/main.go | 4 +- examples/sinewave/main.go | 6 +- examples/snake/main.go | 6 +- examples/sprites/main.go | 8 +- examples/spriteshd/main.go | 10 +- examples/squiral/main.go | 6 +- examples/text/main.go | 8 +- examples/tiles/main.go | 8 +- examples/typewriter/main.go | 6 +- examples/ui/main.go | 8 +- examples/vector/main.go | 6 +- examples/wav/main.go | 10 +- examples/wheel/main.go | 4 +- examples/windowsize/main.go | 8 +- gamepad.go | 2 +- genevents.go | 2 +- genkeys.go | 14 +-- geom_test.go | 2 +- go.mod | 2 +- graphics.go | 2 +- image.go | 6 +- image_test.go | 10 +- imagedumper_desktop.go | 2 +- imagetobytes_test.go | 2 +- init.go | 6 +- input.go | 2 +- inpututil/inpututil.go | 4 +- internal/affine/colorm_test.go | 2 +- internal/buffered/image.go | 10 +- internal/buffered/image_test.go | 2 +- internal/colormcache/cache.go | 2 +- internal/devicescale/cinnamon_unix.go | 2 +- internal/driver/graphics.go | 8 +- internal/graphics/math_test.go | 2 +- internal/graphics/vertex.go | 2 +- internal/graphicscommand/command.go | 8 +- internal/graphicscommand/image.go | 8 +- internal/graphicscommand/image_test.go | 8 +- internal/graphicscommand/shader.go | 4 +- internal/graphicsdriver/metal/ca/ca.go | 2 +- internal/graphicsdriver/metal/graphics.go | 14 +-- .../graphicsdriver/metal/mtl/example_test.go | 2 +- internal/graphicsdriver/metal/mtl/mtl_test.go | 2 +- internal/graphicsdriver/metal/ns/ns.go | 2 +- internal/graphicsdriver/metal/shader.go | 8 +- internal/graphicsdriver/metal/view.go | 4 +- internal/graphicsdriver/metal/view_ios.go | 2 +- internal/graphicsdriver/metal/view_macos.go | 4 +- internal/graphicsdriver/opengl/context.go | 4 +- .../graphicsdriver/opengl/context_desktop.go | 6 +- internal/graphicsdriver/opengl/context_js.go | 8 +- .../graphicsdriver/opengl/context_mobile.go | 4 +- internal/graphicsdriver/opengl/context_x.go | 2 +- .../graphicsdriver/opengl/defaultshader.go | 2 +- internal/graphicsdriver/opengl/graphics.go | 10 +- internal/graphicsdriver/opengl/image.go | 4 +- internal/graphicsdriver/opengl/program.go | 8 +- internal/graphicsdriver/opengl/shader.go | 6 +- internal/jsutil/jsutil_test.go | 2 +- internal/mipmap/mipmap.go | 10 +- internal/packing/packing_test.go | 2 +- internal/restorable/image.go | 8 +- internal/restorable/images.go | 4 +- internal/restorable/images_test.go | 8 +- internal/restorable/rect.go | 2 +- internal/restorable/shader.go | 4 +- internal/restorable/shader_test.go | 8 +- internal/shader/expr.go | 2 +- internal/shader/shader.go | 2 +- internal/shader/shader_test.go | 6 +- internal/shader/stmt.go | 2 +- internal/shader/type.go | 2 +- internal/shaderir/glsl/glsl.go | 2 +- internal/shaderir/glsl/type.go | 2 +- internal/shaderir/ir_test.go | 6 +- internal/shaderir/metal/metal.go | 2 +- internal/shaderir/metal/type.go | 2 +- internal/shareable/image.go | 12 +-- internal/shareable/image_test.go | 8 +- internal/shareable/shader.go | 4 +- internal/testing/shader.go | 4 +- internal/testing/testing.go | 4 +- internal/uidriver/glfw/graphics_darwin.go | 8 +- internal/uidriver/glfw/graphics_opengl.go | 4 +- internal/uidriver/glfw/input.go | 4 +- internal/uidriver/glfw/keys.go | 4 +- internal/uidriver/glfw/ui.go | 10 +- internal/uidriver/glfw/ui_darwin.go | 2 +- internal/uidriver/glfw/ui_unix.go | 2 +- internal/uidriver/glfw/ui_windows.go | 2 +- internal/uidriver/glfw/window.go | 2 +- internal/uidriver/js/input.go | 4 +- internal/uidriver/js/keys.go | 2 +- internal/uidriver/js/ui.go | 12 +-- internal/uidriver/mobile/graphics_ios.go | 6 +- internal/uidriver/mobile/graphics_opengl.go | 4 +- internal/uidriver/mobile/input.go | 2 +- internal/uidriver/mobile/keys.go | 2 +- internal/uidriver/mobile/ui.go | 12 +-- keys.go | 2 +- mobile/compat.go | 8 +- mobile/ebitenmobileview/impl_metal.go | 2 +- mobile/ebitenmobileview/input.go | 4 +- mobile/ebitenmobileview/input_android.go | 4 +- mobile/ebitenmobileview/keys_android.go | 2 +- mobile/ebitenmobileview/mobile.go | 6 +- mobile/impl_mobile.go | 2 +- mobile/mobile.go | 2 +- mousebuttons.go | 2 +- run.go | 6 +- shader.go | 8 +- shader_test.go | 2 +- text/text.go | 4 +- text/text_test.go | 6 +- uicontext.go | 8 +- uidriver_glfw.go | 4 +- uidriver_js.go | 4 +- uidriver_mobile.go | 4 +- .../internal/triangulate/triangulate_test.go | 2 +- vector/path.go | 4 +- 206 files changed, 498 insertions(+), 595 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bab06af2c..000000000 --- a/.travis.yml +++ /dev/null @@ -1,97 +0,0 @@ -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - libasound2-dev - - libgl1-mesa-dev - - libalut-dev - - libxcursor-dev - - libxi-dev - - libxinerama-dev - - libxrandr-dev - - libxxf86vm-dev - chrome: stable - -services: - - xvfb - -install: - # Install Go 1.15.2 manualy - # See https://travis-ci.community/t/goos-js-goarch-wasm-go-run-fails-panic-newosproc-not-implemented/1651 - - wget -O go.tar.gz https://dl.google.com/go/go1.15.2.linux-amd64.tar.gz - - tar -C ~ -xzf go.tar.gz - - rm go.tar.gz - - export GOROOT=~/go - - export GOPATH=/home/travis/gopath - - export PATH=$GOROOT/bin:$PATH - - go version - - go env - - # Install Go 1.12.16 - - go get golang.org/dl/go1.12.16 - - go1.12.16 download - - # Make the working directory - - mkdir /tmp/work - - cd /tmp/work - - go mod init example.com/m - - go get github.com/hajimehoshi/ebiten - - wget -O ebiten.zip https://github.com/$TRAVIS_REPO_SLUG/archive/$TRAVIS_COMMIT.zip - - unzip ebiten.zip - - mv ./ebiten-$TRAVIS_COMMIT ebiten - - go mod edit -replace=github.com/hajimehoshi/ebiten=./ebiten - - # wasmbrowsertest - - GO111MODULE=off go get github.com/agnivade/wasmbrowsertest - - mv $GOPATH/bin/wasmbrowsertest $GOPATH/bin/go_js_wasm_exec - - # GopherJS - - GO111MODULE=off go1.12.16 get github.com/gopherjs/gopherjs - - mkdir -p $GOPATH/src/github.com/hajimehoshi - - cd $GOPATH/src/github.com/hajimehoshi - - unzip /tmp/work/ebiten.zip - - mv ./ebiten-$TRAVIS_COMMIT ebiten - - cd ./ebiten - - GO111MODULE=off go get -d -tags=example ./... - - cd /tmp/work - - # gjbt - - GO111MODULE=off go1.12.16 get myitcv.io/cmd/gjbt - - # Chrome - - mkdir /tmp/google-chrome-bin - - ln -s /usr/bin/google-chrome-stable /tmp/google-chrome-bin/google-chrome - - export PATH=/tmp/google-chrome-bin:$PATH - - curl -s https://chromedriver.storage.googleapis.com/2.38/chromedriver_linux64.zip > /tmp/chromedriver_linux64.zip - - unzip -d /tmp/chromedriver_linux64 /tmp/chromedriver_linux64.zip - - export PATH=/tmp/chromedriver_linux64:$PATH - -before_script: - - export DISPLAY=:99.0 - -script: - - cd /tmp/work - - # go vet - - go vet -tags=example -v github.com/hajimehoshi/ebiten/... - - # go build - - go build -tags=example -v github.com/hajimehoshi/ebiten/... - - GOOS=windows GOARCH=amd64 go build -tags=example -v github.com/hajimehoshi/ebiten/... - - GOOS=windows GOARCH=386 go build -tags=example -v github.com/hajimehoshi/ebiten/... - - # go test - - go test -v github.com/hajimehoshi/ebiten/... - - GOOS=js GOARCH=wasm go test -v github.com/hajimehoshi/ebiten/... - - # GopherJS - - GO111MODULE=off go1.12.16 run github.com/gopherjs/gopherjs build --tags=example -v github.com/hajimehoshi/ebiten/examples/blocks - - GO111MODULE=off go1.12.16 run myitcv.io/cmd/gjbt github.com/hajimehoshi/ebiten # TODO: Test the subdirectories - -# - test -z $(gofmt -s -l $GOPATH/src/github.com/hajimehoshi/ebiten) - -notifications: - email: - recipients: - - hajimehoshi@gmail.com diff --git a/audio/audio_test.go b/audio/audio_test.go index f901edede..910a3d266 100644 --- a/audio/audio_test.go +++ b/audio/audio_test.go @@ -19,7 +19,7 @@ import ( "testing" "time" - . "github.com/hajimehoshi/ebiten/audio" + . "github.com/hajimehoshi/ebiten/v2/audio" ) var context *Context diff --git a/audio/context.go b/audio/context.go index db77547dd..cde6b62a5 100644 --- a/audio/context.go +++ b/audio/context.go @@ -18,7 +18,7 @@ import ( "io" "sync" - "github.com/hajimehoshi/ebiten/internal/hooks" + "github.com/hajimehoshi/ebiten/v2/internal/hooks" ) type context interface { diff --git a/audio/internal/convert/float32_test.go b/audio/internal/convert/float32_test.go index ee0f67263..6473812c2 100644 --- a/audio/internal/convert/float32_test.go +++ b/audio/internal/convert/float32_test.go @@ -20,7 +20,7 @@ import ( "math" "testing" - . "github.com/hajimehoshi/ebiten/audio/internal/convert" + . "github.com/hajimehoshi/ebiten/v2/audio/internal/convert" ) type f32reader struct { diff --git a/audio/internal/convert/resampling_test.go b/audio/internal/convert/resampling_test.go index 7282b55f8..e5c8c9cc9 100644 --- a/audio/internal/convert/resampling_test.go +++ b/audio/internal/convert/resampling_test.go @@ -19,8 +19,8 @@ import ( "math" "testing" - "github.com/hajimehoshi/ebiten/audio" - . "github.com/hajimehoshi/ebiten/audio/internal/convert" + "github.com/hajimehoshi/ebiten/v2/audio" + . "github.com/hajimehoshi/ebiten/v2/audio/internal/convert" ) func soundAt(timeInSecond float64) float64 { diff --git a/audio/internal/convert/stereo16.go b/audio/internal/convert/stereo16.go index ba3695e42..655b8413f 100644 --- a/audio/internal/convert/stereo16.go +++ b/audio/internal/convert/stereo16.go @@ -17,7 +17,7 @@ package convert import ( "io" - "github.com/hajimehoshi/ebiten/audio" + "github.com/hajimehoshi/ebiten/v2/audio" ) type Stereo16 struct { diff --git a/audio/loop_test.go b/audio/loop_test.go index 413716fbe..6e7b79598 100644 --- a/audio/loop_test.go +++ b/audio/loop_test.go @@ -19,7 +19,7 @@ import ( "math" "testing" - . "github.com/hajimehoshi/ebiten/audio" + . "github.com/hajimehoshi/ebiten/v2/audio" ) func TestInfiniteLoop(t *testing.T) { diff --git a/audio/mp3/decode_gopherjs.go b/audio/mp3/decode_gopherjs.go index 07ea8dc4a..42f35aad8 100644 --- a/audio/mp3/decode_gopherjs.go +++ b/audio/mp3/decode_gopherjs.go @@ -26,7 +26,7 @@ import ( "syscall/js" "time" - "github.com/hajimehoshi/ebiten/audio" + "github.com/hajimehoshi/ebiten/v2/audio" ) // TODO: This just uses decodeAudioData, that can treat audio files other than MP3. diff --git a/audio/mp3/decode_notgopherjs.go b/audio/mp3/decode_notgopherjs.go index 9a9982605..90b517355 100644 --- a/audio/mp3/decode_notgopherjs.go +++ b/audio/mp3/decode_notgopherjs.go @@ -26,8 +26,8 @@ import ( "github.com/hajimehoshi/go-mp3" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/internal/convert" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/internal/convert" ) // Stream is a decoded stream. diff --git a/audio/vorbis/vorbis.go b/audio/vorbis/vorbis.go index 852947877..a6375eabf 100644 --- a/audio/vorbis/vorbis.go +++ b/audio/vorbis/vorbis.go @@ -20,8 +20,8 @@ import ( "io" "runtime" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/internal/convert" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/internal/convert" ) // Stream is a decoded audio stream. diff --git a/audio/vorbis/vorbis_gopherjs.go b/audio/vorbis/vorbis_gopherjs.go index d18d66161..d7db48822 100644 --- a/audio/vorbis/vorbis_gopherjs.go +++ b/audio/vorbis/vorbis_gopherjs.go @@ -20,8 +20,8 @@ package vorbis import ( "io/ioutil" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/vorbis/internal/stb" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/vorbis/internal/stb" ) type decoderImpl struct { diff --git a/audio/vorbis/vorbis_notgopherjs.go b/audio/vorbis/vorbis_notgopherjs.go index 239a002f1..04ba5c1de 100644 --- a/audio/vorbis/vorbis_notgopherjs.go +++ b/audio/vorbis/vorbis_notgopherjs.go @@ -19,7 +19,7 @@ package vorbis import ( "github.com/jfreymuth/oggvorbis" - "github.com/hajimehoshi/ebiten/audio" + "github.com/hajimehoshi/ebiten/v2/audio" ) func newDecoder(in audio.ReadSeekCloser) (decoder, error) { diff --git a/audio/vorbis/vorbis_test.go b/audio/vorbis/vorbis_test.go index db1846de8..fe143cbee 100644 --- a/audio/vorbis/vorbis_test.go +++ b/audio/vorbis/vorbis_test.go @@ -19,8 +19,8 @@ import ( "github.com/jfreymuth/oggvorbis" - "github.com/hajimehoshi/ebiten/audio" - . "github.com/hajimehoshi/ebiten/audio/vorbis" + "github.com/hajimehoshi/ebiten/v2/audio" + . "github.com/hajimehoshi/ebiten/v2/audio/vorbis" ) var audioContext *audio.Context diff --git a/audio/wav/decode.go b/audio/wav/decode.go index 898481377..8159a7ab4 100644 --- a/audio/wav/decode.go +++ b/audio/wav/decode.go @@ -21,8 +21,8 @@ import ( "io" "runtime" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/internal/convert" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/internal/convert" ) // Stream is a decoded audio stream. diff --git a/cmd/ebitenmobile/main.go b/cmd/ebitenmobile/main.go index 5d0fe9130..4b0fa666a 100644 --- a/cmd/ebitenmobile/main.go +++ b/cmd/ebitenmobile/main.go @@ -183,7 +183,7 @@ func doBind(args []string, flagset *flag.FlagSet, buildOS string) error { prefixLower := bindPrefix + pkgs[0].Name prefixUpper := strings.Title(bindPrefix) + strings.Title(pkgs[0].Name) - args = append(args, "github.com/hajimehoshi/ebiten/mobile/ebitenmobileview") + args = append(args, "github.com/hajimehoshi/ebiten/v2/mobile/ebitenmobileview") if buildO == "" { fmt.Fprintln(os.Stderr, "-o must be specified.") diff --git a/colorm.go b/colorm.go index 03af81136..9daa5d1fa 100644 --- a/colorm.go +++ b/colorm.go @@ -19,7 +19,7 @@ import ( "image/color" - "github.com/hajimehoshi/ebiten/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/affine" ) // ColorMDim is a dimension of a ColorM. diff --git a/colorm_test.go b/colorm_test.go index 40e995816..a331a3c5e 100644 --- a/colorm_test.go +++ b/colorm_test.go @@ -19,7 +19,7 @@ import ( "math" "testing" - . "github.com/hajimehoshi/ebiten" + . "github.com/hajimehoshi/ebiten/v2" ) func TestColorMInit(t *testing.T) { diff --git a/cursormode.go b/cursormode.go index 4ca60b677..8c53c4bb8 100644 --- a/cursormode.go +++ b/cursormode.go @@ -14,7 +14,7 @@ package ebiten -import "github.com/hajimehoshi/ebiten/internal/driver" +import "github.com/hajimehoshi/ebiten/v2/internal/driver" // A CursorModeType represents // a render and coordinate mode of a mouse cursor. diff --git a/ebitenutil/debugprint.go b/ebitenutil/debugprint.go index 86be576f2..804318985 100644 --- a/ebitenutil/debugprint.go +++ b/ebitenutil/debugprint.go @@ -17,8 +17,8 @@ package ebitenutil import ( "image" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil/internal/assets" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil/internal/assets" ) var ( diff --git a/ebitenutil/gif.go b/ebitenutil/gif.go index 4a29f9047..f739c64fd 100644 --- a/ebitenutil/gif.go +++ b/ebitenutil/gif.go @@ -23,7 +23,7 @@ import ( "io" "sync" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) type recorder struct { diff --git a/ebitenutil/loadimage.go b/ebitenutil/loadimage.go index 781ffce3a..ddbb0c10f 100644 --- a/ebitenutil/loadimage.go +++ b/ebitenutil/loadimage.go @@ -21,7 +21,7 @@ package ebitenutil import ( "image" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) // NewImageFromFile loads the file with path and returns ebiten.Image and image.Image. diff --git a/ebitenutil/shapes.go b/ebitenutil/shapes.go index 7a51bd9f7..34d076682 100644 --- a/ebitenutil/shapes.go +++ b/ebitenutil/shapes.go @@ -18,8 +18,8 @@ import ( "image/color" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/internal/colormcache" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/internal/colormcache" ) var ( diff --git a/ebitenutil/url.go b/ebitenutil/url.go index 6c113aa89..d9ccdfcd4 100644 --- a/ebitenutil/url.go +++ b/ebitenutil/url.go @@ -18,7 +18,7 @@ import ( "image" "net/http" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) // NewImageFromURL creates a new ebiten.Image from the given URL. diff --git a/examples/2048/2048/board.go b/examples/2048/2048/board.go index 867687143..4e7407a62 100644 --- a/examples/2048/2048/board.go +++ b/examples/2048/2048/board.go @@ -17,7 +17,7 @@ package twenty48 import ( "errors" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) var taskTerminated = errors.New("twenty48: task terminated") diff --git a/examples/2048/2048/game.go b/examples/2048/2048/game.go index f8e5c877c..88eaf71cf 100644 --- a/examples/2048/2048/game.go +++ b/examples/2048/2048/game.go @@ -18,7 +18,7 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) func init() { diff --git a/examples/2048/2048/input.go b/examples/2048/2048/input.go index 686b77feb..9a605d1ee 100644 --- a/examples/2048/2048/input.go +++ b/examples/2048/2048/input.go @@ -15,8 +15,8 @@ package twenty48 import ( - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) // Dir represents a direction. diff --git a/examples/2048/2048/tile.go b/examples/2048/2048/tile.go index b8a99dd06..b7fb665bc 100644 --- a/examples/2048/2048/tile.go +++ b/examples/2048/2048/tile.go @@ -25,9 +25,9 @@ import ( "golang.org/x/image/font" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/fonts" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/fonts" + "github.com/hajimehoshi/ebiten/v2/text" ) var ( diff --git a/examples/2048/2048/tile_test.go b/examples/2048/2048/tile_test.go index 6b7201c18..ba4f3e805 100644 --- a/examples/2048/2048/tile_test.go +++ b/examples/2048/2048/tile_test.go @@ -15,7 +15,7 @@ package twenty48_test import ( - . "github.com/hajimehoshi/ebiten/examples/2048/2048" + . "github.com/hajimehoshi/ebiten/v2/examples/2048/2048" "fmt" "testing" diff --git a/examples/2048/main.go b/examples/2048/main.go index 58dc62d12..d37ae3f12 100644 --- a/examples/2048/main.go +++ b/examples/2048/main.go @@ -19,8 +19,8 @@ package main import ( "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/2048/2048" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/2048/2048" ) func main() { diff --git a/examples/additive/main.go b/examples/additive/main.go index 4598a179e..edcec396a 100644 --- a/examples/additive/main.go +++ b/examples/additive/main.go @@ -23,8 +23,8 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/address/main.go b/examples/address/main.go index 3450dbe3b..8809f33fa 100644 --- a/examples/address/main.go +++ b/examples/address/main.go @@ -22,9 +22,9 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/airship/main.go b/examples/airship/main.go index 3ca40ac2b..23e8fd149 100644 --- a/examples/airship/main.go +++ b/examples/airship/main.go @@ -25,9 +25,9 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/alphablending/main.go b/examples/alphablending/main.go index 10c417de3..6fff8e950 100644 --- a/examples/alphablending/main.go +++ b/examples/alphablending/main.go @@ -23,8 +23,8 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/animation/main.go b/examples/animation/main.go index cd9e09bae..1471ee3e9 100644 --- a/examples/animation/main.go +++ b/examples/animation/main.go @@ -22,8 +22,8 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/audio/main.go b/examples/audio/main.go index 1325802aa..75c5cef52 100644 --- a/examples/audio/main.go +++ b/examples/audio/main.go @@ -26,14 +26,14 @@ import ( "log" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/mp3" - "github.com/hajimehoshi/ebiten/audio/vorbis" - "github.com/hajimehoshi/ebiten/audio/wav" - "github.com/hajimehoshi/ebiten/ebitenutil" - raudio "github.com/hajimehoshi/ebiten/examples/resources/audio" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/mp3" + "github.com/hajimehoshi/ebiten/v2/audio/vorbis" + "github.com/hajimehoshi/ebiten/v2/audio/wav" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + raudio "github.com/hajimehoshi/ebiten/v2/examples/resources/audio" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/audioinfiniteloop/main.go b/examples/audioinfiniteloop/main.go index 89d4650b1..8eee5c409 100644 --- a/examples/audioinfiniteloop/main.go +++ b/examples/audioinfiniteloop/main.go @@ -21,11 +21,11 @@ import ( "log" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/vorbis" - "github.com/hajimehoshi/ebiten/ebitenutil" - raudio "github.com/hajimehoshi/ebiten/examples/resources/audio" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/vorbis" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + raudio "github.com/hajimehoshi/ebiten/v2/examples/resources/audio" ) const ( diff --git a/examples/audiopanning/main.go b/examples/audiopanning/main.go index 5eb6a0282..40164cd22 100644 --- a/examples/audiopanning/main.go +++ b/examples/audiopanning/main.go @@ -25,12 +25,12 @@ import ( "math" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/vorbis" - "github.com/hajimehoshi/ebiten/ebitenutil" - raudio "github.com/hajimehoshi/ebiten/examples/resources/audio" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/vorbis" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + raudio "github.com/hajimehoshi/ebiten/v2/examples/resources/audio" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/blocks/blocks/field.go b/examples/blocks/blocks/field.go index 2622a556d..bd7ea6412 100644 --- a/examples/blocks/blocks/field.go +++ b/examples/blocks/blocks/field.go @@ -15,7 +15,7 @@ package blocks import ( - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) const maxFlushCount = 20 diff --git a/examples/blocks/blocks/font.go b/examples/blocks/blocks/font.go index b42b709a5..3ad7f8eb0 100644 --- a/examples/blocks/blocks/font.go +++ b/examples/blocks/blocks/font.go @@ -22,9 +22,9 @@ import ( "golang.org/x/image/font" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/fonts" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/fonts" + "github.com/hajimehoshi/ebiten/v2/text" ) const ( diff --git a/examples/blocks/blocks/game.go b/examples/blocks/blocks/game.go index 11d55620e..2d3ef588e 100644 --- a/examples/blocks/blocks/game.go +++ b/examples/blocks/blocks/game.go @@ -15,7 +15,7 @@ package blocks import ( - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) const ( diff --git a/examples/blocks/blocks/gamepad.go b/examples/blocks/blocks/gamepad.go index f05c29896..c676cfc29 100644 --- a/examples/blocks/blocks/gamepad.go +++ b/examples/blocks/blocks/gamepad.go @@ -17,8 +17,8 @@ package blocks import ( "fmt" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) type virtualGamepadButton int diff --git a/examples/blocks/blocks/gamepadscene.go b/examples/blocks/blocks/gamepadscene.go index cadc30662..d11849584 100644 --- a/examples/blocks/blocks/gamepadscene.go +++ b/examples/blocks/blocks/gamepadscene.go @@ -19,8 +19,8 @@ import ( "image/color" "strings" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) type GamepadScene struct { diff --git a/examples/blocks/blocks/gamescene.go b/examples/blocks/blocks/gamescene.go index 9d747d52e..3af65fce5 100644 --- a/examples/blocks/blocks/gamescene.go +++ b/examples/blocks/blocks/gamescene.go @@ -24,10 +24,10 @@ import ( "strconv" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) var ( diff --git a/examples/blocks/blocks/input.go b/examples/blocks/blocks/input.go index 590cc49d9..78179e2f1 100644 --- a/examples/blocks/blocks/input.go +++ b/examples/blocks/blocks/input.go @@ -15,8 +15,8 @@ package blocks import ( - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) // Input manages the input state including gamepads and keyboards. diff --git a/examples/blocks/blocks/piece.go b/examples/blocks/blocks/piece.go index 7010f8fd8..78f4de210 100644 --- a/examples/blocks/blocks/piece.go +++ b/examples/blocks/blocks/piece.go @@ -19,8 +19,8 @@ import ( "image" _ "image/png" - "github.com/hajimehoshi/ebiten" - rblocks "github.com/hajimehoshi/ebiten/examples/resources/images/blocks" + "github.com/hajimehoshi/ebiten/v2" + rblocks "github.com/hajimehoshi/ebiten/v2/examples/resources/images/blocks" ) var imageBlocks *ebiten.Image diff --git a/examples/blocks/blocks/scenemanager.go b/examples/blocks/blocks/scenemanager.go index 0586bced7..483c679e8 100644 --- a/examples/blocks/blocks/scenemanager.go +++ b/examples/blocks/blocks/scenemanager.go @@ -15,7 +15,7 @@ package blocks import ( - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) var ( diff --git a/examples/blocks/blocks/titlescene.go b/examples/blocks/blocks/titlescene.go index 7b6c47fae..954afd2c0 100644 --- a/examples/blocks/blocks/titlescene.go +++ b/examples/blocks/blocks/titlescene.go @@ -20,9 +20,9 @@ import ( "image/color" _ "image/png" - "github.com/hajimehoshi/ebiten" - rblocks "github.com/hajimehoshi/ebiten/examples/resources/images/blocks" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + rblocks "github.com/hajimehoshi/ebiten/v2/examples/resources/images/blocks" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) var imageBackground *ebiten.Image diff --git a/examples/blocks/main.go b/examples/blocks/main.go index b07f17a0c..cd4415abc 100644 --- a/examples/blocks/main.go +++ b/examples/blocks/main.go @@ -22,8 +22,8 @@ import ( "os" "runtime/pprof" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/blocks/blocks" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/blocks/blocks" ) var cpuProfile = flag.String("cpuprofile", "", "write cpu profile to file") diff --git a/examples/blur/main.go b/examples/blur/main.go index 4f8f05273..8f5fee85f 100644 --- a/examples/blur/main.go +++ b/examples/blur/main.go @@ -22,8 +22,8 @@ import ( _ "image/jpeg" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( @@ -55,7 +55,7 @@ func (g *Game) Draw(screen *ebiten.Image) { // Alpha scale should be 1.0/49.0, but accumulating 1/49 49 times doesn't reach to 1, because // the final color is affected by the destination alpha when CompositeModeSourceOver is used. // This composite mode is the default mode. See how this is calculated at the doc: - // https://pkg.go.dev/github.com/hajimehoshi/ebiten#CompositeMode + // https://pkg.go.dev/github.com/hajimehoshi/ebiten/v2#CompositeMode // // Use a higher value than 1.0/49.0. Here, 1.0/25.0 here to get a reasonable result. op.ColorM.Scale(1, 1, 1, 1.0/25.0) diff --git a/examples/camera/main.go b/examples/camera/main.go index 3542744e8..8c030f389 100644 --- a/examples/camera/main.go +++ b/examples/camera/main.go @@ -26,9 +26,9 @@ import ( "golang.org/x/image/math/f64" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( @@ -173,7 +173,7 @@ func (g *Game) Draw(screen *ebiten.Image) { // Draw each tile with each DrawImage call. // As the source images of all DrawImage calls are always same, // this rendering is done very effectively. - // For more detail, see https://pkg.go.dev/github.com/hajimehoshi/ebiten#Image.DrawImage + // For more detail, see https://pkg.go.dev/github.com/hajimehoshi/ebiten/v2#Image.DrawImage for _, l := range g.layers { for i, t := range l { op := &ebiten.DrawImageOptions{} diff --git a/examples/chipmunk/main.go b/examples/chipmunk/main.go index ff040385a..f39d4bd9d 100644 --- a/examples/chipmunk/main.go +++ b/examples/chipmunk/main.go @@ -22,8 +22,8 @@ import ( "log" "math/rand" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" "github.com/jakecoffman/cp" ) diff --git a/examples/contextlost/main.go b/examples/contextlost/main.go index 7c637035d..0afdf585e 100644 --- a/examples/contextlost/main.go +++ b/examples/contextlost/main.go @@ -27,10 +27,10 @@ import ( "syscall/js" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/doomfire/main.go b/examples/doomfire/main.go index 4195aea63..b78e78562 100644 --- a/examples/doomfire/main.go +++ b/examples/doomfire/main.go @@ -22,7 +22,7 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) const ( diff --git a/examples/drag/main.go b/examples/drag/main.go index 300fafe7f..ed03af417 100644 --- a/examples/drag/main.go +++ b/examples/drag/main.go @@ -25,10 +25,10 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) func init() { diff --git a/examples/filter/main.go b/examples/filter/main.go index 667f82077..e10dd876e 100644 --- a/examples/filter/main.go +++ b/examples/filter/main.go @@ -22,9 +22,9 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/flappy/main.go b/examples/flappy/main.go index 87d76b119..a8f4a3838 100644 --- a/examples/flappy/main.go +++ b/examples/flappy/main.go @@ -30,16 +30,16 @@ import ( "golang.org/x/image/font" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/vorbis" - "github.com/hajimehoshi/ebiten/audio/wav" - "github.com/hajimehoshi/ebiten/ebitenutil" - raudio "github.com/hajimehoshi/ebiten/examples/resources/audio" - "github.com/hajimehoshi/ebiten/examples/resources/fonts" - resources "github.com/hajimehoshi/ebiten/examples/resources/images/flappy" - "github.com/hajimehoshi/ebiten/inpututil" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/vorbis" + "github.com/hajimehoshi/ebiten/v2/audio/wav" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + raudio "github.com/hajimehoshi/ebiten/v2/examples/resources/audio" + "github.com/hajimehoshi/ebiten/v2/examples/resources/fonts" + resources "github.com/hajimehoshi/ebiten/v2/examples/resources/images/flappy" + "github.com/hajimehoshi/ebiten/v2/inpututil" + "github.com/hajimehoshi/ebiten/v2/text" ) func init() { diff --git a/examples/flood/main.go b/examples/flood/main.go index bc8024c94..c8cb04e50 100644 --- a/examples/flood/main.go +++ b/examples/flood/main.go @@ -23,8 +23,8 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/font/main.go b/examples/font/main.go index ac75e947b..0ae5a2693 100644 --- a/examples/font/main.go +++ b/examples/font/main.go @@ -27,9 +27,9 @@ import ( "golang.org/x/image/font" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/fonts" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/fonts" + "github.com/hajimehoshi/ebiten/v2/text" ) const ( diff --git a/examples/fullscreen/main.go b/examples/fullscreen/main.go index ffbd88b4e..1a32a8dbe 100644 --- a/examples/fullscreen/main.go +++ b/examples/fullscreen/main.go @@ -29,10 +29,10 @@ import ( "golang.org/x/image/font" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/fonts" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/fonts" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/text" ) var ( diff --git a/examples/gamepad/main.go b/examples/gamepad/main.go index e7a5f75d6..ac56268ea 100644 --- a/examples/gamepad/main.go +++ b/examples/gamepad/main.go @@ -23,9 +23,9 @@ import ( "strconv" "strings" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/highdpi/main.go b/examples/highdpi/main.go index bac6cdb94..d8643629d 100644 --- a/examples/highdpi/main.go +++ b/examples/highdpi/main.go @@ -21,8 +21,8 @@ import ( _ "image/jpeg" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" ) var ( diff --git a/examples/hsv/main.go b/examples/hsv/main.go index 1b57ff1b0..abf7e0601 100644 --- a/examples/hsv/main.go +++ b/examples/hsv/main.go @@ -24,10 +24,10 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/hue/main.go b/examples/hue/main.go index 74f64b301..0a3c0c8a2 100644 --- a/examples/hue/main.go +++ b/examples/hue/main.go @@ -23,8 +23,8 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/infinitescroll/main.go b/examples/infinitescroll/main.go index 644d9e6a2..779421ac4 100644 --- a/examples/infinitescroll/main.go +++ b/examples/infinitescroll/main.go @@ -23,9 +23,9 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/keyboard/keyboard/gen.go b/examples/keyboard/keyboard/gen.go index e3e39560a..76b032739 100644 --- a/examples/keyboard/keyboard/gen.go +++ b/examples/keyboard/keyboard/gen.go @@ -32,8 +32,8 @@ import ( "golang.org/x/image/font" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/text" ) const ( @@ -282,7 +282,7 @@ package keyboard import ( "image" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) var keyboardKeyRects = map[ebiten.Key]image.Rectangle{} diff --git a/examples/keyboard/keyboard/keyrects.go b/examples/keyboard/keyboard/keyrects.go index 5ae39ad7f..913da1a66 100644 --- a/examples/keyboard/keyboard/keyrects.go +++ b/examples/keyboard/keyboard/keyrects.go @@ -19,7 +19,7 @@ package keyboard import ( "image" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) var keyboardKeyRects = map[ebiten.Key]image.Rectangle{} diff --git a/examples/keyboard/main.go b/examples/keyboard/main.go index 11394955d..27844e0db 100644 --- a/examples/keyboard/main.go +++ b/examples/keyboard/main.go @@ -23,10 +23,10 @@ import ( "log" "strings" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/keyboard/keyboard" - rkeyabord "github.com/hajimehoshi/ebiten/examples/resources/images/keyboard" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/keyboard/keyboard" + rkeyabord "github.com/hajimehoshi/ebiten/v2/examples/resources/images/keyboard" ) const ( diff --git a/examples/life/main.go b/examples/life/main.go index 5468fc651..11ff25d18 100644 --- a/examples/life/main.go +++ b/examples/life/main.go @@ -30,7 +30,7 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) func init() { diff --git a/examples/mandelbrot/main.go b/examples/mandelbrot/main.go index a7f559759..3fbcd6357 100644 --- a/examples/mandelbrot/main.go +++ b/examples/mandelbrot/main.go @@ -20,7 +20,7 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) const ( diff --git a/examples/mascot/main.go b/examples/mascot/main.go index 9bd677a92..ac483ab27 100644 --- a/examples/mascot/main.go +++ b/examples/mascot/main.go @@ -26,8 +26,8 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" - rmascot "github.com/hajimehoshi/ebiten/examples/resources/images/mascot" + "github.com/hajimehoshi/ebiten/v2" + rmascot "github.com/hajimehoshi/ebiten/v2/examples/resources/images/mascot" ) const ( diff --git a/examples/masking/main.go b/examples/masking/main.go index 50c4a3bbe..0db407762 100644 --- a/examples/masking/main.go +++ b/examples/masking/main.go @@ -24,8 +24,8 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/minify/main.go b/examples/minify/main.go index 14efdf834..7dad518b7 100644 --- a/examples/minify/main.go +++ b/examples/minify/main.go @@ -27,10 +27,10 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/moire/main.go b/examples/moire/main.go index dcf01c9bd..cc048db3e 100644 --- a/examples/moire/main.go +++ b/examples/moire/main.go @@ -22,8 +22,8 @@ package main import ( "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/mosaic/main.go b/examples/mosaic/main.go index 7a6151687..e52fb2933 100644 --- a/examples/mosaic/main.go +++ b/examples/mosaic/main.go @@ -22,8 +22,8 @@ import ( _ "image/jpeg" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/noise/main.go b/examples/noise/main.go index 8536bd981..71c9151c3 100644 --- a/examples/noise/main.go +++ b/examples/noise/main.go @@ -21,8 +21,8 @@ import ( "image" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" ) const ( diff --git a/examples/paint/main.go b/examples/paint/main.go index 3e45a30bd..2f36b6c8b 100644 --- a/examples/paint/main.go +++ b/examples/paint/main.go @@ -23,8 +23,8 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" ) const ( diff --git a/examples/particles/main.go b/examples/particles/main.go index 37ba683d5..c17f39b32 100644 --- a/examples/particles/main.go +++ b/examples/particles/main.go @@ -28,9 +28,9 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) func init() { diff --git a/examples/pcm/main.go b/examples/pcm/main.go index 7fd5ccd83..049c44e41 100644 --- a/examples/pcm/main.go +++ b/examples/pcm/main.go @@ -21,9 +21,9 @@ import ( "math" "strings" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" ) const ( diff --git a/examples/perspective/main.go b/examples/perspective/main.go index 21e93dc2b..599fb2866 100644 --- a/examples/perspective/main.go +++ b/examples/perspective/main.go @@ -22,8 +22,8 @@ import ( _ "image/jpeg" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/piano/main.go b/examples/piano/main.go index 5bcd771c9..2a5273add 100644 --- a/examples/piano/main.go +++ b/examples/piano/main.go @@ -25,12 +25,12 @@ import ( "golang.org/x/image/font" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/fonts" - "github.com/hajimehoshi/ebiten/inpututil" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/fonts" + "github.com/hajimehoshi/ebiten/v2/inpututil" + "github.com/hajimehoshi/ebiten/v2/text" ) var ( diff --git a/examples/platformer/main.go b/examples/platformer/main.go index a18875bb0..2b29c376c 100644 --- a/examples/platformer/main.go +++ b/examples/platformer/main.go @@ -22,10 +22,10 @@ import ( "image" _ "image/png" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - rplatformer "github.com/hajimehoshi/ebiten/examples/resources/images/platformer" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + rplatformer "github.com/hajimehoshi/ebiten/v2/examples/resources/images/platformer" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/polygons/main.go b/examples/polygons/main.go index 9cd7a31c2..ac4faa1dd 100644 --- a/examples/polygons/main.go +++ b/examples/polygons/main.go @@ -22,9 +22,9 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/raycasting/main.go b/examples/raycasting/main.go index 337780062..bcb3c9620 100644 --- a/examples/raycasting/main.go +++ b/examples/raycasting/main.go @@ -27,10 +27,10 @@ import ( "math" "sort" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/rotate/main.go b/examples/rotate/main.go index 3928617ee..7c692d430 100644 --- a/examples/rotate/main.go +++ b/examples/rotate/main.go @@ -23,8 +23,8 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( diff --git a/examples/set/main.go b/examples/set/main.go index 3206cf296..5dc8e20bb 100644 --- a/examples/set/main.go +++ b/examples/set/main.go @@ -23,8 +23,8 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" ) const ( diff --git a/examples/shader/main.go b/examples/shader/main.go index a6ff3cc4d..db6dffbb2 100644 --- a/examples/shader/main.go +++ b/examples/shader/main.go @@ -22,10 +22,10 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - resources "github.com/hajimehoshi/ebiten/examples/resources/images/shader" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + resources "github.com/hajimehoshi/ebiten/v2/examples/resources/images/shader" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/shapes/main.go b/examples/shapes/main.go index 3b72673c8..078de6fc0 100644 --- a/examples/shapes/main.go +++ b/examples/shapes/main.go @@ -22,8 +22,8 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" ) const ( diff --git a/examples/sinewave/main.go b/examples/sinewave/main.go index d1d7abeed..797f9b9b0 100644 --- a/examples/sinewave/main.go +++ b/examples/sinewave/main.go @@ -21,9 +21,9 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" ) const ( diff --git a/examples/snake/main.go b/examples/snake/main.go index 44211b888..2b6196bc3 100644 --- a/examples/snake/main.go +++ b/examples/snake/main.go @@ -23,9 +23,9 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/sprites/main.go b/examples/sprites/main.go index 98da548ff..92fdfaa86 100644 --- a/examples/sprites/main.go +++ b/examples/sprites/main.go @@ -25,9 +25,9 @@ import ( "math" "math/rand" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( @@ -194,7 +194,7 @@ func (g *Game) Draw(screen *ebiten.Image) { // the actual draw call to GPU is very few since these calls satisfy // some conditions e.g. all the rendering sources and targets are same. // For more detail, see: - // https://pkg.go.dev/github.com/hajimehoshi/ebiten#Image.DrawImage + // https://pkg.go.dev/github.com/hajimehoshi/ebiten/v2#Image.DrawImage w, h := ebitenImage.Size() for i := 0; i < g.sprites.num; i++ { s := g.sprites.sprites[i] diff --git a/examples/spriteshd/main.go b/examples/spriteshd/main.go index 198ce7737..d511ab150 100644 --- a/examples/spriteshd/main.go +++ b/examples/spriteshd/main.go @@ -26,10 +26,10 @@ import ( "math" "math/rand" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( @@ -180,7 +180,7 @@ func (g *Game) Draw(screen *ebiten.Image) { // the actual draw call to GPU is very few since these calls satisfy // some conditions e.g. all the rendering sources and targets are same. // For more detail, see: - // https://pkg.go.dev/github.com/hajimehoshi/ebiten#Image.DrawImage + // https://pkg.go.dev/github.com/hajimehoshi/ebiten/v2#Image.DrawImage w, h := ebitenImage.Size() for i := 0; i < g.sprites.num; i++ { s := g.sprites.sprites[i] diff --git a/examples/squiral/main.go b/examples/squiral/main.go index 176a0f10c..5586f61a8 100644 --- a/examples/squiral/main.go +++ b/examples/squiral/main.go @@ -25,9 +25,9 @@ import ( "math/rand" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/text/main.go b/examples/text/main.go index 2b772c683..1513e4b5d 100644 --- a/examples/text/main.go +++ b/examples/text/main.go @@ -25,10 +25,10 @@ import ( "golang.org/x/image/font" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/fonts" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/fonts" + "github.com/hajimehoshi/ebiten/v2/text" ) const ( diff --git a/examples/tiles/main.go b/examples/tiles/main.go index 390ed17f0..b7303d966 100644 --- a/examples/tiles/main.go +++ b/examples/tiles/main.go @@ -23,9 +23,9 @@ import ( _ "image/png" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" ) const ( @@ -71,7 +71,7 @@ func (g *Game) Draw(screen *ebiten.Image) { // Draw each tile with each DrawImage call. // As the source images of all DrawImage calls are always same, // this rendering is done very effectively. - // For more detail, see https://pkg.go.dev/github.com/hajimehoshi/ebiten#Image.DrawImage + // For more detail, see https://pkg.go.dev/github.com/hajimehoshi/ebiten/v2#Image.DrawImage const xNum = screenWidth / tileSize for _, l := range g.layers { for i, t := range l { diff --git a/examples/typewriter/main.go b/examples/typewriter/main.go index 86cdfb1da..353e57aa4 100644 --- a/examples/typewriter/main.go +++ b/examples/typewriter/main.go @@ -20,9 +20,9 @@ import ( "log" "strings" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) const ( diff --git a/examples/ui/main.go b/examples/ui/main.go index b16c27910..f3b38ed09 100644 --- a/examples/ui/main.go +++ b/examples/ui/main.go @@ -28,10 +28,10 @@ import ( "golang.org/x/image/font/gofont/goregular" "golang.org/x/image/font/opentype" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" - "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" + "github.com/hajimehoshi/ebiten/v2/text" ) const ( diff --git a/examples/vector/main.go b/examples/vector/main.go index ade26c1a5..b730df2d7 100644 --- a/examples/vector/main.go +++ b/examples/vector/main.go @@ -22,9 +22,9 @@ import ( "log" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/vector" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/vector" ) const ( diff --git a/examples/wav/main.go b/examples/wav/main.go index 5aad7af76..08f3990b5 100644 --- a/examples/wav/main.go +++ b/examples/wav/main.go @@ -19,11 +19,11 @@ package main import ( "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/audio" - "github.com/hajimehoshi/ebiten/audio/wav" - "github.com/hajimehoshi/ebiten/ebitenutil" - raudio "github.com/hajimehoshi/ebiten/examples/resources/audio" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/audio" + "github.com/hajimehoshi/ebiten/v2/audio/wav" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + raudio "github.com/hajimehoshi/ebiten/v2/examples/resources/audio" ) const ( diff --git a/examples/wheel/main.go b/examples/wheel/main.go index cdaf8509f..4431cf379 100644 --- a/examples/wheel/main.go +++ b/examples/wheel/main.go @@ -21,8 +21,8 @@ import ( "image/color" "log" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" ) var pointerImage *ebiten.Image diff --git a/examples/windowsize/main.go b/examples/windowsize/main.go index d0cf7305f..8491e0db6 100644 --- a/examples/windowsize/main.go +++ b/examples/windowsize/main.go @@ -29,10 +29,10 @@ import ( "strings" "time" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/inpututil" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/ebitenutil" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/inpututil" ) var ( diff --git a/gamepad.go b/gamepad.go index 22e08f052..6a420c2eb 100644 --- a/gamepad.go +++ b/gamepad.go @@ -15,7 +15,7 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) // A GamepadButton represents a gamepad button. diff --git a/genevents.go b/genevents.go index c3acf4c82..6cf6effd3 100644 --- a/genevents.go +++ b/genevents.go @@ -347,7 +347,7 @@ package {{.Package}} import ( "fmt" - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) func convertCh(driverCh chan driver.Event) (chan Event) { diff --git a/genkeys.go b/genkeys.go index b84f1647c..9c4884204 100644 --- a/genkeys.go +++ b/genkeys.go @@ -366,7 +366,7 @@ package ebiten import ( "strings" - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) // A Key represents a keyboard key. @@ -448,7 +448,7 @@ const eventKeysTmpl = `{{.License}} package event import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) type Key = driver.Key @@ -468,8 +468,8 @@ const uidriverGlfwKeysTmpl = `{{.License}} package glfw import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" ) var glfwKeyToDriverKey = map[glfw.Key]driver.Key{ @@ -492,7 +492,7 @@ const uidriverJsKeysTmpl = `{{.License}} package js import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) var driverKeyToJSKey = map[driver.Key]string{ @@ -529,7 +529,7 @@ const mobileAndroidKeysTmpl = `{{.License}} package ebitenmobileview import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) var androidKeyToDriverKey = map[int]driver.Key{ @@ -549,7 +549,7 @@ package mobile import ( "golang.org/x/mobile/event/key" - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) var gbuildKeyToDriverKey = map[key.Code]driver.Key{ diff --git a/geom_test.go b/geom_test.go index d6b167223..7c24b8160 100644 --- a/geom_test.go +++ b/geom_test.go @@ -19,7 +19,7 @@ import ( "math" "testing" - . "github.com/hajimehoshi/ebiten" + . "github.com/hajimehoshi/ebiten/v2" ) func TestGeoMInit(t *testing.T) { diff --git a/go.mod b/go.mod index 5db6ed1e7..7589ed754 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/hajimehoshi/ebiten +module github.com/hajimehoshi/ebiten/v2 go 1.12 diff --git a/graphics.go b/graphics.go index 66359400a..e8a8d50e7 100644 --- a/graphics.go +++ b/graphics.go @@ -15,7 +15,7 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) // Filter represents the type of texture filter to be used when an image is maginified or minified. diff --git a/image.go b/image.go index c69b2d415..fff768bfc 100644 --- a/image.go +++ b/image.go @@ -19,9 +19,9 @@ import ( "image" "image/color" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/mipmap" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/mipmap" ) // panicOnErrorAtImageAt indicates whether (*Image).At panics on an error or not. diff --git a/image_test.go b/image_test.go index e2ab203b5..0e3c7aa96 100644 --- a/image_test.go +++ b/image_test.go @@ -25,11 +25,11 @@ import ( "runtime" "testing" - . "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/resources/images" - "github.com/hajimehoshi/ebiten/internal/graphics" - t "github.com/hajimehoshi/ebiten/internal/testing" - "github.com/hajimehoshi/ebiten/internal/web" + . "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/examples/resources/images" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + t "github.com/hajimehoshi/ebiten/v2/internal/testing" + "github.com/hajimehoshi/ebiten/v2/internal/web" ) func skipTooSlowTests(t *testing.T) bool { diff --git a/imagedumper_desktop.go b/imagedumper_desktop.go index 4875aad83..d46debb3f 100644 --- a/imagedumper_desktop.go +++ b/imagedumper_desktop.go @@ -23,7 +23,7 @@ import ( "os" "time" - "github.com/hajimehoshi/ebiten/internal/shareable" + "github.com/hajimehoshi/ebiten/v2/internal/shareable" ) // availableFilename returns a filename that is valid as a new file or directory. diff --git a/imagetobytes_test.go b/imagetobytes_test.go index a6618188b..b84485655 100644 --- a/imagetobytes_test.go +++ b/imagetobytes_test.go @@ -21,7 +21,7 @@ import ( "image/color/palette" "testing" - . "github.com/hajimehoshi/ebiten" + . "github.com/hajimehoshi/ebiten/v2" ) func TestImageToBytes(t *testing.T) { diff --git a/init.go b/init.go index 5e912839c..d0e89ba5e 100644 --- a/init.go +++ b/init.go @@ -15,9 +15,9 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/graphicscommand" - "github.com/hajimehoshi/ebiten/internal/mipmap" - "github.com/hajimehoshi/ebiten/internal/shareable" + "github.com/hajimehoshi/ebiten/v2/internal/graphicscommand" + "github.com/hajimehoshi/ebiten/v2/internal/mipmap" + "github.com/hajimehoshi/ebiten/v2/internal/shareable" ) var _ = __EBITEN_REQUIRES_GO_VERSION_1_12_OR_LATER__ diff --git a/input.go b/input.go index 85c670e2a..8ce978138 100644 --- a/input.go +++ b/input.go @@ -15,7 +15,7 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) // InputChars return "printable" runes read from the keyboard at the time update is called. diff --git a/inpututil/inpututil.go b/inpututil/inpututil.go index 83df34b61..3f30830cb 100644 --- a/inpututil/inpututil.go +++ b/inpututil/inpututil.go @@ -19,8 +19,8 @@ import ( "sort" "sync" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/internal/hooks" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/internal/hooks" ) type inputState struct { diff --git a/internal/affine/colorm_test.go b/internal/affine/colorm_test.go index 4e254acc8..684594927 100644 --- a/internal/affine/colorm_test.go +++ b/internal/affine/colorm_test.go @@ -19,7 +19,7 @@ import ( "math/rand" "testing" - . "github.com/hajimehoshi/ebiten/internal/affine" + . "github.com/hajimehoshi/ebiten/v2/internal/affine" ) func TestColorMScaleOnly(t *testing.T) { diff --git a/internal/buffered/image.go b/internal/buffered/image.go index a9e8d5c41..9a9b86f63 100644 --- a/internal/buffered/image.go +++ b/internal/buffered/image.go @@ -19,11 +19,11 @@ import ( "image" "image/color" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/shareable" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shareable" ) type Image struct { diff --git a/internal/buffered/image_test.go b/internal/buffered/image_test.go index 2c1d22d6c..363465a0a 100644 --- a/internal/buffered/image_test.go +++ b/internal/buffered/image_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) var mainCh = make(chan func()) diff --git a/internal/colormcache/cache.go b/internal/colormcache/cache.go index 4d10eaf6c..6cc5d7862 100644 --- a/internal/colormcache/cache.go +++ b/internal/colormcache/cache.go @@ -18,7 +18,7 @@ import ( "image/color" "math" - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) var ( diff --git a/internal/devicescale/cinnamon_unix.go b/internal/devicescale/cinnamon_unix.go index 68bd29b22..29c0ddf99 100644 --- a/internal/devicescale/cinnamon_unix.go +++ b/internal/devicescale/cinnamon_unix.go @@ -25,7 +25,7 @@ import ( "path/filepath" "strconv" - "github.com/hajimehoshi/ebiten/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" ) type xmlBool bool diff --git a/internal/driver/graphics.go b/internal/driver/graphics.go index 1d35c378a..bbe5c709c 100644 --- a/internal/driver/graphics.go +++ b/internal/driver/graphics.go @@ -17,10 +17,10 @@ package driver import ( "errors" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/thread" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/thread" ) type Region struct { diff --git a/internal/graphics/math_test.go b/internal/graphics/math_test.go index 65abe8424..9f77516a9 100644 --- a/internal/graphics/math_test.go +++ b/internal/graphics/math_test.go @@ -17,7 +17,7 @@ package graphics_test import ( "testing" - . "github.com/hajimehoshi/ebiten/internal/graphics" + . "github.com/hajimehoshi/ebiten/v2/internal/graphics" ) func TestInternalImageSize(t *testing.T) { diff --git a/internal/graphics/vertex.go b/internal/graphics/vertex.go index e027284d9..9122e8b84 100644 --- a/internal/graphics/vertex.go +++ b/internal/graphics/vertex.go @@ -15,7 +15,7 @@ package graphics import ( - "github.com/hajimehoshi/ebiten/internal/web" + "github.com/hajimehoshi/ebiten/v2/internal/web" ) const ( diff --git a/internal/graphicscommand/command.go b/internal/graphicscommand/command.go index 97a2c6149..e5a1416b8 100644 --- a/internal/graphicscommand/command.go +++ b/internal/graphicscommand/command.go @@ -19,10 +19,10 @@ import ( "math" "strings" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) var theGraphicsDriver driver.Graphics diff --git a/internal/graphicscommand/image.go b/internal/graphicscommand/image.go index 02d05f949..c09e8d359 100644 --- a/internal/graphicscommand/image.go +++ b/internal/graphicscommand/image.go @@ -20,10 +20,10 @@ import ( "os" "strings" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/png" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/png" ) type lastCommand int diff --git a/internal/graphicscommand/image_test.go b/internal/graphicscommand/image_test.go index bb76042eb..886588fba 100644 --- a/internal/graphicscommand/image_test.go +++ b/internal/graphicscommand/image_test.go @@ -18,10 +18,10 @@ import ( "image/color" "testing" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - . "github.com/hajimehoshi/ebiten/internal/graphicscommand" - etesting "github.com/hajimehoshi/ebiten/internal/testing" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + . "github.com/hajimehoshi/ebiten/v2/internal/graphicscommand" + etesting "github.com/hajimehoshi/ebiten/v2/internal/testing" ) func TestMain(m *testing.M) { diff --git a/internal/graphicscommand/shader.go b/internal/graphicscommand/shader.go index 19c9d3455..4ded628ce 100644 --- a/internal/graphicscommand/shader.go +++ b/internal/graphicscommand/shader.go @@ -15,8 +15,8 @@ package graphicscommand import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) type Shader struct { diff --git a/internal/graphicsdriver/metal/ca/ca.go b/internal/graphicsdriver/metal/ca/ca.go index 4565486b1..911af0027 100644 --- a/internal/graphicsdriver/metal/ca/ca.go +++ b/internal/graphicsdriver/metal/ca/ca.go @@ -25,7 +25,7 @@ import ( "errors" "unsafe" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" ) // Suppress the warnings about availability guard with -Wno-unguarded-availability-new. diff --git a/internal/graphicsdriver/metal/graphics.go b/internal/graphicsdriver/metal/graphics.go index b540f2731..36cd0e655 100644 --- a/internal/graphicsdriver/metal/graphics.go +++ b/internal/graphicsdriver/metal/graphics.go @@ -21,13 +21,13 @@ import ( "strings" "unsafe" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/ca" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" - "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/thread" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/ca" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/thread" ) // #cgo CFLAGS: -x objective-c diff --git a/internal/graphicsdriver/metal/mtl/example_test.go b/internal/graphicsdriver/metal/mtl/example_test.go index 0d4901831..035d8bbf1 100644 --- a/internal/graphicsdriver/metal/mtl/example_test.go +++ b/internal/graphicsdriver/metal/mtl/example_test.go @@ -27,7 +27,7 @@ import ( "golang.org/x/image/math/f32" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" ) func Example_listDevices() { diff --git a/internal/graphicsdriver/metal/mtl/mtl_test.go b/internal/graphicsdriver/metal/mtl/mtl_test.go index 0a4ee7593..661cefe3f 100644 --- a/internal/graphicsdriver/metal/mtl/mtl_test.go +++ b/internal/graphicsdriver/metal/mtl/mtl_test.go @@ -28,7 +28,7 @@ import ( "golang.org/x/image/math/f32" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" ) func Disabled_TestRenderTriangle(t *testing.T) { diff --git a/internal/graphicsdriver/metal/ns/ns.go b/internal/graphicsdriver/metal/ns/ns.go index 7ef440c41..394acddce 100644 --- a/internal/graphicsdriver/metal/ns/ns.go +++ b/internal/graphicsdriver/metal/ns/ns.go @@ -24,7 +24,7 @@ package ns import ( "unsafe" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/ca" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/ca" ) // #cgo !ios CFLAGS: -mmacosx-version-min=10.12 diff --git a/internal/graphicsdriver/metal/shader.go b/internal/graphicsdriver/metal/shader.go index 764fa426a..87b40d776 100644 --- a/internal/graphicsdriver/metal/shader.go +++ b/internal/graphicsdriver/metal/shader.go @@ -19,10 +19,10 @@ package metal import ( "fmt" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" - "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/shaderir/metal" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir/metal" ) type Shader struct { diff --git a/internal/graphicsdriver/metal/view.go b/internal/graphicsdriver/metal/view.go index f7c9bf523..1a8525b33 100644 --- a/internal/graphicsdriver/metal/view.go +++ b/internal/graphicsdriver/metal/view.go @@ -19,8 +19,8 @@ package metal import ( "sync" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/ca" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/ca" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" ) type view struct { diff --git a/internal/graphicsdriver/metal/view_ios.go b/internal/graphicsdriver/metal/view_ios.go index 6c8e1e3e0..927602085 100644 --- a/internal/graphicsdriver/metal/view_ios.go +++ b/internal/graphicsdriver/metal/view_ios.go @@ -36,7 +36,7 @@ import "C" import ( "unsafe" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" ) func (v *view) setWindow(window uintptr) { diff --git a/internal/graphicsdriver/metal/view_macos.go b/internal/graphicsdriver/metal/view_macos.go index 23c0f5dea..273562c55 100644 --- a/internal/graphicsdriver/metal/view_macos.go +++ b/internal/graphicsdriver/metal/view_macos.go @@ -18,8 +18,8 @@ package metal import ( - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/ns" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/ns" ) func (v *view) setWindow(window uintptr) { diff --git a/internal/graphicsdriver/opengl/context.go b/internal/graphicsdriver/opengl/context.go index 3f6d9d3b4..2b70eb356 100644 --- a/internal/graphicsdriver/opengl/context.go +++ b/internal/graphicsdriver/opengl/context.go @@ -18,8 +18,8 @@ import ( "fmt" "sync" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/thread" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/thread" ) func convertOperation(op driver.Operation) operation { diff --git a/internal/graphicsdriver/opengl/context_desktop.go b/internal/graphicsdriver/opengl/context_desktop.go index 6dc49ba54..35b4628b5 100644 --- a/internal/graphicsdriver/opengl/context_desktop.go +++ b/internal/graphicsdriver/opengl/context_desktop.go @@ -23,9 +23,9 @@ import ( "errors" "fmt" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/opengl/gl" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) type ( diff --git a/internal/graphicsdriver/opengl/context_js.go b/internal/graphicsdriver/opengl/context_js.go index 7082ac449..c61ea7543 100644 --- a/internal/graphicsdriver/opengl/context_js.go +++ b/internal/graphicsdriver/opengl/context_js.go @@ -21,10 +21,10 @@ import ( "fmt" "syscall/js" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/jsutil" - "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/web" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/jsutil" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/web" ) type ( diff --git a/internal/graphicsdriver/opengl/context_mobile.go b/internal/graphicsdriver/opengl/context_mobile.go index 245114764..1cdb4023d 100644 --- a/internal/graphicsdriver/opengl/context_mobile.go +++ b/internal/graphicsdriver/opengl/context_mobile.go @@ -22,8 +22,8 @@ import ( mgl "golang.org/x/mobile/gl" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) type ( diff --git a/internal/graphicsdriver/opengl/context_x.go b/internal/graphicsdriver/opengl/context_x.go index b6690151a..f55136ba7 100644 --- a/internal/graphicsdriver/opengl/context_x.go +++ b/internal/graphicsdriver/opengl/context_x.go @@ -22,7 +22,7 @@ import ( "strings" "sync" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/opengl/gl" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl" ) var ( diff --git a/internal/graphicsdriver/opengl/defaultshader.go b/internal/graphicsdriver/opengl/defaultshader.go index e0c0fccd0..4e2242873 100644 --- a/internal/graphicsdriver/opengl/defaultshader.go +++ b/internal/graphicsdriver/opengl/defaultshader.go @@ -19,7 +19,7 @@ import ( "regexp" "strings" - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) // glslReservedKeywords is a set of reserved keywords that cannot be used as an indentifier on some environments. diff --git a/internal/graphicsdriver/opengl/graphics.go b/internal/graphicsdriver/opengl/graphics.go index 0d92e2a07..fb6e15179 100644 --- a/internal/graphicsdriver/opengl/graphics.go +++ b/internal/graphicsdriver/opengl/graphics.go @@ -17,11 +17,11 @@ package opengl import ( "fmt" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/thread" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/thread" ) var theGraphics Graphics diff --git a/internal/graphicsdriver/opengl/image.go b/internal/graphicsdriver/opengl/image.go index 15d838dbc..c4abea793 100644 --- a/internal/graphicsdriver/opengl/image.go +++ b/internal/graphicsdriver/opengl/image.go @@ -15,8 +15,8 @@ package opengl import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" ) type Image struct { diff --git a/internal/graphicsdriver/opengl/program.go b/internal/graphicsdriver/opengl/program.go index 3f7f5b787..691efd9c7 100644 --- a/internal/graphicsdriver/opengl/program.go +++ b/internal/graphicsdriver/opengl/program.go @@ -17,10 +17,10 @@ package opengl import ( "fmt" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/web" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/web" ) // arrayBufferLayoutPart is a part of an array buffer layout. diff --git a/internal/graphicsdriver/opengl/shader.go b/internal/graphicsdriver/opengl/shader.go index ff54cb408..d5d8d7d0e 100644 --- a/internal/graphicsdriver/opengl/shader.go +++ b/internal/graphicsdriver/opengl/shader.go @@ -17,9 +17,9 @@ package opengl import ( "fmt" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/shaderir/glsl" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir/glsl" ) type Shader struct { diff --git a/internal/jsutil/jsutil_test.go b/internal/jsutil/jsutil_test.go index 5070b028e..78458dd60 100644 --- a/internal/jsutil/jsutil_test.go +++ b/internal/jsutil/jsutil_test.go @@ -20,7 +20,7 @@ import ( "syscall/js" "testing" - . "github.com/hajimehoshi/ebiten/internal/jsutil" + . "github.com/hajimehoshi/ebiten/v2/internal/jsutil" ) func TestArrayBufferToSlice(t *testing.T) { diff --git a/internal/mipmap/mipmap.go b/internal/mipmap/mipmap.go index 5388dfa7d..7de1b68be 100644 --- a/internal/mipmap/mipmap.go +++ b/internal/mipmap/mipmap.go @@ -19,11 +19,11 @@ import ( "image/color" "math" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/buffered" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/buffered" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) var graphicsDriver driver.Graphics diff --git a/internal/packing/packing_test.go b/internal/packing/packing_test.go index 505b3a892..170ddb56c 100644 --- a/internal/packing/packing_test.go +++ b/internal/packing/packing_test.go @@ -17,7 +17,7 @@ package packing_test import ( "testing" - . "github.com/hajimehoshi/ebiten/internal/packing" + . "github.com/hajimehoshi/ebiten/v2/internal/packing" ) func TestPage(t *testing.T) { diff --git a/internal/restorable/image.go b/internal/restorable/image.go index 16b0a4216..03ebb840e 100644 --- a/internal/restorable/image.go +++ b/internal/restorable/image.go @@ -18,10 +18,10 @@ import ( "fmt" "image/color" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/graphicscommand" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/graphicscommand" ) type Pixels struct { diff --git a/internal/restorable/images.go b/internal/restorable/images.go index fc42b1129..a4bc73fc5 100644 --- a/internal/restorable/images.go +++ b/internal/restorable/images.go @@ -17,8 +17,8 @@ package restorable import ( "path/filepath" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicscommand" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicscommand" ) // forceRestoring reports whether restoring forcely happens or not. diff --git a/internal/restorable/images_test.go b/internal/restorable/images_test.go index 9366d5db4..84929ce6e 100644 --- a/internal/restorable/images_test.go +++ b/internal/restorable/images_test.go @@ -19,10 +19,10 @@ import ( "image/color" "testing" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - . "github.com/hajimehoshi/ebiten/internal/restorable" - t "github.com/hajimehoshi/ebiten/internal/testing" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + . "github.com/hajimehoshi/ebiten/v2/internal/restorable" + t "github.com/hajimehoshi/ebiten/v2/internal/testing" ) func TestMain(m *testing.M) { diff --git a/internal/restorable/rect.go b/internal/restorable/rect.go index 54088d7c4..b3f54c777 100644 --- a/internal/restorable/rect.go +++ b/internal/restorable/rect.go @@ -18,7 +18,7 @@ import ( "fmt" "image" - "github.com/hajimehoshi/ebiten/internal/graphicscommand" + "github.com/hajimehoshi/ebiten/v2/internal/graphicscommand" ) type rectToPixels struct { diff --git a/internal/restorable/shader.go b/internal/restorable/shader.go index 3d3341066..512dc387d 100644 --- a/internal/restorable/shader.go +++ b/internal/restorable/shader.go @@ -15,8 +15,8 @@ package restorable import ( - "github.com/hajimehoshi/ebiten/internal/graphicscommand" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/graphicscommand" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) type Shader struct { diff --git a/internal/restorable/shader_test.go b/internal/restorable/shader_test.go index 4451bf39a..c2315ec8f 100644 --- a/internal/restorable/shader_test.go +++ b/internal/restorable/shader_test.go @@ -18,10 +18,10 @@ import ( "image/color" "testing" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - . "github.com/hajimehoshi/ebiten/internal/restorable" - etesting "github.com/hajimehoshi/ebiten/internal/testing" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + . "github.com/hajimehoshi/ebiten/v2/internal/restorable" + etesting "github.com/hajimehoshi/ebiten/v2/internal/testing" ) func TestShader(t *testing.T) { diff --git a/internal/shader/expr.go b/internal/shader/expr.go index e898835a6..91cd1e507 100644 --- a/internal/shader/expr.go +++ b/internal/shader/expr.go @@ -22,7 +22,7 @@ import ( "regexp" "strconv" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) func canTruncateToInteger(v gconstant.Value) bool { diff --git a/internal/shader/shader.go b/internal/shader/shader.go index 12e7bbffb..dfb74c977 100644 --- a/internal/shader/shader.go +++ b/internal/shader/shader.go @@ -20,7 +20,7 @@ import ( "go/token" "strings" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) type variable struct { diff --git a/internal/shader/shader_test.go b/internal/shader/shader_test.go index dbdfd8a33..fc6358b9f 100644 --- a/internal/shader/shader_test.go +++ b/internal/shader/shader_test.go @@ -24,9 +24,9 @@ import ( "strings" "testing" - . "github.com/hajimehoshi/ebiten/internal/shader" - "github.com/hajimehoshi/ebiten/internal/shaderir/glsl" - "github.com/hajimehoshi/ebiten/internal/shaderir/metal" + . "github.com/hajimehoshi/ebiten/v2/internal/shader" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir/glsl" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir/metal" ) func glslNormalize(str string) string { diff --git a/internal/shader/stmt.go b/internal/shader/stmt.go index 8582c8aa1..376334026 100644 --- a/internal/shader/stmt.go +++ b/internal/shader/stmt.go @@ -21,7 +21,7 @@ import ( "go/token" "strings" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) func (cs *compileState) forceToInt(node ast.Node, expr *shaderir.Expr) bool { diff --git a/internal/shader/type.go b/internal/shader/type.go index b202b7f92..4e99d83d3 100644 --- a/internal/shader/type.go +++ b/internal/shader/type.go @@ -19,7 +19,7 @@ import ( "go/ast" gconstant "go/constant" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) func (cs *compileState) parseType(block *block, expr ast.Expr) (shaderir.Type, bool) { diff --git a/internal/shaderir/glsl/glsl.go b/internal/shaderir/glsl/glsl.go index 2a998c318..6d155ccb0 100644 --- a/internal/shaderir/glsl/glsl.go +++ b/internal/shaderir/glsl/glsl.go @@ -21,7 +21,7 @@ import ( "regexp" "strings" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) const FragmentPrelude = `#if defined(GL_ES) diff --git a/internal/shaderir/glsl/type.go b/internal/shaderir/glsl/type.go index a8b00e50b..f8b3a3ca5 100644 --- a/internal/shaderir/glsl/type.go +++ b/internal/shaderir/glsl/type.go @@ -17,7 +17,7 @@ package glsl import ( "fmt" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) func typeString(t *shaderir.Type) (string, string) { diff --git a/internal/shaderir/ir_test.go b/internal/shaderir/ir_test.go index 1effdd433..2063755da 100644 --- a/internal/shaderir/ir_test.go +++ b/internal/shaderir/ir_test.go @@ -18,9 +18,9 @@ import ( "go/constant" "testing" - . "github.com/hajimehoshi/ebiten/internal/shaderir" - "github.com/hajimehoshi/ebiten/internal/shaderir/glsl" - "github.com/hajimehoshi/ebiten/internal/shaderir/metal" + . "github.com/hajimehoshi/ebiten/v2/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir/glsl" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir/metal" ) func block(localVars []Type, offset int, stmts ...Stmt) *Block { diff --git a/internal/shaderir/metal/metal.go b/internal/shaderir/metal/metal.go index 69d21826b..52b2f5371 100644 --- a/internal/shaderir/metal/metal.go +++ b/internal/shaderir/metal/metal.go @@ -21,7 +21,7 @@ import ( "regexp" "strings" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) const ( diff --git a/internal/shaderir/metal/type.go b/internal/shaderir/metal/type.go index 67452ba0b..4de13f331 100644 --- a/internal/shaderir/metal/type.go +++ b/internal/shaderir/metal/type.go @@ -17,7 +17,7 @@ package metal import ( "fmt" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) func typeString(t *shaderir.Type, packed bool, ref bool) string { diff --git a/internal/shareable/image.go b/internal/shareable/image.go index 459821eaf..e04d0eba2 100644 --- a/internal/shareable/image.go +++ b/internal/shareable/image.go @@ -20,12 +20,12 @@ import ( "runtime" "sync" - "github.com/hajimehoshi/ebiten/internal/affine" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/hooks" - "github.com/hajimehoshi/ebiten/internal/packing" - "github.com/hajimehoshi/ebiten/internal/restorable" + "github.com/hajimehoshi/ebiten/v2/internal/affine" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/hooks" + "github.com/hajimehoshi/ebiten/v2/internal/packing" + "github.com/hajimehoshi/ebiten/v2/internal/restorable" ) const ( diff --git a/internal/shareable/image_test.go b/internal/shareable/image_test.go index 54fca6543..061a66df7 100644 --- a/internal/shareable/image_test.go +++ b/internal/shareable/image_test.go @@ -19,10 +19,10 @@ import ( "runtime" "testing" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphics" - . "github.com/hajimehoshi/ebiten/internal/shareable" - t "github.com/hajimehoshi/ebiten/internal/testing" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + . "github.com/hajimehoshi/ebiten/v2/internal/shareable" + t "github.com/hajimehoshi/ebiten/v2/internal/testing" ) const ( diff --git a/internal/shareable/shader.go b/internal/shareable/shader.go index 6f13ae348..bdad5239b 100644 --- a/internal/shareable/shader.go +++ b/internal/shareable/shader.go @@ -17,8 +17,8 @@ package shareable import ( "runtime" - "github.com/hajimehoshi/ebiten/internal/restorable" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/restorable" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) type Shader struct { diff --git a/internal/testing/shader.go b/internal/testing/shader.go index c6bcb7b31..8369e9175 100644 --- a/internal/testing/shader.go +++ b/internal/testing/shader.go @@ -17,8 +17,8 @@ package testing import ( "go/constant" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) var ( diff --git a/internal/testing/testing.go b/internal/testing/testing.go index bc08e9087..d92d02e83 100644 --- a/internal/testing/testing.go +++ b/internal/testing/testing.go @@ -19,8 +19,8 @@ import ( "os" "testing" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/internal/testflock" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/internal/testflock" ) var regularTermination = errors.New("regular termination") diff --git a/internal/uidriver/glfw/graphics_darwin.go b/internal/uidriver/glfw/graphics_darwin.go index a3e0af132..bf693cd19 100644 --- a/internal/uidriver/glfw/graphics_darwin.go +++ b/internal/uidriver/glfw/graphics_darwin.go @@ -29,10 +29,10 @@ package glfw import "C" import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/opengl" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl" ) var graphics driver.Graphics diff --git a/internal/uidriver/glfw/graphics_opengl.go b/internal/uidriver/glfw/graphics_opengl.go index ce5f54c93..c8ba0dfbc 100644 --- a/internal/uidriver/glfw/graphics_opengl.go +++ b/internal/uidriver/glfw/graphics_opengl.go @@ -18,8 +18,8 @@ package glfw import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/opengl" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl" ) func (*UserInterface) Graphics() driver.Graphics { diff --git a/internal/uidriver/glfw/input.go b/internal/uidriver/glfw/input.go index 19c48fd6b..f5c6a8faa 100644 --- a/internal/uidriver/glfw/input.go +++ b/internal/uidriver/glfw/input.go @@ -23,8 +23,8 @@ import ( "sync" "unicode" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" ) type gamePad struct { diff --git a/internal/uidriver/glfw/keys.go b/internal/uidriver/glfw/keys.go index a3cf97503..37ce6b848 100644 --- a/internal/uidriver/glfw/keys.go +++ b/internal/uidriver/glfw/keys.go @@ -22,8 +22,8 @@ package glfw import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" ) var glfwKeyToDriverKey = map[glfw.Key]driver.Key{ diff --git a/internal/uidriver/glfw/ui.go b/internal/uidriver/glfw/ui.go index 3f5668e42..fd5f86e8f 100644 --- a/internal/uidriver/glfw/ui.go +++ b/internal/uidriver/glfw/ui.go @@ -27,11 +27,11 @@ import ( "sync" "time" - "github.com/hajimehoshi/ebiten/internal/devicescale" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/glfw" - "github.com/hajimehoshi/ebiten/internal/hooks" - "github.com/hajimehoshi/ebiten/internal/thread" + "github.com/hajimehoshi/ebiten/v2/internal/devicescale" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/hooks" + "github.com/hajimehoshi/ebiten/v2/internal/thread" ) type UserInterface struct { diff --git a/internal/uidriver/glfw/ui_darwin.go b/internal/uidriver/glfw/ui_darwin.go index 6e90ffa6e..c632e4419 100644 --- a/internal/uidriver/glfw/ui_darwin.go +++ b/internal/uidriver/glfw/ui_darwin.go @@ -42,7 +42,7 @@ package glfw import "C" import ( - "github.com/hajimehoshi/ebiten/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" ) func (u *UserInterface) fromGLFWMonitorPixel(x float64) float64 { diff --git a/internal/uidriver/glfw/ui_unix.go b/internal/uidriver/glfw/ui_unix.go index 297f4bea8..fb6c9fab1 100644 --- a/internal/uidriver/glfw/ui_unix.go +++ b/internal/uidriver/glfw/ui_unix.go @@ -21,7 +21,7 @@ package glfw import ( "math" - "github.com/hajimehoshi/ebiten/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" ) // fromGLFWMonitorPixel must be called from the main thread. diff --git a/internal/uidriver/glfw/ui_windows.go b/internal/uidriver/glfw/ui_windows.go index 5369e27a9..c4ed9a3c1 100644 --- a/internal/uidriver/glfw/ui_windows.go +++ b/internal/uidriver/glfw/ui_windows.go @@ -22,7 +22,7 @@ import ( "golang.org/x/sys/windows" - "github.com/hajimehoshi/ebiten/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" ) const ( diff --git a/internal/uidriver/glfw/window.go b/internal/uidriver/glfw/window.go index 365f5a6b2..319dbbe6c 100644 --- a/internal/uidriver/glfw/window.go +++ b/internal/uidriver/glfw/window.go @@ -22,7 +22,7 @@ package glfw import ( "image" - "github.com/hajimehoshi/ebiten/internal/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/glfw" ) type window struct { diff --git a/internal/uidriver/js/input.go b/internal/uidriver/js/input.go index af91a29b6..f170d52ab 100644 --- a/internal/uidriver/js/input.go +++ b/internal/uidriver/js/input.go @@ -21,8 +21,8 @@ import ( "syscall/js" "unicode" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/jsutil" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/jsutil" ) type pos struct { diff --git a/internal/uidriver/js/keys.go b/internal/uidriver/js/keys.go index 30d5293ab..90506e387 100644 --- a/internal/uidriver/js/keys.go +++ b/internal/uidriver/js/keys.go @@ -19,7 +19,7 @@ package js import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) var driverKeyToJSKey = map[driver.Key]string{ diff --git a/internal/uidriver/js/ui.go b/internal/uidriver/js/ui.go index fddf36daf..12b1c6a54 100644 --- a/internal/uidriver/js/ui.go +++ b/internal/uidriver/js/ui.go @@ -22,12 +22,12 @@ import ( "syscall/js" "time" - "github.com/hajimehoshi/ebiten/internal/devicescale" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/opengl" - "github.com/hajimehoshi/ebiten/internal/hooks" - "github.com/hajimehoshi/ebiten/internal/jsutil" - "github.com/hajimehoshi/ebiten/internal/restorable" + "github.com/hajimehoshi/ebiten/v2/internal/devicescale" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl" + "github.com/hajimehoshi/ebiten/v2/internal/hooks" + "github.com/hajimehoshi/ebiten/v2/internal/jsutil" + "github.com/hajimehoshi/ebiten/v2/internal/restorable" ) type UserInterface struct { diff --git a/internal/uidriver/mobile/graphics_ios.go b/internal/uidriver/mobile/graphics_ios.go index 009296bb5..d96291506 100644 --- a/internal/uidriver/mobile/graphics_ios.go +++ b/internal/uidriver/mobile/graphics_ios.go @@ -20,9 +20,9 @@ package mobile import ( "fmt" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal/mtl" ) func (*UserInterface) Graphics() driver.Graphics { diff --git a/internal/uidriver/mobile/graphics_opengl.go b/internal/uidriver/mobile/graphics_opengl.go index 8e2318cd9..36c8b20d5 100644 --- a/internal/uidriver/mobile/graphics_opengl.go +++ b/internal/uidriver/mobile/graphics_opengl.go @@ -17,8 +17,8 @@ package mobile import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/opengl" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl" ) func (*UserInterface) Graphics() driver.Graphics { diff --git a/internal/uidriver/mobile/input.go b/internal/uidriver/mobile/input.go index 796fbfe13..cda0bf18a 100644 --- a/internal/uidriver/mobile/input.go +++ b/internal/uidriver/mobile/input.go @@ -17,7 +17,7 @@ package mobile import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) type pos struct { diff --git a/internal/uidriver/mobile/keys.go b/internal/uidriver/mobile/keys.go index 581f7b194..f974061f8 100644 --- a/internal/uidriver/mobile/keys.go +++ b/internal/uidriver/mobile/keys.go @@ -19,7 +19,7 @@ package mobile import ( "golang.org/x/mobile/event/key" - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) var gbuildKeyToDriverKey = map[key.Code]driver.Key{ diff --git a/internal/uidriver/mobile/ui.go b/internal/uidriver/mobile/ui.go index dd5d7c5d3..4d3490593 100644 --- a/internal/uidriver/mobile/ui.go +++ b/internal/uidriver/mobile/ui.go @@ -32,12 +32,12 @@ import ( "golang.org/x/mobile/event/touch" "golang.org/x/mobile/gl" - "github.com/hajimehoshi/ebiten/internal/devicescale" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/opengl" - "github.com/hajimehoshi/ebiten/internal/hooks" - "github.com/hajimehoshi/ebiten/internal/restorable" - "github.com/hajimehoshi/ebiten/internal/thread" + "github.com/hajimehoshi/ebiten/v2/internal/devicescale" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl" + "github.com/hajimehoshi/ebiten/v2/internal/hooks" + "github.com/hajimehoshi/ebiten/v2/internal/restorable" + "github.com/hajimehoshi/ebiten/v2/internal/thread" ) var ( diff --git a/keys.go b/keys.go index f30827853..b0ac168d0 100644 --- a/keys.go +++ b/keys.go @@ -19,7 +19,7 @@ package ebiten import ( "strings" - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) // A Key represents a keyboard key. diff --git a/mobile/compat.go b/mobile/compat.go index bd96af550..d83fa2472 100644 --- a/mobile/compat.go +++ b/mobile/compat.go @@ -17,8 +17,8 @@ package mobile import ( - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/mobile/ebitenmobileview" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/mobile/ebitenmobileview" ) type game struct { @@ -113,7 +113,7 @@ func Update() error { // // UpdateTouchesOnAndroid is concurrent-safe. // -// For more details, see https://github.com/hajimehoshi/ebiten/wiki/Android. +// For more details, see https://github.com/hajimehoshi/ebiten/v2/wiki/Android. func UpdateTouchesOnAndroid(action int, id int, x, y int) { ebitenmobileview.UpdateTouchesOnAndroid(action, id, x, y) } @@ -156,7 +156,7 @@ func UpdateTouchesOnAndroid(action int, id int, x, y int) { // // UpdateTouchesOnIOS is concurrent-safe. // -// For more details, see https://github.com/hajimehoshi/ebiten/wiki/iOS. +// For more details, see https://github.com/hajimehoshi/ebiten/v2/wiki/iOS. func UpdateTouchesOnIOS(phase int, ptr int64, x, y int) { ebitenmobileview.UpdateTouchesOnIOS(phase, ptr, x, y) } diff --git a/mobile/ebitenmobileview/impl_metal.go b/mobile/ebitenmobileview/impl_metal.go index 93768c37f..ee50fec15 100644 --- a/mobile/ebitenmobileview/impl_metal.go +++ b/mobile/ebitenmobileview/impl_metal.go @@ -17,7 +17,7 @@ package ebitenmobileview import ( - "github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal" + "github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/metal" ) func SetUIView(uiview int64) { diff --git a/mobile/ebitenmobileview/input.go b/mobile/ebitenmobileview/input.go index 299570409..94b7c9949 100644 --- a/mobile/ebitenmobileview/input.go +++ b/mobile/ebitenmobileview/input.go @@ -17,8 +17,8 @@ package ebitenmobileview import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/uidriver/mobile" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/uidriver/mobile" ) type position struct { diff --git a/mobile/ebitenmobileview/input_android.go b/mobile/ebitenmobileview/input_android.go index 84cc361bd..b65539133 100644 --- a/mobile/ebitenmobileview/input_android.go +++ b/mobile/ebitenmobileview/input_android.go @@ -19,8 +19,8 @@ import ( "hash/crc32" "unicode" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/uidriver/mobile" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/uidriver/mobile" ) // https://developer.android.com/reference/android/view/KeyEvent diff --git a/mobile/ebitenmobileview/keys_android.go b/mobile/ebitenmobileview/keys_android.go index 4ec1f79b9..6aedf875a 100644 --- a/mobile/ebitenmobileview/keys_android.go +++ b/mobile/ebitenmobileview/keys_android.go @@ -17,7 +17,7 @@ package ebitenmobileview import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) var androidKeyToDriverKey = map[int]driver.Key{ diff --git a/mobile/ebitenmobileview/mobile.go b/mobile/ebitenmobileview/mobile.go index b1b6a95dc..cd52363b4 100644 --- a/mobile/ebitenmobileview/mobile.go +++ b/mobile/ebitenmobileview/mobile.go @@ -29,9 +29,9 @@ import ( "runtime" "sync/atomic" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/internal/restorable" - "github.com/hajimehoshi/ebiten/internal/uidriver/mobile" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/internal/restorable" + "github.com/hajimehoshi/ebiten/v2/internal/uidriver/mobile" ) var theState state diff --git a/mobile/impl_mobile.go b/mobile/impl_mobile.go index a6bfb108d..2615bedf5 100644 --- a/mobile/impl_mobile.go +++ b/mobile/impl_mobile.go @@ -17,7 +17,7 @@ package mobile import ( - "github.com/hajimehoshi/ebiten/mobile/ebitenmobileview" + "github.com/hajimehoshi/ebiten/v2/mobile/ebitenmobileview" ) func setGame(game Game) { diff --git a/mobile/mobile.go b/mobile/mobile.go index f451cf372..ef3e2ff8d 100644 --- a/mobile/mobile.go +++ b/mobile/mobile.go @@ -20,7 +20,7 @@ package mobile import ( - "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/v2" ) // Game defines necessary functions for a mobile game. diff --git a/mousebuttons.go b/mousebuttons.go index 6b96f9f23..ba4edc513 100644 --- a/mousebuttons.go +++ b/mousebuttons.go @@ -15,7 +15,7 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) // A MouseButton represents a mouse button. diff --git a/run.go b/run.go index c2aa2e9b1..e2082b096 100644 --- a/run.go +++ b/run.go @@ -17,8 +17,8 @@ package ebiten import ( "sync/atomic" - "github.com/hajimehoshi/ebiten/internal/clock" - "github.com/hajimehoshi/ebiten/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/clock" + "github.com/hajimehoshi/ebiten/v2/internal/driver" ) // Game defines necessary functions for a game. @@ -333,7 +333,7 @@ func runGame(game Game, scale float64) error { // Different from Run, RunGameWithoutMainLoop returns immediately. // // Ebiten users should NOT call RunGameWithoutMainLoop. -// Instead, functions in github.com/hajimehoshi/ebiten/mobile package calls this. +// Instead, functions in github.com/hajimehoshi/ebiten/v2/mobile package calls this. func RunGameWithoutMainLoop(game Game) { fixWindowPosition(WindowSize()) if _, ok := game.(interface{ Draw(*Image) }); ok { diff --git a/shader.go b/shader.go index 6e2702a84..3e7af9420 100644 --- a/shader.go +++ b/shader.go @@ -21,10 +21,10 @@ import ( "go/token" "strings" - "github.com/hajimehoshi/ebiten/internal/graphics" - "github.com/hajimehoshi/ebiten/internal/mipmap" - "github.com/hajimehoshi/ebiten/internal/shader" - "github.com/hajimehoshi/ebiten/internal/shaderir" + "github.com/hajimehoshi/ebiten/v2/internal/graphics" + "github.com/hajimehoshi/ebiten/v2/internal/mipmap" + "github.com/hajimehoshi/ebiten/v2/internal/shader" + "github.com/hajimehoshi/ebiten/v2/internal/shaderir" ) var shaderSuffix string diff --git a/shader_test.go b/shader_test.go index 2d3576a72..982e97323 100644 --- a/shader_test.go +++ b/shader_test.go @@ -19,7 +19,7 @@ import ( "image/color" "testing" - . "github.com/hajimehoshi/ebiten" + . "github.com/hajimehoshi/ebiten/v2" ) func TestShaderFill(t *testing.T) { diff --git a/text/text.go b/text/text.go index f36e06ba3..9a11e61c6 100644 --- a/text/text.go +++ b/text/text.go @@ -26,8 +26,8 @@ import ( "golang.org/x/image/font" "golang.org/x/image/math/fixed" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/internal/colormcache" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/internal/colormcache" ) var ( diff --git a/text/text_test.go b/text/text_test.go index 42b763fdb..5f8ecc509 100644 --- a/text/text_test.go +++ b/text/text_test.go @@ -23,9 +23,9 @@ import ( "golang.org/x/image/font" "golang.org/x/image/math/fixed" - "github.com/hajimehoshi/ebiten" - t "github.com/hajimehoshi/ebiten/internal/testing" - . "github.com/hajimehoshi/ebiten/text" + "github.com/hajimehoshi/ebiten/v2" + t "github.com/hajimehoshi/ebiten/v2/internal/testing" + . "github.com/hajimehoshi/ebiten/v2/text" ) func TestMain(m *testing.M) { diff --git a/uicontext.go b/uicontext.go index 41aa0734d..b9c602808 100644 --- a/uicontext.go +++ b/uicontext.go @@ -20,10 +20,10 @@ import ( "sync" "sync/atomic" - "github.com/hajimehoshi/ebiten/internal/buffered" - "github.com/hajimehoshi/ebiten/internal/clock" - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/hooks" + "github.com/hajimehoshi/ebiten/v2/internal/buffered" + "github.com/hajimehoshi/ebiten/v2/internal/clock" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/hooks" ) type defaultGame struct { diff --git a/uidriver_glfw.go b/uidriver_glfw.go index ae9542b27..d33000406 100644 --- a/uidriver_glfw.go +++ b/uidriver_glfw.go @@ -20,8 +20,8 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/uidriver/glfw" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/uidriver/glfw" ) func uiDriver() driver.UI { diff --git a/uidriver_js.go b/uidriver_js.go index d8d727f3d..6cbb12622 100644 --- a/uidriver_js.go +++ b/uidriver_js.go @@ -17,8 +17,8 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/uidriver/js" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/uidriver/js" ) func uiDriver() driver.UI { diff --git a/uidriver_mobile.go b/uidriver_mobile.go index 29b5729c7..f72e14e97 100644 --- a/uidriver_mobile.go +++ b/uidriver_mobile.go @@ -17,8 +17,8 @@ package ebiten import ( - "github.com/hajimehoshi/ebiten/internal/driver" - "github.com/hajimehoshi/ebiten/internal/uidriver/mobile" + "github.com/hajimehoshi/ebiten/v2/internal/driver" + "github.com/hajimehoshi/ebiten/v2/internal/uidriver/mobile" ) func uiDriver() driver.UI { diff --git a/vector/internal/triangulate/triangulate_test.go b/vector/internal/triangulate/triangulate_test.go index 9872e7aac..b139efacf 100644 --- a/vector/internal/triangulate/triangulate_test.go +++ b/vector/internal/triangulate/triangulate_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - . "github.com/hajimehoshi/ebiten/vector/internal/triangulate" + . "github.com/hajimehoshi/ebiten/v2/vector/internal/triangulate" ) func TestIsInTriangle(t *testing.T) { diff --git a/vector/path.go b/vector/path.go index 1752bd744..67f0b8e4f 100644 --- a/vector/path.go +++ b/vector/path.go @@ -21,8 +21,8 @@ import ( "image/color" "math" - "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/vector/internal/triangulate" + "github.com/hajimehoshi/ebiten/v2" + "github.com/hajimehoshi/ebiten/v2/vector/internal/triangulate" ) var emptyImage *ebiten.Image