Merge branch 'develop' into testing

playgrounds/parallax.html

@@ -73,6 +73,11 @@
  Crafty.e("Background, Bar, Collision, WiredHitBox").color("blue").attr({x: 100*i, y: 10, z: 30});
  Crafty.e("Midground, Bar, Collision, WiredHitBox").color("purple").attr({x: 100*i, y: 20, z: 30});
  Crafty.e("Foreground, Bar, Collision, WiredHitBox").color("yellow").attr({x: 100*i, y: 30, z: 10});
+
+ // A hitbox not attached to a renderable entity should track the default layer
+ Crafty.e("2D, Collision, WiredHitBox").debugStroke("green").attr({x: 100*i, y: 40, z: 100, h: 100, w: 31});
+ Crafty.e("ActionLayer, Bar").color("brown").attr({x: 100*i, y: 40, z: 100});
+
  }
 
  // Some text that shows the viewport's current position, and sits in the UI layer

src/debug/debug-layer.js

@@ -454,12 +454,17 @@ Crafty.DebugCanvas = {
  current = q[i];
 
  // If necessary, update the view transform to match the current entities layer
- if (lastLayer !== current._drawlayer){
- view = current._drawLayer._viewportRect();
- ctx.setTransform(view._scale, 0, 0, view._scale, Math.round(-view._x*view._scale), Math.round(-view._y*view._scale));
+ // If the current entity has no layer, switch back to the viewport's transform
+ if (lastLayer !== current._drawLayer){
+ if (current._drawLayer) {
+ view = current._drawLayer._viewportRect();
+ ctx.setTransform(view._scale, 0, 0, view._scale, Math.round(-view._x*view._scale), Math.round(-view._y*view._scale));
+ } else {
+ view = Crafty.viewport;
+ ctx.setTransform(view._scale, 0, 0, view._scale, Math.round(view._x*view._scale), Math.round(view._y*view._scale));
+ }
  lastLayer = current._drawLayer;
  }
-
  current.debugDraw(ctx);
  }
 

src/spatial/collision.js

@@ -532,7 +532,7 @@ Crafty.c("Collision", {
  SAT.obj = obj;
  SAT.type = "SAT";
  }
- } else if (Crafty.rectManager.overlap(area, this._cbr || this._mbr || this)){
+ } else if (Crafty.rectManager.overlap(area, obj._cbr || obj._mbr || obj)){
  results.push({
  obj: obj,
  type: "MBR"

tests/unit/spatial/collision.js

@@ -103,6 +103,24 @@
  _.ok('overlap' in results[0], "expected overlap value");
  });
 
+ test("hit -- collision vs. non collision tests", function(_){
+ var e1 = Crafty.e("2D, Collision")
+ .attr({x: 0, y: 0, w: 2, h: 2});
+ var e2 = Crafty.e("2D")
+ .attr({x: 0, y: 0, w: 2, h: 2});
+ var results = e1.hit('2D');
+ _.strictEqual(results.length, 1, "exactly one collision");
+ _.strictEqual(results[0].type, "MBR", "expected MBR collision type");
+ _.strictEqual(results[0].obj[0], e2[0], "expected collision with e2");
+
+ // Move e2 such that it should be returned by the broadphase search
+ // (i.e. it's in the same cell of the spatial hashmap)
+ // but doesn't actually overlap e1's MBR
+ e2.x=3;
+ var newResults = e1.hit('2D');
+ _.ok(!newResults, 0, "No collisions");
+ });
+
  test("onHit", function(_) {
  var e = Crafty.e("2D, Collision")
  .attr({x: 0, y: 0, w: 25, h: 25});