Merge pull request #85 from oakmound/release/2.2.0

Release/2.2.0

.gitignore

@@ -12,3 +12,7 @@
 
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
+
+# As a library we can't commit our vendor directory if it ever accidentally kept
+# around after updating dependencies
+vendor/*

Gopkg.toml

@@ -24,11 +24,6 @@
 #   go-tests = true
 #   unused-packages = true
 
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/200sc/go-dist"
-
 [[constraint]]
   name = "github.com/200sc/klangsynthese"
   version = "0.1.1"
@@ -53,13 +48,9 @@
   branch = "master"
   name = "github.com/golang/freetype"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/oakmound/lowrez17"
-
 [[constraint]]
   name = "github.com/oakmound/shiny"
-  version = "0.1.0"
+  version = "0.2.0"
 
 [[constraint]]
   name = "github.com/stretchr/testify"

collision/rtree.go

@@ -22,6 +22,11 @@ type Rtree struct {
 	height      int
 }
 
+// Size returns the rtree's size
+func (tree *Rtree) Size() int {
+	return tree.size
+}
+
 // NewTree creates a new R-tree instance.
 func newTree(MinChildren, MaxChildren int) *Rtree {
 	rt := Rtree{MinChildren: MinChildren, MaxChildren: MaxChildren}
@@ -307,6 +312,7 @@ func (tree *Rtree) Delete(obj *Space) bool {
 	for i, e := range n.entries {
 		if e.obj == obj {
 			ind = i
+			break
 		}
 	}
 	if ind < 0 {

collision/tree.go

@@ -83,15 +83,16 @@ func (t *Tree) Remove(sps ...*Space) int {
 	return removed
 }
 
-// UpdateLabel will set the input space's label in this tree. Modifying a
-// space's label without going through a tree's method such as this will
-// have no effect.
+// UpdateLabel will set the input space's label. DEPRECATED. Just set
+// the Label field on the Space pointer.
 func (t *Tree) UpdateLabel(classtype Label, s *Space) {
-	t.Remove(s)
 	s.Label = classtype
-	t.Add(s)
 }
 
+// ErrNotExist is returned by methods on spaces
+// when the space to update or act on did not exist
+var ErrNotExist = errors.New("Space did not exist to update")
+
 // UpdateSpace resets a space's location to a given
 // rtreego.Rect.
 // This is not an operation on a space because
@@ -102,7 +103,11 @@ func (t *Tree) UpdateSpace(x, y, w, h float64, s *Space) error {
 	}
 	loc := NewRect(x, y, w, h)
 	t.Lock()
-	t.Delete(s)
+	deleted := t.Delete(s)
+	if !deleted {
+		t.Unlock()
+		return ErrNotExist
+	}
 	s.Location = loc
 	t.Insert(s)
 	t.Unlock()
@@ -116,7 +121,11 @@ func (t *Tree) UpdateSpaceRect(rect floatgeom.Rect3, s *Space) error {
 		return oakerr.NilInput{InputName: "s"}
 	}
 	t.Lock()
-	t.Delete(s)
+	deleted := t.Delete(s)
+	if !deleted {
+		t.Unlock()
+		return ErrNotExist
+	}
 	s.Location = rect
 	t.Insert(s)
 	t.Unlock()
@@ -138,8 +147,6 @@ func (t *Tree) ShiftSpace(x, y float64, s *Space) error {
 // themselves, if they exist in the tree, but self-collision
 // will not be reported by Hits.
 func (t *Tree) Hits(sp *Space) []*Space {
-	// Eventually we'll expose SearchIntersect for use cases where you
-	// want to see if you intersect yourself
 	results := t.SearchIntersect(sp.Bounds())
 	hitSelf := -1
 	i := 0

entities/reactive.go

@@ -66,6 +66,11 @@ func (r *Reactive) GetSpace() *collision.Space {
 	return r.RSpace.Space
 }
 
+// GetReactiveSpace returns this reactive's RSpace
+func (r *Reactive) GetReactiveSpace() *collision.ReactiveSpace {
+	return r.RSpace
+}
+
 // Overwrites
 
 // Init satisfies event.Entity

entities/x/btn/textBox.go

@@ -35,9 +35,11 @@ func NewTextBox(cid event.CID, x, y, w, h, txtX, txtY float64,
 	b.Text = f.NewStrText("Init", 0, 0)
 	b.Text.Vector = b.Text.Attach(b.Box.Vector, txtX, (-txtY)+b.H)
 
-	// Add one to the layer so that the text shows up above the box itself
-	layers[len(layers)-1]++
-	render.Draw(b.Text, layers...)
+	// We dont want to modify the input's layers but we do want the text to show up on top of the base renderable.
+	txtLayers := make([]int, len(layers))
+	copy(txtLayers, layers)
+	txtLayers[len(txtLayers)-1]++
+	render.Draw(b.Text, txtLayers...)
 	return b
 }
 

entities/x/force/hurtBox.go

@@ -4,7 +4,6 @@ import (
 	"image/color"
 	"time"
 
-	"github.com/oakmound/lowrez17/game/layers"
 	"github.com/oakmound/oak/collision"
 	"github.com/oakmound/oak/physics"
 	"github.com/oakmound/oak/render"
@@ -28,20 +27,20 @@ func NewHurtBox(x, y, w, h float64, duration time.Duration, l collision.Label, f
 
 // NewHurtColor creates a temporary collision space with a given force it should
 // apply to objects it collides with. The box is rendered as the given color
-func NewHurtColor(x, y, w, h float64, duration time.Duration, l collision.Label, fv physics.ForceVector, c color.Color) {
+func NewHurtColor(x, y, w, h float64, duration time.Duration, l collision.Label, fv physics.ForceVector, c color.Color, layers ...int) {
 	cb := render.NewColorBox(int(w), int(h), c)
-	NewHurtDisplay(x, y, w, h, duration, l, fv, cb)
+	NewHurtDisplay(x, y, w, h, duration, l, fv, cb, layers...)
 }
 
 // NewHurtDisplay creates a temporary collision space with a given force it should
 // apply to objects it collides with. The box is rendered as the given renderable.
 // The input renderable is not copied before it is drawn.
-func NewHurtDisplay(x, y, w, h float64, duration time.Duration, l collision.Label, fv physics.ForceVector, r render.Renderable) {
+func NewHurtDisplay(x, y, w, h float64, duration time.Duration, l collision.Label, fv physics.ForceVector, r render.Renderable, layers ...int) {
 	hb := new(hurtBox)
 	hb.DirectionSpace = NewDirectionSpace(collision.NewLabeledSpace(x, y, w, h, l), fv)
 	collision.Add(hb.Space)
 	r.SetPos(x, y)
-	render.Draw(r, layers.DebugLayer)
+	render.Draw(r, layers...)
 	go timing.DoAfter(duration, func() {
 		collision.Remove(hb.Space)
 		r.Undraw()

entities/x/move/shift.go

@@ -0,0 +1,21 @@
+package move
+
+// ShiftX will ShiftX on the vector of the mover and
+// set the renderable and space positions to that of the updated vector.
+func ShiftX(mvr Mover, x float64) {
+	vec := mvr.Vec()
+	vec.ShiftX(x)
+	mvr.GetRenderable().SetPos(vec.X(), vec.Y())
+	sp := mvr.GetSpace()
+	sp.Update(vec.X(), vec.Y(), sp.GetW(), sp.GetH())
+}
+
+// ShiftY will ShiftY on the vector of the mover and
+// set the renderable and space positions to that of the updated vector.
+func ShiftY(mvr Mover, y float64) {
+	vec := mvr.Vec()
+	vec.ShiftY(y)
+	mvr.GetRenderable().SetPos(vec.X(), vec.Y())
+	sp := mvr.GetSpace()
+	sp.Update(vec.X(), vec.Y(), sp.GetW(), sp.GetH())
+}

entities/x/move/topdown.go

@@ -38,7 +38,8 @@ func TopDown(mvr Mover, up, down, left, right string) {
 	}
 	vec.Add(delta)
 	mvr.GetRenderable().SetPos(vec.X(), vec.Y())
-	mvr.GetSpace().Update(vec.X(), vec.Y(), 16, 16)
+	sp := mvr.GetSpace()
+	sp.Update(vec.X(), vec.Y(), sp.GetW(), sp.GetH())
 }
 
 // CenterScreenOn will cause the screen to center on the given mover, obeying
@@ -58,12 +59,12 @@ func Limit(mvr Mover, rect floatgeom.Rect2) {
 	wf := float64(w)
 	hf := float64(h)
 	if vec.X() < rect.Min.X() {
-		vec.SetX(0)
+		vec.SetX(rect.Min.X())
 	} else if vec.X() > rect.Max.X()-wf {
 		vec.SetX(rect.Max.X() - wf)
 	}
 	if vec.Y() < rect.Min.Y() {
-		vec.SetY(0)
+		vec.SetY(rect.Min.Y())
 	} else if vec.Y() > rect.Max.Y()-hf {
 		vec.SetY(rect.Max.Y() - hf)
 	}