Skip to content

Commit

Permalink
Update module imports
Browse files Browse the repository at this point in the history
  • Loading branch information
200sc committed Jan 11, 2020
1 parent b5c521e commit fd13982
Show file tree
Hide file tree
Showing 206 changed files with 3,011 additions and 540 deletions.
2 changes: 1 addition & 1 deletion alg/floatgeom/point.go
Expand Up @@ -3,7 +3,7 @@ package floatgeom
import (
"math"

"github.com/oakmound/oak/alg"
"github.com/oakmound/oak/v2/alg"
)

// Point2 represents a 2D point on a plane.
Expand Down
2 changes: 1 addition & 1 deletion alg/intgeom/point.go
Expand Up @@ -3,7 +3,7 @@ package intgeom
import (
"math"

"github.com/oakmound/oak/alg"
"github.com/oakmound/oak/v2/alg"
)

// Point2 represents a 2D point in space.
Expand Down
2 changes: 1 addition & 1 deletion alg/stwHeap.go
@@ -1,7 +1,7 @@
package alg

import (
"github.com/oakmound/oak/dlog"
"github.com/oakmound/oak/v2/dlog"
)

type stwHeap struct {
Expand Down
2 changes: 1 addition & 1 deletion audio/audio.go
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/200sc/klangsynthese/audio"
"github.com/200sc/klangsynthese/font"
"github.com/oakmound/oak/oakerr"
"github.com/oakmound/oak/v2/oakerr"
)

// Audio is a struct of some audio data and the variables
Expand Down
2 changes: 1 addition & 1 deletion audio/channels.go
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/200sc/go-dist/intrange"
"github.com/200sc/klangsynthese/font"
"github.com/oakmound/oak/timing"
"github.com/oakmound/oak/v2/timing"
)

// DefActiveChannel acts like GetActiveChannel when fed DefFont
Expand Down
4 changes: 2 additions & 2 deletions audio/ears.go
@@ -1,8 +1,8 @@
package audio

import (
"github.com/oakmound/oak/dlog"
"github.com/oakmound/oak/physics"
"github.com/oakmound/oak/v2/dlog"
"github.com/oakmound/oak/v2/physics"
)

// ScaleType should be moved to a different package that handles global
Expand Down
2 changes: 1 addition & 1 deletion audio/error_test.go
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/stretchr/testify/assert"

"github.com/oakmound/oak/oakerr"
"github.com/oakmound/oak/v2/oakerr"
)

func TestErrorChannel(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion audio/fontManager.go
Expand Up @@ -2,7 +2,7 @@ package audio

import (
"github.com/200sc/klangsynthese/font"
"github.com/oakmound/oak/oakerr"
"github.com/oakmound/oak/v2/oakerr"
)

// A FontManager is a map of names to Fonts that has a built in
Expand Down
6 changes: 3 additions & 3 deletions audio/load.go
Expand Up @@ -8,9 +8,9 @@ import (
"github.com/200sc/klangsynthese/mp3"
"github.com/200sc/klangsynthese/wav"

"github.com/oakmound/oak/dlog"
"github.com/oakmound/oak/fileutil"
"github.com/oakmound/oak/oakerr"
"github.com/oakmound/oak/v2/dlog"
"github.com/oakmound/oak/v2/fileutil"
"github.com/oakmound/oak/v2/oakerr"
)

// Data is an alias for an interface supporting the built in filters in our
Expand Down
2 changes: 1 addition & 1 deletion audio/play.go
Expand Up @@ -2,7 +2,7 @@ package audio

import (
"github.com/200sc/klangsynthese/font"
"github.com/oakmound/oak/dlog"
"github.com/oakmound/oak/v2/dlog"
)

// Play is shorthand for Get followed by Play.
Expand Down
2 changes: 1 addition & 1 deletion audio/posFilter.go
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/200sc/klangsynthese/audio"
"github.com/200sc/klangsynthese/audio/filter"
"github.com/200sc/klangsynthese/audio/filter/supports"
"github.com/oakmound/oak/physics"
"github.com/oakmound/oak/v2/physics"
)

// SupportsPos is a type used by filters to check that the audio they are given
Expand Down
4 changes: 2 additions & 2 deletions collision/attachSpace.go
Expand Up @@ -3,8 +3,8 @@ package collision
import (
"errors"

"github.com/oakmound/oak/event"
"github.com/oakmound/oak/physics"
"github.com/oakmound/oak/v2/event"
"github.com/oakmound/oak/v2/physics"
)

