Skip to content

Commit

Permalink
removing import paths from custom domain
Browse files Browse the repository at this point in the history
  • Loading branch information
Noofbiz committed Apr 6, 2019
1 parent 4760236 commit 989c8af
Show file tree
Hide file tree
Showing 93 changed files with 214 additions and 212 deletions.
12 changes: 6 additions & 6 deletions .runtests.sh
Original file line number Diff line number Diff line change
@@ -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/*/
Expand Down Expand Up @@ -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/*/
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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`.

Expand All @@ -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).
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/animation.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package common
import (
"log"

"engo.io/ecs"
"github.com/EngoEngine/ecs"
)

// Animation represents properties of an animation.
Expand Down
6 changes: 3 additions & 3 deletions common/animation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions common/audio.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions common/audio_filetype.go
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
4 changes: 2 additions & 2 deletions common/audio_player.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common/audio_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"testing"
"time"

"engo.io/ecs"
"engo.io/engo"
"github.com/EngoEngine/ecs"
"github.com/EngoEngine/engo"
)

type testAudio struct {
Expand Down
8 changes: 4 additions & 4 deletions common/camera.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common/camera_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
6 changes: 3 additions & 3 deletions common/collision.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common/collision_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions common/font.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion common/font_filetype.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"io/ioutil"

"engo.io/engo"
"github.com/EngoEngine/engo"
"github.com/golang/freetype"
"github.com/golang/freetype/truetype"
)
Expand Down
4 changes: 2 additions & 2 deletions common/fps.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion common/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

package common

import "engo.io/ecs"
import "github.com/EngoEngine/ecs"

// Getters

Expand Down
4 changes: 2 additions & 2 deletions common/interfaces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion common/internal/decode/mp3/decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion common/internal/decode/vorbis/decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion common/internal/decode/wav/decode.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions common/level.go
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions common/mouse.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions common/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions common/render_filetype.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions common/render_framebuffer.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package common

import (
"engo.io/engo"
"engo.io/gl"
"github.com/EngoEngine/engo"
"github.com/EngoEngine/gl"
)

type RenderBuffer struct {
Expand Down
8 changes: 4 additions & 4 deletions common/render_shaders.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 989c8af

Please sign in to comment.