Bitbucket -> Github

dcel/pointLoc/bench/trapezoid/trapezoid.go

@@ -4,7 +4,7 @@
 package trapezoid
 
 import (
-	"bitbucket.org/oakmoundstudio/oak/physics"
+	"github.com/oakmound/oak/physics"
 	"github.com/200sc/go-compgeo/dcel"
 	"github.com/200sc/go-compgeo/geom"
 	"github.com/200sc/go-compgeo/printutil"

dcel/pointLoc/trapezoid/trapezoid.go

@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"image/color"
 
-	"bitbucket.org/oakmoundstudio/oak/physics"
+	"github.com/oakmound/oak/physics"
 	"github.com/200sc/go-compgeo/dcel"
 	"github.com/200sc/go-compgeo/dcel/pointLoc/visualize"
 	"github.com/200sc/go-compgeo/geom"

dcel/pointLoc/visualize/visualize.go

@@ -9,8 +9,8 @@ import (
 	"github.com/200sc/go-compgeo/dcel"
 	"github.com/200sc/go-compgeo/geom"
 
-	"bitbucket.org/oakmoundstudio/oak/physics"
-	"bitbucket.org/oakmoundstudio/oak/render"
+	"github.com/oakmound/oak/physics"
+	"github.com/oakmound/oak/render"
 )
 
 var (

demo/demo/addFace.go

@@ -7,15 +7,15 @@ import (
 
 	"golang.org/x/sync/syncmap"
 
-	"bitbucket.org/oakmoundstudio/oak/event"
-	"bitbucket.org/oakmoundstudio/oak/mouse"
-	"bitbucket.org/oakmoundstudio/oak/render"
 	"github.com/200sc/go-compgeo/dcel"
 	"github.com/200sc/go-compgeo/dcel/pointLoc/bruteForce"
 	"github.com/200sc/go-compgeo/dcel/pointLoc/kirkpatrick"
 	"github.com/200sc/go-compgeo/dcel/pointLoc/slab"
 	"github.com/200sc/go-compgeo/dcel/pointLoc/trapezoid"
 	"github.com/200sc/go-compgeo/search/tree"
+	"github.com/oakmound/oak/event"
+	"github.com/oakmound/oak/mouse"
+	"github.com/oakmound/oak/render"
 )
 
 var (
@@ -33,8 +33,8 @@ func addFace(cID int, ev interface{}) int {
 	if me.X < 0 || me.Y < 0 || me.X > 515 {
 		return 0
 	}
-	mx := float64(me.X) - phd.X
-	my := float64(me.Y) - phd.Y
+	mx := float64(me.X) - phd.X()
+	my := float64(me.Y) - phd.Y()
 	if me.Button == "LeftMouse" {
 		// Detect clicks
 		// On first click, declare the first point and edge and face
@@ -248,8 +248,8 @@ func addFace(cID int, ev interface{}) int {
 					}
 					poly := PolygonFromFace(f)
 					poly.Fill(color.RGBA{125, 0, 0, 125})
-					poly.ShiftX(phd.X)
-					poly.ShiftY(phd.Y)
+					poly.ShiftX(phd.X())
+					poly.ShiftY(phd.Y())
 					render.Draw(poly, 10)
 					render.UndrawAfter(poly, 1500*time.Millisecond)
 				}

demo/demo/button.go

@@ -3,11 +3,11 @@ package demo
 import (
 	"fmt"
 
-	"bitbucket.org/oakmoundstudio/oak/collision"
-	"bitbucket.org/oakmoundstudio/oak/entities"
-	"bitbucket.org/oakmoundstudio/oak/event"
-	"bitbucket.org/oakmoundstudio/oak/mouse"
-	"bitbucket.org/oakmoundstudio/oak/render"
+	"github.com/oakmound/oak/collision"
+	"github.com/oakmound/oak/entities"
+	"github.com/oakmound/oak/event"
+	"github.com/oakmound/oak/mouse"
+	"github.com/oakmound/oak/render"
 )
 
 // A Button is a UI element that has transient background,
@@ -56,7 +56,7 @@ func (b *Button) SetPos(x float64, y float64) {
 	}
 
 	if b.Space != nil {
-		mouse.UpdateSpace(b.X, b.Y, b.W, b.H, b.Space)
+		mouse.UpdateSpace(b.X(), b.Y(), b.W, b.H, b.Space)
 	}
 }
 
@@ -78,6 +78,6 @@ func (b *Button) SetText(txt fmt.Stringer) {
 	if b.Text != nil {
 		b.Text.UnDraw()
 	}
-	b.Text = b.Font.NewText(txt, b.X+b.TxtX, b.Y-b.TxtY+b.H)
+	b.Text = b.Font.NewText(txt, b.X()+b.TxtX, b.Y()-b.TxtY+b.H)
 	render.Draw(b.Text, b.Layer+1)
 }

demo/demo/enter.go

@@ -2,9 +2,9 @@ package demo
 
 import (
 	"bitbucket.org/oakmoundstudio/oak"
-	"bitbucket.org/oakmoundstudio/oak/event"
-	"bitbucket.org/oakmoundstudio/oak/mouse"
 	"github.com/200sc/go-compgeo/geom"
+	"github.com/oakmound/oak/event"
+	"github.com/oakmound/oak/mouse"
 )
 
 func phdEnter(cID int, nothing interface{}) int {
@@ -43,7 +43,7 @@ func phdEnter(cID int, nothing interface{}) int {
 	nme := mouse.LastMouseEvent
 	mX := float64(nme.X)
 	mY := float64(nme.Y)
-	mouseStr.SetText(geom.Point{mX - phd.X, mY - phd.Y, mouseZ})
+	mouseStr.SetText(geom.Point{mX - phd.X(), mY - phd.Y(), mouseZ})
 	if mX < 0 || mY < 0 || mX > 515 {
 		dragX = -1
 		dragY = -1
@@ -76,12 +76,12 @@ func phdEnter(cID int, nothing interface{}) int {
 		update := false
 		if dragX != -1 {
 			phd.Vertices[dragging].Point =
-				phd.Vertices[dragging].Set(0, float64(dragX)-phd.X).(geom.Point)
+				phd.Vertices[dragging].Set(0, float64(dragX)-phd.X()).(geom.Point)
 			update = true
 		}
 		if dragY != -1 {
 			phd.Vertices[dragging].Point =
-				phd.Vertices[dragging].Set(1, float64(dragY)-phd.Y).(geom.Point)
+				phd.Vertices[dragging].Set(1, float64(dragY)-phd.Y()).(geom.Point)
 			update = true
 		}
 		if oak.IsDown("D") {

demo/demo/interactivePoint.go

@@ -3,10 +3,10 @@ package demo
 import (
 	"time"
 
-	"bitbucket.org/oakmoundstudio/oak/collision"
-	"bitbucket.org/oakmoundstudio/oak/event"
-	"bitbucket.org/oakmoundstudio/oak/mouse"
-	"bitbucket.org/oakmoundstudio/oak/render"
+	"github.com/oakmound/oak/collision"
+	"github.com/oakmound/oak/event"
+	"github.com/oakmound/oak/mouse"
+	"github.com/oakmound/oak/render"
 	"github.com/200sc/go-compgeo/dcel"
 )
 

demo/demo/interactivePoly.go

@@ -1,9 +1,9 @@
 package demo
 
 import (
-	"bitbucket.org/oakmoundstudio/oak/event"
-	"bitbucket.org/oakmoundstudio/oak/mouse"
-	"bitbucket.org/oakmoundstudio/oak/render"
+	"github.com/oakmound/oak/event"
+	"github.com/oakmound/oak/mouse"
+	"github.com/oakmound/oak/render"
 )
 
 // An InteractivePolyhedron is a wrapper around
@@ -51,8 +51,8 @@ func (ip *InteractivePolyhedron) UpdateSpaces() {
 			ip.vs[i] = NewInteractivePoint(v, i)
 		}
 		ip.vs[i].Vertex = v
-		mouse.UpdateSpace(ip.X+(v.X()-vCollisionDim/2),
-			ip.Y+(v.Y()-vCollisionDim/2),
+		mouse.UpdateSpace(ip.X()+(v.X()-vCollisionDim/2),
+			ip.Y()+(v.Y()-vCollisionDim/2),
 			vCollisionDim, vCollisionDim, ip.vs[i].s)
 	}
 }

demo/demo/polyhedron.go

@@ -6,10 +6,10 @@ import (
 	"math"
 	"sort"
 
-	"bitbucket.org/oakmoundstudio/oak/physics"
-	"bitbucket.org/oakmoundstudio/oak/render"
 	"github.com/200sc/go-compgeo/dcel"
 	"github.com/200sc/go-compgeo/geom"
+	"github.com/oakmound/oak/physics"
+	"github.com/oakmound/oak/render"
 )
 
 // Polyhedron is a type which extends render.Renderable,
@@ -43,7 +43,7 @@ func NewPolyhedronFromDCEL(dc *dcel.DCEL, x, y float64) *Polyhedron {
 	p.SetPos(x, y)
 	p.DCEL = *dc
 	p.Update()
-	p.Center = physics.NewVector(p.X+(1+p.MaxX())/2, p.Y+(1+p.MaxY())/2)
+	p.Center = physics.NewVector(p.X()+(1+p.MaxX())/2, p.Y()+(1+p.MaxY())/2)
 	return p
 }
 
@@ -69,11 +69,11 @@ func (p *Polyhedron) Update() {
 	// one place on screen. This is not exactly the expected
 	// behavior from someone rotating a shape, but it is
 	// close.
-	if p.Center.X != 0 || p.Center.Y != 0 {
-		cx := p.X + maxX/2
-		cy := p.Y + maxY/2
-		p.X -= (cx - p.Center.X)
-		p.Y -= (cy - p.Center.Y)
+	if p.Center.X() != 0 || p.Center.Y() != 0 {
+		cx := p.X() + maxX/2
+		cy := p.Y() + maxY/2
+		p.SetX(p.X() - (cx - p.Center.X()))
+		p.SetY(p.Y() - (cy - p.Center.Y()))
 	}
 
 	// Eventually:
@@ -315,12 +315,12 @@ func (p *Polyhedron) String() string {
 
 // ShiftX moves a polyhedron and its center along the x axis
 func (p *Polyhedron) ShiftX(x float64) {
-	p.Center.X += x
+	p.Center.ShiftX(x)
 	p.Sprite.ShiftX(x)
 }
 
 // ShiftY moves a polyhedron and its center along the y axis
 func (p *Polyhedron) ShiftY(y float64) {
-	p.Center.Y += y
+	p.Center.ShiftY(y)
 	p.Sprite.ShiftY(y)
 }

demo/demo/scene.go

@@ -13,13 +13,13 @@ import (
 	"golang.org/x/sync/syncmap"
 
 	"bitbucket.org/oakmoundstudio/oak"
-	"bitbucket.org/oakmoundstudio/oak/event"
-	"bitbucket.org/oakmoundstudio/oak/render"
 	"github.com/200sc/go-compgeo/dcel"
 	"github.com/200sc/go-compgeo/dcel/off"
 	"github.com/200sc/go-compgeo/dcel/pointLoc"
 	"github.com/200sc/go-compgeo/dcel/pointLoc/visualize"
 	"github.com/200sc/go-compgeo/geom"
+	"github.com/oakmound/oak/event"
+	"github.com/oakmound/oak/render"
 )
 
 const (
@@ -110,8 +110,8 @@ func InitScene(prevScene string, data interface{}) {
 	// Scale till 300 wide
 	width := phd.Max(0)
 	phd.Polyhedron.Scale(300 / width)
-	phd.ShiftX(50 - phd.X)
-	phd.ShiftY(50 - phd.Y)
+	phd.ShiftX(50 - phd.X())
+	phd.ShiftY(50 - phd.Y())
 	phd.Init()
 	render.Draw(phd, 0)
 
@@ -300,8 +300,8 @@ func visuals(no int, rt interface{}) int {
 					if visual == nil {
 						return
 					}
-					visual.ShiftX(phd.X)
-					visual.ShiftY(phd.Y)
+					visual.ShiftX(phd.X())
+					visual.ShiftY(phd.Y())
 
 					render.Draw(visual.Renderable, visual.Layer)
 					render.UndrawAfter(visual, 2000*time.Millisecond)

demo/demo/slider.go

@@ -7,10 +7,10 @@ import (
 	"strconv"
 	"time"
 
-	"bitbucket.org/oakmoundstudio/oak/collision"
-	"bitbucket.org/oakmoundstudio/oak/event"
-	"bitbucket.org/oakmoundstudio/oak/mouse"
-	"bitbucket.org/oakmoundstudio/oak/render"
+	"github.com/oakmound/oak/collision"
+	"github.com/oakmound/oak/event"
+	"github.com/oakmound/oak/mouse"
+	"github.com/oakmound/oak/render"
 )
 
 // Slider is a little UI element with a movable slider
@@ -88,7 +88,7 @@ func (sl *Slider) SetPos(x float64, y float64) {
 	}
 
 	if sl.Space != nil {
-		mouse.UpdateSpace(sl.X, sl.Y, sl.W, sl.H, sl.Space)
+		mouse.UpdateSpace(sl.X(), sl.Y(), sl.W, sl.H, sl.Space)
 	}
 }
 
@@ -114,7 +114,7 @@ func sliderDrag(sl int, nothing interface{}) int {
 		sliding = false
 		return event.UnbindEvent
 	}
-	x := float64(me.X) - (slider.X + 5)
+	x := float64(me.X) - (slider.X() + 5)
 	if x <= slider.min {
 		if slider.val == slider.min {
 			return 0
@@ -128,7 +128,7 @@ func sliderDrag(sl int, nothing interface{}) int {
 	} else {
 		slider.val = x
 	}
-	slider.knub.SetPos(slider.X+slider.val+5, slider.knub.GetY())
+	slider.knub.SetPos(slider.X()+slider.val+5, slider.knub.GetY())
 	slider.SetText(slider.valText())
 	return 0
 }