// An AttachSpace is a composable struct that provides attachment
Expand Down
4 changes: 2 additions & 2 deletions collision/attachSpace_test.go
Expand Up @@ -4,8 +4,8 @@ import (
"testing"
"time"

"github.com/oakmound/oak/event"
"github.com/oakmound/oak/physics"
"github.com/oakmound/oak/v2/event"
"github.com/oakmound/oak/v2/physics"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion collision/filter.go
@@ -1,6 +1,6 @@
package collision

import "github.com/oakmound/oak/event"
import "github.com/oakmound/oak/v2/event"

// A Filter will take a set of collision spaces
// and return the subset that match some requirement
Expand Down
2 changes: 1 addition & 1 deletion collision/geom.go
Expand Up @@ -7,7 +7,7 @@ package collision
import (
"math"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/v2/alg/floatgeom"
)

// minDist computes the square of the distance from a point to a rectangle.
Expand Down
2 changes: 1 addition & 1 deletion collision/onCollision.go
Expand Up @@ -3,7 +3,7 @@ package collision
import (
"errors"

"github.com/oakmound/oak/event"
"github.com/oakmound/oak/v2/event"
)

// A Phase is a struct that other structs who want to use PhaseCollision
Expand Down
2 changes: 1 addition & 1 deletion collision/onCollision_test.go
Expand Up @@ -4,7 +4,7 @@ import (
"testing"
"time"

"github.com/oakmound/oak/event"
"github.com/oakmound/oak/v2/event"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion collision/point.go
@@ -1,6 +1,6 @@
package collision

import "github.com/oakmound/oak/alg/floatgeom"
import "github.com/oakmound/oak/v2/alg/floatgeom"

// A Point is a specific point where
// collision occurred and a zone to identify
Expand Down
4 changes: 2 additions & 2 deletions collision/ray/castFilter.go
@@ -1,8 +1,8 @@
package ray

import (
"github.com/oakmound/oak/collision"
"github.com/oakmound/oak/event"
"github.com/oakmound/oak/v2/collision"
"github.com/oakmound/oak/v2/event"
)

// A CastFilter is a function that can be applied to a Caster
Expand Down
4 changes: 2 additions & 2 deletions collision/ray/castLimit.go
@@ -1,8 +1,8 @@
package ray

import (
"github.com/oakmound/oak/collision"
"github.com/oakmound/oak/event"
"github.com/oakmound/oak/v2/collision"
"github.com/oakmound/oak/v2/event"
)

// A CastLimit is a function that can be applied to
Expand Down
4 changes: 2 additions & 2 deletions collision/ray/caster.go
Expand Up @@ -3,8 +3,8 @@ package ray
import (
"math"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/collision"
"github.com/oakmound/oak/v2/alg/floatgeom"
"github.com/oakmound/oak/v2/collision"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions collision/ray/caster_test.go
Expand Up @@ -3,8 +3,8 @@ package ray
import (
"testing"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/collision"
"github.com/oakmound/oak/v2/alg/floatgeom"
"github.com/oakmound/oak/v2/collision"
"github.com/stretchr/testify/require"
)

Expand Down
6 changes: 3 additions & 3 deletions collision/ray/coneCaster.go
@@ -1,9 +1,9 @@
package ray

import (
"github.com/oakmound/oak/alg"
"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/collision"
"github.com/oakmound/oak/v2/alg"
"github.com/oakmound/oak/v2/alg/floatgeom"
"github.com/oakmound/oak/v2/collision"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions collision/ray/raycast_test.go
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

"github.com/200sc/go-dist/floatrange"
"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/collision"
"github.com/oakmound/oak/v2/alg/floatgeom"
"github.com/oakmound/oak/v2/collision"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion collision/rtree.go
Expand Up @@ -9,7 +9,7 @@ import (
"math"
"sort"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/v2/alg/floatgeom"
)

// Rtree represents an R-tree, a balanced search tree for storing and querying
Expand Down
2 changes: 1 addition & 1 deletion collision/rtree_test.go
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"testing"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/v2/alg/floatgeom"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions collision/space.go
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"strconv"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/event"
"github.com/oakmound/oak/physics"
"github.com/oakmound/oak/v2/alg/floatgeom"
"github.com/oakmound/oak/v2/event"
"github.com/oakmound/oak/v2/physics"
)

// ID Types constant
Expand Down
4 changes: 2 additions & 2 deletions collision/space_test.go
Expand Up @@ -3,9 +3,9 @@ package collision
import (
"testing"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/v2/alg/floatgeom"

"github.com/oakmound/oak/physics"
"github.com/oakmound/oak/v2/physics"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion collision/splitTree_test.go
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/200sc/go-dist/floatrange"
"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/v2/alg/floatgeom"
)

type SplitTree struct {
Expand Down
4 changes: 2 additions & 2 deletions collision/tree.go
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"sync"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/oakerr"
"github.com/oakmound/oak/v2/alg/floatgeom"
"github.com/oakmound/oak/v2/oakerr"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion collision/tree_test.go
Expand Up @@ -4,7 +4,7 @@ import (
"math/rand"
"testing"

"github.com/oakmound/oak/alg/floatgeom"
"github.com/oakmound/oak/v2/alg/floatgeom"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
4 changes: 2 additions & 2 deletions config.go
Expand Up @@ -4,9 +4,9 @@ import (
"encoding/json"
"io"

"github.com/oakmound/oak/fileutil"
"github.com/oakmound/oak/v2/fileutil"

"github.com/oakmound/oak/dlog"
"github.com/oakmound/oak/v2/dlog"
)

var (
Expand Down

0 comments on commit fd13982

Please sign in to comment.