From 989c8afa7b0c33c5d679803b4c07e60c5a1ef2f7 Mon Sep 17 00:00:00 2001 From: Jerry Caligiure Date: Fri, 5 Apr 2019 23:33:34 -0400 Subject: [PATCH 1/2] removing import paths from custom domain --- .runtests.sh | 12 ++++++------ .travis.yml | 2 +- README.md | 14 ++++++++------ appveyor.yml | 2 +- common/animation.go | 2 +- common/animation_test.go | 6 +++--- common/audio.go | 4 ++-- common/audio_filetype.go | 8 ++++---- common/audio_player.go | 4 ++-- common/audio_test.go | 4 ++-- common/camera.go | 8 ++++---- common/camera_test.go | 4 ++-- common/collision.go | 6 +++--- common/collision_test.go | 4 ++-- common/font.go | 4 ++-- common/font_filetype.go | 2 +- common/fps.go | 4 ++-- common/interfaces.go | 2 +- common/interfaces_test.go | 4 ++-- common/internal/decode/mp3/decode.go | 2 +- common/internal/decode/vorbis/decode.go | 2 +- common/internal/decode/wav/decode.go | 2 +- common/level.go | 6 +++--- common/mouse.go | 6 +++--- common/render.go | 6 +++--- common/render_filetype.go | 4 ++-- common/render_framebuffer.go | 4 ++-- common/render_shaders.go | 8 ++++---- common/render_shaders_blendmap.go | 14 +++++++------- common/render_shaders_test.go | 4 ++-- common/render_shapes.go | 4 ++-- common/spritesheet.go | 6 +++--- common/tmx_filetype.go | 2 +- common/tmx_level.go | 2 +- common/tmx_test.go | 2 +- demos/adventure/adventure.go | 6 +++--- demos/animation/anim.go | 6 +++--- demos/audio/audio.go | 6 +++--- demos/blendmap/main.go | 6 +++--- demos/demoutils/utils.go | 6 +++--- demos/edgescroller/escroller.go | 8 ++++---- demos/entityscroller/entityscroller.go | 6 +++--- demos/exit/exit.go | 6 +++--- demos/falling/falling.go | 6 +++--- demos/headless/headless.go | 6 +++--- demos/hello-world/hello.go | 6 +++--- demos/hide/hide.go | 6 +++--- demos/hud/hud.go | 8 ++++---- demos/incrementalcamera/incrcamera.go | 8 ++++---- demos/input/input.go | 6 +++--- demos/isoadventure/iso.go | 6 +++--- demos/keyboardscroller/kbscroller.go | 8 ++++---- demos/mouse-click/mouse.go | 6 +++--- demos/mouse-drag/mouse.go | 6 +++--- demos/mouse-follow/follow.go | 6 +++--- demos/mouse/mouse.go | 6 +++--- demos/mouserotation/rotation.go | 8 ++++---- demos/pong/pong.go | 6 +++--- demos/rotation/rotation.go | 8 ++++---- demos/scale/scale.go | 6 +++--- demos/scenes/scenes.go | 6 +++--- demos/shapes/shapes.go | 6 +++--- demos/text/text.go | 6 +++--- demos/textbox/textbox.go | 6 +++--- demos/tilemap/tilemap.go | 6 +++--- demos/zoom/zoom.go | 8 ++++---- engo.go | 4 ++-- engo_empty.go | 2 +- engo_glfw.go | 2 +- engo_js.go | 2 +- engo_mobile.go | 2 +- engo_mobile_bind.go | 2 +- engo_sdl.go | 2 +- engo_test.go | 2 +- math.go | 2 +- math/abs.go | 2 +- math/acosh.go | 2 +- math/all.go | 2 +- math/asinh.go | 2 +- math/bits.go | 2 +- math/clamp.go | 2 +- math/imath/math.go | 2 +- math/logb.go | 2 +- math/nextafter.go | 2 +- math/pow.go | 2 +- math/pow10.go | 2 +- math/signbit.go | 2 +- math/sin.go | 2 +- math/sinh.go | 2 +- math/span/span.go | 2 +- math/sqrt.go | 2 +- math/tanh.go | 2 +- math_test.go | 2 +- 93 files changed, 214 insertions(+), 212 deletions(-) diff --git a/.runtests.sh b/.runtests.sh index 29975b8a..6440d20a 100755 --- a/.runtests.sh +++ b/.runtests.sh @@ -1,22 +1,22 @@ #!/usr/bin/env bash echo "Using GOPATH=$GOPATH" -echo "Getting engo.io/engo using 'go get'" +echo "Getting github.com/EngoEngine/engo using 'go get'" go get -t -v ./... || exit 1 # These can fail without us minding it -blacklist="engo.io/engo/demos/demoutils" +blacklist="github.com/EngoEngine/engo/demos/demoutils" if [ "$TEST_TYPE" == "linux_test" ] then - echo "Testing engo.io/engo using coveralls" + echo "Testing github.com/EngoEngine/engo using coveralls" $HOME/gopath/bin/goveralls -service=travis-ci - echo "Testing and benchmarking engo.io/engo" + echo "Testing and benchmarking github.com/EngoEngine/engo" go test -v -bench=. ./... || exit 1 echo "Checking for unnecessary conversions using unconvert" - unconvert -v engo.io/engo + unconvert -v github.com/EngoEngine/engo elif [ "$TEST_TYPE" == "linux_build" ] then for dir in `pwd`/demos/*/ @@ -73,7 +73,7 @@ then done elif [ "$TEST_TYPE" == "android_test" ] then - echo "Skipping tests for engo.io/engo using 'gomobile' (no tools exist yet)" + echo "Skipping tests for github.com/EngoEngine/engo using 'gomobile' (no tools exist yet)" elif [ "$TEST_TYPE" == "android_build" ] then for dir in `pwd`/demos/*/ diff --git a/.travis.yml b/.travis.yml index 6e709f8a..87b0be4b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ branches: only: - master language: go -go_import_path: engo.io/engo +go_import_path: github.com/EngoEngine/engo go: - "1.11" before_install: ./.before_install.sh diff --git a/README.md b/README.md index 7187691c..b8413bba 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Engo -[![GoDoc](https://godoc.org/engo.io/engo?status.svg)](https://godoc.org/engo.io/engo) +[![GoDoc](https://godoc.org/github.com/EngoEngine/engo?status.svg)](https://godoc.org/github.com/EngoEngine/engo) [![Join the chat at https://gitter.im/EngoEngine/engo](https://badges.gitter.im/EngoEngine/engo.svg)](https://gitter.im/EngoEngine/engo?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![License](https://img.shields.io/badge/License-MIT-blue.svg) [![Build Status](https://travis-ci.org/EngoEngine/engo.svg?branch=master)](https://travis-ci.org/EngoEngine/engo) [![Build status](https://ci.appveyor.com/api/projects/status/019qc8hncmhnje83?svg=true)](https://ci.appveyor.com/project/otraore/engo) -[![Go Report Card](https://goreportcard.com/badge/engo.io/engo)](https://goreportcard.com/report/engo.io/engo) +[![Go Report Card](https://goreportcard.com/badge/github.com/EngoEngine/engo)](https://goreportcard.com/report/github.com/EngoEngine/engo) [![Coverage Status](https://coveralls.io/repos/github/EngoEngine/engo/badge.svg?branch=master)](https://coveralls.io/github/EngoEngine/engo?branch=master) A cross-platform game engine written in Go following an interpretation of the Entity Component System paradigm. Engo is @@ -22,10 +22,10 @@ We have a [gitter](https://gitter.im/EngoEngine/engo) chat for people to join wh ### Theory: `common` vs `engo` -There are currently two major important packages within this repository: `engo.io/engo` and `engo.io/engo/common`. +There are currently two major important packages within this repository: `github.com/EngoEngine/engo` and `github.com/EngoEngine/engo/common`. The top level `engo` package contains the functionality of creating windows, starting the game, creating an OpenGL -context and handling input. It is designed to be used with Systems designed as per `engo.io/ecs` specifications. +context and handling input. It is designed to be used with Systems designed as per `github.com/EngoEngine/ecs` specifications. The `common` package contains our ECS implementations of common game development Systems like a `RenderSystem` or `CameraSystem`. @@ -37,12 +37,12 @@ The `common` package contains our ECS implementations of common game development 2. If you're running on Windows you'll need a gcc compiler that the go tool can use and have `gcc.exe` in your PATH environmental variable. We recommend [Mingw](http://mingw-w64.org/doku.php/start) since it has been tested. You'll also need git installed, we recommend getting it from [The official Git site](http://git-scm.com/download/win) 3. If you're on OSX, you will also need Git. You can find instructions [here](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git#Installing-on-Mac). You can also use homebrew to install git as well. [Open an issue if you have any issues](https://github.com/EngoEngine/engo/issues/new) 2. Then, you can go get it: -`go get -u engo.io/engo` +`go get -u github.com/EngoEngine/engo` 1. You may also want to get the dependencies of platform specific builds, so that build tools like godef can use them: `go get -u -tags js ./...` `go get -u -tags android ./...` 3. Now, you have two choices: - 1. Visit [our website](https://engo.io/), which hosts a full-blown tutorial series on how to create your own game, and on top of that, has some conceptual explanations; + 1. Visit [our website](https://engoengine.github.io/), which hosts a full-blown tutorial series on how to create your own game, and on top of that, has some conceptual explanations; 2. Check out some demos in our [demos folder](https://github.com/EngoEngine/engo/tree/master/demos). 4. Finally, if you run into problems, if you've encountered a bug, or want to request a feature, feel free to shoot us a DM or [create an issue](https://github.com/EngoEngine/engo/issues/new). @@ -56,6 +56,8 @@ we have a list of those changes, with the most recent being at the top. If you r * TMX Level's objects have all been rolled into Object rather than have separate things like "PolyLineObject". This is to be consistent with the TMX format. * The Shader interface now has a `SetCamera(*CameraSystem)` method. This method allows shaders to automatically update the camera system as it changes, such as between scenes or when the camera system is added. +* The domain engo.io has expired. Now use `github.com/EngoEngine/engo` as the import path, and the site can be located at +engoengine.github.io ## Roadmap to v1.1 A list of issues for v1.1 can be found [here](https://github.com/EngoEngine/engo/issues/552). There's always room diff --git a/appveyor.yml b/appveyor.yml index d675a894..5e497b97 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: "{build}" os: Windows Server 2012 R2 -clone_folder: c:\gopath\src\engo.io\engo +clone_folder: c:\gopath\src\github.com\EngoEngine\engo branches: only: - master diff --git a/common/animation.go b/common/animation.go index 108c9f76..47575f68 100644 --- a/common/animation.go +++ b/common/animation.go @@ -3,7 +3,7 @@ package common import ( "log" - "engo.io/ecs" + "github.com/EngoEngine/ecs" ) // Animation represents properties of an animation. diff --git a/common/animation_test.go b/common/animation_test.go index 97ce16c3..7a0c41d2 100644 --- a/common/animation_test.go +++ b/common/animation_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "engo.io/ecs" - "engo.io/engo" - "engo.io/gl" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/gl" ) type TestDrawable struct { diff --git a/common/audio.go b/common/audio.go index ef92f25c..2eed4704 100644 --- a/common/audio.go +++ b/common/audio.go @@ -5,8 +5,8 @@ import ( "io" "log" - "engo.io/ecs" - "engo.io/engo" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" "github.com/hajimehoshi/oto" ) diff --git a/common/audio_filetype.go b/common/audio_filetype.go index 7869ce36..450d30e7 100644 --- a/common/audio_filetype.go +++ b/common/audio_filetype.go @@ -7,10 +7,10 @@ import ( "io/ioutil" "os" - "engo.io/engo" - "engo.io/engo/common/internal/decode/mp3" - "engo.io/engo/common/internal/decode/vorbis" - "engo.io/engo/common/internal/decode/wav" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common/internal/decode/mp3" + "github.com/EngoEngine/engo/common/internal/decode/vorbis" + "github.com/EngoEngine/engo/common/internal/decode/wav" ) // audioLoader is responsible for managing audio files within `engo.Files` diff --git a/common/audio_player.go b/common/audio_player.go index ee185cf0..dd78dd24 100644 --- a/common/audio_player.go +++ b/common/audio_player.go @@ -7,8 +7,8 @@ import ( "runtime" "time" - "engo.io/engo" - "engo.io/engo/common/internal/decode/convert" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common/internal/decode/convert" ) // SampleRate is the sample rate at which the player plays audio. Any audios diff --git a/common/audio_test.go b/common/audio_test.go index 8993f506..508d79cb 100644 --- a/common/audio_test.go +++ b/common/audio_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "engo.io/ecs" - "engo.io/engo" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" ) type testAudio struct { diff --git a/common/camera.go b/common/camera.go index bbc6558e..e8bf7b1f 100644 --- a/common/camera.go +++ b/common/camera.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/math" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/math" "github.com/go-gl/mathgl/mgl32" ) @@ -389,7 +389,7 @@ func (c *EntityScroller) Update(dt float32) { if c.SpaceComponent == nil { return } - + width, height := c.SpaceComponent.Width, c.SpaceComponent.Height pos := c.SpaceComponent.Position diff --git a/common/camera_test.go b/common/camera_test.go index a77a64df..97660845 100644 --- a/common/camera_test.go +++ b/common/camera_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" - "engo.io/ecs" - "engo.io/engo" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" "github.com/stretchr/testify/assert" ) diff --git a/common/collision.go b/common/collision.go index 383b41e0..87ca2408 100644 --- a/common/collision.go +++ b/common/collision.go @@ -3,9 +3,9 @@ package common import ( "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/math" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/math" ) // Shape is a shape used for a SpaceComponent's hitboxes. It is composed of diff --git a/common/collision_test.go b/common/collision_test.go index d649e313..6ecdffa5 100644 --- a/common/collision_test.go +++ b/common/collision_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "engo.io/ecs" - "engo.io/engo" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" "github.com/stretchr/testify/assert" ) diff --git a/common/font.go b/common/font.go index 1b160839..834ff9e8 100644 --- a/common/font.go +++ b/common/font.go @@ -8,8 +8,8 @@ import ( "io/ioutil" "log" - "engo.io/engo" - "engo.io/gl" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/gl" "github.com/golang/freetype" "github.com/golang/freetype/truetype" "golang.org/x/image/font" diff --git a/common/font_filetype.go b/common/font_filetype.go index 61bef68e..0aef3fa6 100644 --- a/common/font_filetype.go +++ b/common/font_filetype.go @@ -5,7 +5,7 @@ import ( "io" "io/ioutil" - "engo.io/engo" + "github.com/EngoEngine/engo" "github.com/golang/freetype" "github.com/golang/freetype/truetype" ) diff --git a/common/fps.go b/common/fps.go index 1e8ee990..e4c43f88 100644 --- a/common/fps.go +++ b/common/fps.go @@ -6,8 +6,8 @@ import ( "log" "strconv" - "engo.io/ecs" - "engo.io/engo" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" "golang.org/x/image/font/gofont/gomonobold" ) diff --git a/common/interfaces.go b/common/interfaces.go index b53556e3..556bc5c6 100644 --- a/common/interfaces.go +++ b/common/interfaces.go @@ -30,7 +30,7 @@ package common -import "engo.io/ecs" +import "github.com/EngoEngine/ecs" // Getters diff --git a/common/interfaces_test.go b/common/interfaces_test.go index d99b866b..e9be2d2e 100644 --- a/common/interfaces_test.go +++ b/common/interfaces_test.go @@ -3,8 +3,8 @@ package common import ( "testing" - "engo.io/ecs" - "engo.io/engo" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" ) type EveryComp struct { diff --git a/common/internal/decode/mp3/decode.go b/common/internal/decode/mp3/decode.go index 87f3bced..553cdd06 100644 --- a/common/internal/decode/mp3/decode.go +++ b/common/internal/decode/mp3/decode.go @@ -3,7 +3,7 @@ package mp3 import ( "github.com/hajimehoshi/go-mp3" - "engo.io/engo/common/internal/decode/convert" + "github.com/EngoEngine/engo/common/internal/decode/convert" ) // Stream is a decoded stream. diff --git a/common/internal/decode/vorbis/decode.go b/common/internal/decode/vorbis/decode.go index b5dd7b3c..969e81a1 100644 --- a/common/internal/decode/vorbis/decode.go +++ b/common/internal/decode/vorbis/decode.go @@ -6,7 +6,7 @@ import ( "io" "runtime" - "engo.io/engo/common/internal/decode/convert" + "github.com/EngoEngine/engo/common/internal/decode/convert" "github.com/jfreymuth/oggvorbis" ) diff --git a/common/internal/decode/wav/decode.go b/common/internal/decode/wav/decode.go index f6ab4d3f..cc1f81ee 100644 --- a/common/internal/decode/wav/decode.go +++ b/common/internal/decode/wav/decode.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "engo.io/engo/common/internal/decode/convert" + "github.com/EngoEngine/engo/common/internal/decode/convert" ) // Stream is a decoded audio stream. diff --git a/common/level.go b/common/level.go index cabcfa85..9baf52f5 100644 --- a/common/level.go +++ b/common/level.go @@ -1,9 +1,9 @@ package common import ( - "engo.io/engo" - "engo.io/engo/math" - "engo.io/gl" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/math" + "github.com/EngoEngine/gl" ) const ( diff --git a/common/mouse.go b/common/mouse.go index a626106d..5248646f 100644 --- a/common/mouse.go +++ b/common/mouse.go @@ -3,9 +3,9 @@ package common import ( "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/math" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/math" ) // Cursor is a reference to a GLFW-cursor - to be used with the `SetCursor` method. diff --git a/common/render.go b/common/render.go index 884220be..75a3ab57 100644 --- a/common/render.go +++ b/common/render.go @@ -7,9 +7,9 @@ import ( "sync" - "engo.io/ecs" - "engo.io/engo" - "engo.io/gl" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/gl" ) const ( diff --git a/common/render_filetype.go b/common/render_filetype.go index eb77c891..8f28b980 100644 --- a/common/render_filetype.go +++ b/common/render_filetype.go @@ -17,8 +17,8 @@ import ( "github.com/srwiley/oksvg" "github.com/srwiley/rasterx" - "engo.io/engo" - "engo.io/gl" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/gl" ) // TextureResource is the resource used by the RenderSystem. It uses .jpg, .gif, and .png images diff --git a/common/render_framebuffer.go b/common/render_framebuffer.go index 1abbadfa..26c3e889 100644 --- a/common/render_framebuffer.go +++ b/common/render_framebuffer.go @@ -1,8 +1,8 @@ package common import ( - "engo.io/engo" - "engo.io/gl" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/gl" ) type RenderBuffer struct { diff --git a/common/render_shaders.go b/common/render_shaders.go index e4e4765f..e775abe0 100644 --- a/common/render_shaders.go +++ b/common/render_shaders.go @@ -7,10 +7,10 @@ import ( "strings" "sync" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/math" - "engo.io/gl" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/math" + "github.com/EngoEngine/gl" ) // UnicodeCap is the amount of unicode characters the fonts will be able to use, starting from index 0. diff --git a/common/render_shaders_blendmap.go b/common/render_shaders_blendmap.go index e78f823e..ea6a3ab2 100644 --- a/common/render_shaders_blendmap.go +++ b/common/render_shaders_blendmap.go @@ -3,9 +3,9 @@ package common import ( "fmt" - "engo.io/ecs" - "engo.io/engo" - "engo.io/gl" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/gl" ) type TexturePack struct { @@ -58,10 +58,10 @@ const ( #else #define LOWP #endif - + varying vec4 var_Color; varying vec2 var_TexCoords; - + uniform sampler2D uf_BlendMap; uniform sampler2D uf_Fallback; uniform sampler2D uf_RChannel; @@ -74,11 +74,11 @@ const ( uniform vec2 uf_scaleB; - vec4 getChan(sampler2D ch, vec2 scale) + vec4 getChan(sampler2D ch, vec2 scale) { return texture2D(ch, vec2(var_TexCoords.x * scale.x, var_TexCoords.y * scale.y)); } - + void main(void){ vec4 mapIdx = texture2D(uf_BlendMap,var_TexCoords); diff --git a/common/render_shaders_test.go b/common/render_shaders_test.go index d35e80f5..04858f8a 100644 --- a/common/render_shaders_test.go +++ b/common/render_shaders_test.go @@ -5,8 +5,8 @@ package common import ( "testing" - "engo.io/ecs" - "engo.io/engo" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" "github.com/stretchr/testify/assert" ) diff --git a/common/render_shapes.go b/common/render_shapes.go index 1aa3109d..e8e4803e 100644 --- a/common/render_shapes.go +++ b/common/render_shapes.go @@ -3,8 +3,8 @@ package common import ( "image/color" - "engo.io/engo" - "engo.io/gl" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/gl" ) // TriangleType is the type of triangle: Right or Isosceles. diff --git a/common/spritesheet.go b/common/spritesheet.go index 9e0702b9..db04ea4a 100644 --- a/common/spritesheet.go +++ b/common/spritesheet.go @@ -3,9 +3,9 @@ package common import ( "log" - "engo.io/engo" - "engo.io/engo/math" - "engo.io/gl" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/math" + "github.com/EngoEngine/gl" ) // Spritesheet is a class that stores a set of tiles from a file, used by tilemaps and animations diff --git a/common/tmx_filetype.go b/common/tmx_filetype.go index a54a675e..13b0fc9e 100644 --- a/common/tmx_filetype.go +++ b/common/tmx_filetype.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "engo.io/engo" + "github.com/EngoEngine/engo" ) // TMXResource contains a level created from a Tile Map XML diff --git a/common/tmx_level.go b/common/tmx_level.go index 17937108..0d9e2747 100644 --- a/common/tmx_level.go +++ b/common/tmx_level.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "engo.io/engo" + "github.com/EngoEngine/engo" "github.com/Noofbiz/tmx" ) diff --git a/common/tmx_test.go b/common/tmx_test.go index 466e66db..7f3d29d3 100644 --- a/common/tmx_test.go +++ b/common/tmx_test.go @@ -10,7 +10,7 @@ import ( "testing" "text/template" - "engo.io/engo" + "github.com/EngoEngine/engo" ) var testTMXtmpl = ` diff --git a/demos/adventure/adventure.go b/demos/adventure/adventure.go index b7015e90..3c2bd050 100644 --- a/demos/adventure/adventure.go +++ b/demos/adventure/adventure.go @@ -6,9 +6,9 @@ import ( "image/color" "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) var ( diff --git a/demos/animation/anim.go b/demos/animation/anim.go index 431b0956..db283296 100644 --- a/demos/animation/anim.go +++ b/demos/animation/anim.go @@ -5,9 +5,9 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) var ( diff --git a/demos/audio/audio.go b/demos/audio/audio.go index b65916ec..3a78fe77 100644 --- a/demos/audio/audio.go +++ b/demos/audio/audio.go @@ -6,9 +6,9 @@ import ( "image/color" "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/blendmap/main.go b/demos/blendmap/main.go index 6dd907ef..8e8d0861 100644 --- a/demos/blendmap/main.go +++ b/demos/blendmap/main.go @@ -1,9 +1,9 @@ package main import ( - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/demoutils/utils.go b/demos/demoutils/utils.go index cf1ab11b..0ac8d144 100644 --- a/demos/demoutils/utils.go +++ b/demos/demoutils/utils.go @@ -6,9 +6,9 @@ import ( "image" "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type Background struct { diff --git a/demos/edgescroller/escroller.go b/demos/edgescroller/escroller.go index 0cbbdf2f..c2650831 100644 --- a/demos/edgescroller/escroller.go +++ b/demos/edgescroller/escroller.go @@ -5,10 +5,10 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" - "engo.io/engo/demos/demoutils" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" + "github.com/EngoEngine/engo/demos/demoutils" ) type DefaultScene struct{} diff --git a/demos/entityscroller/entityscroller.go b/demos/entityscroller/entityscroller.go index 3141db96..76cf8d60 100644 --- a/demos/entityscroller/entityscroller.go +++ b/demos/entityscroller/entityscroller.go @@ -5,9 +5,9 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type GameWorld struct{} diff --git a/demos/exit/exit.go b/demos/exit/exit.go index 92165473..9ab1cecf 100644 --- a/demos/exit/exit.go +++ b/demos/exit/exit.go @@ -5,9 +5,9 @@ package main import ( "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/falling/falling.go b/demos/falling/falling.go index 960fad94..f329d893 100644 --- a/demos/falling/falling.go +++ b/demos/falling/falling.go @@ -7,9 +7,9 @@ import ( "log" "math/rand" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type Guy struct { diff --git a/demos/headless/headless.go b/demos/headless/headless.go index 164a9e0c..e53dcad6 100644 --- a/demos/headless/headless.go +++ b/demos/headless/headless.go @@ -9,9 +9,9 @@ import ( "math/rand" "sync" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type PongGame struct{} diff --git a/demos/hello-world/hello.go b/demos/hello-world/hello.go index 6193e5e7..191b9560 100644 --- a/demos/hello-world/hello.go +++ b/demos/hello-world/hello.go @@ -6,9 +6,9 @@ import ( "image/color" "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/hide/hide.go b/demos/hide/hide.go index 4ba1f581..1633c8da 100644 --- a/demos/hide/hide.go +++ b/demos/hide/hide.go @@ -7,9 +7,9 @@ import ( "log" "math/rand" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/hud/hud.go b/demos/hud/hud.go index fead403a..3b57d03e 100644 --- a/demos/hud/hud.go +++ b/demos/hud/hud.go @@ -5,10 +5,10 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" - "engo.io/engo/demos/demoutils" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" + "github.com/EngoEngine/engo/demos/demoutils" ) type DefaultScene struct{} diff --git a/demos/incrementalcamera/incrcamera.go b/demos/incrementalcamera/incrcamera.go index 3e1dc3c6..cb83faae 100644 --- a/demos/incrementalcamera/incrcamera.go +++ b/demos/incrementalcamera/incrcamera.go @@ -6,10 +6,10 @@ import ( "image/color" "time" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" - "engo.io/engo/demos/demoutils" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" + "github.com/EngoEngine/engo/demos/demoutils" ) type DefaultScene struct{} diff --git a/demos/input/input.go b/demos/input/input.go index 327abdba..f71dfbc9 100644 --- a/demos/input/input.go +++ b/demos/input/input.go @@ -5,9 +5,9 @@ package main import ( "fmt" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/isoadventure/iso.go b/demos/isoadventure/iso.go index 0931e138..5523a8ed 100644 --- a/demos/isoadventure/iso.go +++ b/demos/isoadventure/iso.go @@ -5,9 +5,9 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) var ( diff --git a/demos/keyboardscroller/kbscroller.go b/demos/keyboardscroller/kbscroller.go index 6d73664e..d6567870 100644 --- a/demos/keyboardscroller/kbscroller.go +++ b/demos/keyboardscroller/kbscroller.go @@ -5,10 +5,10 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" - "engo.io/engo/demos/demoutils" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" + "github.com/EngoEngine/engo/demos/demoutils" ) type DefaultScene struct{} diff --git a/demos/mouse-click/mouse.go b/demos/mouse-click/mouse.go index bfa253b8..376fa064 100644 --- a/demos/mouse-click/mouse.go +++ b/demos/mouse-click/mouse.go @@ -7,9 +7,9 @@ import ( "log" "strconv" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) var fnt *common.Font diff --git a/demos/mouse-drag/mouse.go b/demos/mouse-drag/mouse.go index 207a84c7..abe80702 100644 --- a/demos/mouse-drag/mouse.go +++ b/demos/mouse-drag/mouse.go @@ -5,9 +5,9 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type Guy struct { diff --git a/demos/mouse-follow/follow.go b/demos/mouse-follow/follow.go index e5c1954a..728d9e4a 100644 --- a/demos/mouse-follow/follow.go +++ b/demos/mouse-follow/follow.go @@ -6,9 +6,9 @@ import ( "image/color" "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/mouse/mouse.go b/demos/mouse/mouse.go index 168d9407..ae1e6b0c 100644 --- a/demos/mouse/mouse.go +++ b/demos/mouse/mouse.go @@ -6,9 +6,9 @@ import ( "image/color" "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/mouserotation/rotation.go b/demos/mouserotation/rotation.go index 7766e57b..179a2c5e 100644 --- a/demos/mouserotation/rotation.go +++ b/demos/mouserotation/rotation.go @@ -5,10 +5,10 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" - "engo.io/engo/demos/demoutils" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" + "github.com/EngoEngine/engo/demos/demoutils" ) type DefaultScene struct{} diff --git a/demos/pong/pong.go b/demos/pong/pong.go index 237a4673..fc377992 100644 --- a/demos/pong/pong.go +++ b/demos/pong/pong.go @@ -9,9 +9,9 @@ import ( "math/rand" "sync" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type PongGame struct{} diff --git a/demos/rotation/rotation.go b/demos/rotation/rotation.go index 66686aad..15f36c0e 100644 --- a/demos/rotation/rotation.go +++ b/demos/rotation/rotation.go @@ -6,10 +6,10 @@ import ( "image/color" "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" - "engo.io/engo/math" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" + "github.com/EngoEngine/engo/math" ) type Guy struct { diff --git a/demos/scale/scale.go b/demos/scale/scale.go index f0a37a2b..617826b6 100644 --- a/demos/scale/scale.go +++ b/demos/scale/scale.go @@ -7,9 +7,9 @@ import ( "log" "math/rand" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/scenes/scenes.go b/demos/scenes/scenes.go index f62e5378..cc05a9a6 100644 --- a/demos/scenes/scenes.go +++ b/demos/scenes/scenes.go @@ -8,9 +8,9 @@ import ( "math/rand" "time" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) var ( diff --git a/demos/shapes/shapes.go b/demos/shapes/shapes.go index 052bfe39..d0f81dab 100644 --- a/demos/shapes/shapes.go +++ b/demos/shapes/shapes.go @@ -5,9 +5,9 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/text/text.go b/demos/text/text.go index e7c91c57..aa46a524 100644 --- a/demos/text/text.go +++ b/demos/text/text.go @@ -5,9 +5,9 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/textbox/textbox.go b/demos/textbox/textbox.go index ba2835fd..7bb0477d 100644 --- a/demos/textbox/textbox.go +++ b/demos/textbox/textbox.go @@ -6,9 +6,9 @@ import ( "image/color" "sync" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type DefaultScene struct{} diff --git a/demos/tilemap/tilemap.go b/demos/tilemap/tilemap.go index 33f7cf4e..9d625e1a 100644 --- a/demos/tilemap/tilemap.go +++ b/demos/tilemap/tilemap.go @@ -6,9 +6,9 @@ import ( "image/color" "log" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" ) type GameWorld struct{} diff --git a/demos/zoom/zoom.go b/demos/zoom/zoom.go index 067946fb..942663bb 100644 --- a/demos/zoom/zoom.go +++ b/demos/zoom/zoom.go @@ -5,10 +5,10 @@ package main import ( "image/color" - "engo.io/ecs" - "engo.io/engo" - "engo.io/engo/common" - "engo.io/engo/demos/demoutils" + "github.com/EngoEngine/ecs" + "github.com/EngoEngine/engo" + "github.com/EngoEngine/engo/common" + "github.com/EngoEngine/engo/demos/demoutils" ) type DefaultScene struct{} diff --git a/engo.go b/engo.go index 045fb988..e9362d6d 100644 --- a/engo.go +++ b/engo.go @@ -1,11 +1,11 @@ -package engo // import "engo.io/engo" +package engo import ( "fmt" "log" "sync" - "engo.io/ecs" + "github.com/EngoEngine/ecs" ) // BackEnd represents the back end used for the window management / GL Surface diff --git a/engo_empty.go b/engo_empty.go index cd66381b..1f6153f7 100644 --- a/engo_empty.go +++ b/engo_empty.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "engo.io/gl" + "github.com/EngoEngine/gl" ) var ( diff --git a/engo_glfw.go b/engo_glfw.go index 795d5e2f..d1086812 100644 --- a/engo_glfw.go +++ b/engo_glfw.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - "engo.io/gl" + "github.com/EngoEngine/gl" "github.com/go-gl/glfw/v3.2/glfw" "github.com/Noofbiz/glfwMojaveFix" diff --git a/engo_js.go b/engo_js.go index 60d394f0..8a7bebee 100644 --- a/engo_js.go +++ b/engo_js.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "engo.io/gl" + "github.com/EngoEngine/gl" "github.com/gopherjs/gopherwasm/js" ) diff --git a/engo_mobile.go b/engo_mobile.go index 5b5d0073..2c359520 100644 --- a/engo_mobile.go +++ b/engo_mobile.go @@ -11,7 +11,7 @@ import ( "syscall" "time" - "engo.io/gl" + "github.com/EngoEngine/gl" "golang.org/x/mobile/app" "golang.org/x/mobile/asset" "golang.org/x/mobile/event/lifecycle" diff --git a/engo_mobile_bind.go b/engo_mobile_bind.go index 28527dda..0bb6d0db 100644 --- a/engo_mobile_bind.go +++ b/engo_mobile_bind.go @@ -8,7 +8,7 @@ import ( "runtime" "time" - "engo.io/gl" + "github.com/EngoEngine/gl" mgl "golang.org/x/mobile/gl" ) diff --git a/engo_sdl.go b/engo_sdl.go index 55a1452f..e16a9450 100644 --- a/engo_sdl.go +++ b/engo_sdl.go @@ -12,7 +12,7 @@ import ( "syscall" "time" - "engo.io/gl" + "github.com/EngoEngine/gl" "github.com/Noofbiz/sdlMojaveFix" "github.com/veandco/go-sdl2/sdl" diff --git a/engo_test.go b/engo_test.go index 1262d520..d6beb0d4 100644 --- a/engo_test.go +++ b/engo_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "engo.io/ecs" + "github.com/EngoEngine/ecs" ) type testScene struct{} diff --git a/math.go b/math.go index 4fc764c6..ab6e93c1 100644 --- a/math.go +++ b/math.go @@ -1,7 +1,7 @@ package engo import ( - "engo.io/engo/math" + "github.com/EngoEngine/engo/math" ) const ( diff --git a/math/abs.go b/math/abs.go index 97fac533..0644da19 100644 --- a/math/abs.go +++ b/math/abs.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Abs returns the absolute value of x. diff --git a/math/acosh.go b/math/acosh.go index 39d4735f..fa577994 100644 --- a/math/acosh.go +++ b/math/acosh.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Acosh returns the inverse hyperbolic cosine of x. diff --git a/math/all.go b/math/all.go index bb2cb5b4..c96529e0 100644 --- a/math/all.go +++ b/math/all.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Acos returns the arccosine, in radians, of x. diff --git a/math/asinh.go b/math/asinh.go index f020d0d5..3e408b14 100644 --- a/math/asinh.go +++ b/math/asinh.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Asinh returns the inverse hyperbolic sine of x. diff --git a/math/bits.go b/math/bits.go index 887ab7df..ce95c2e6 100644 --- a/math/bits.go +++ b/math/bits.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Inf returns positive infinity if sign >= 0, negative infinity if sign < 0. diff --git a/math/clamp.go b/math/clamp.go index ec47fa12..1b088b72 100644 --- a/math/clamp.go +++ b/math/clamp.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Clamp returns f clamped to [low, high] diff --git a/math/imath/math.go b/math/imath/math.go index 8125ff92..0c5ba4d9 100644 --- a/math/imath/math.go +++ b/math/imath/math.go @@ -1,7 +1,7 @@ package imath import ( - engoimath "github.com/engoengine/math/imath" + engoimath "github.com/EngoEngine/math/imath" ) // Integer limit values. diff --git a/math/logb.go b/math/logb.go index 0252a828..b3f54557 100644 --- a/math/logb.go +++ b/math/logb.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Logb returns the binary exponent of x. diff --git a/math/nextafter.go b/math/nextafter.go index 60788a4f..beaf8b34 100644 --- a/math/nextafter.go +++ b/math/nextafter.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Nextafter returns the next representable float32 value after x towards y. diff --git a/math/pow.go b/math/pow.go index 1c7e5805..c8f6afef 100644 --- a/math/pow.go +++ b/math/pow.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Pow returns x**y, the base-x exponential of y. diff --git a/math/pow10.go b/math/pow10.go index a8dfdfdb..c3416426 100644 --- a/math/pow10.go +++ b/math/pow10.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Pow10 returns 10**e, the base-10 exponential of e. diff --git a/math/signbit.go b/math/signbit.go index c855f6d0..10cbf54c 100644 --- a/math/signbit.go +++ b/math/signbit.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Signbit returns true if x is negative or negative zero. diff --git a/math/sin.go b/math/sin.go index 946e4e2d..d1a358cd 100644 --- a/math/sin.go +++ b/math/sin.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Cos returns the cosine of the radian argument x. diff --git a/math/sinh.go b/math/sinh.go index eab9dd92..e85f9890 100644 --- a/math/sinh.go +++ b/math/sinh.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Sinh returns the hyperbolic sine of x. diff --git a/math/span/span.go b/math/span/span.go index 35667a47..1a76a20e 100644 --- a/math/span/span.go +++ b/math/span/span.go @@ -1,7 +1,7 @@ package span import ( - engospan "github.com/engoengine/math/span" + engospan "github.com/EngoEngine/math/span" ) // Span represents an interval. diff --git a/math/sqrt.go b/math/sqrt.go index fe6240a0..7e1f3f40 100644 --- a/math/sqrt.go +++ b/math/sqrt.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Sqrt returns the square root of x. diff --git a/math/tanh.go b/math/tanh.go index 82546e11..ba822c77 100644 --- a/math/tanh.go +++ b/math/tanh.go @@ -1,7 +1,7 @@ package math import ( - engomath "github.com/engoengine/math" + engomath "github.com/EngoEngine/math" ) // Tanh returns the hyperbolic tangent of x. diff --git a/math_test.go b/math_test.go index c13b3826..899934ec 100644 --- a/math_test.go +++ b/math_test.go @@ -3,7 +3,7 @@ package engo import ( "testing" - "engo.io/engo/math" + "github.com/EngoEngine/engo/math" ) func TestFloatEqual(t *testing.T) { From 7d671a46e55cc0742f54d454d2a0bb843363b6a8 Mon Sep 17 00:00:00 2001 From: Jerry Caligiure Date: Sat, 6 Apr 2019 00:35:28 -0400 Subject: [PATCH 2/2] remove mp3 decoder close method --- common/internal/decode/mp3/decode.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/common/internal/decode/mp3/decode.go b/common/internal/decode/mp3/decode.go index 553cdd06..bb735c66 100644 --- a/common/internal/decode/mp3/decode.go +++ b/common/internal/decode/mp3/decode.go @@ -33,7 +33,7 @@ func (s *Stream) Close() error { if s.resampling != nil { return s.resampling.Close() } - return s.orig.Close() + return nil } // Length returns the size of decoded stream in bytes. @@ -60,11 +60,12 @@ func Decode(src convert.ReadSeekCloser, sr int) (*Stream, error) { return nil, err } var r *convert.Resampling - if d.SampleRate() != sr { - r = convert.NewResampling(d, d.Length(), d.SampleRate(), sr) - } - return &Stream{ + stream := &Stream{ orig: d, resampling: r, - }, nil + } + if d.SampleRate() != sr { + stream.resampling = convert.NewResampling(stream, stream.orig.Length(), stream.orig.SampleRate(), sr) + } + return stream, nil }