Merge pull request #522 from ericathegreat/centerOn-scrolling-bugfix

Fixing a bug in centerOn for non-zero origins
craftyjs · Aug 8, 2013 · b4cd71d · b4cd71d
2 parents 425b11a + fa4ad57
commit b4cd71d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/extensions.js b/src/extensions.js
@@ -578,8 +578,8 @@ Crafty.extend({
          * Centers the viewport on the given entity
          */
         centerOn: function (targ, time) {
-            var x = targ.x,
-                    y = targ.y,
+            var x = targ.x + Crafty.viewport.x,
+                    y = targ.y + Crafty.viewport.y,
                     mid_x = targ.w / 2,
                     mid_y = targ.h / 2,
                     cent_x = Crafty.viewport.width / 2,

diff --git a/tests/stage.html b/tests/stage.html
@@ -97,6 +97,15 @@
 		Crafty.timer.simulateFrames(10);
 		equal(Crafty.viewport._x, -e.w / 2 + Crafty.viewport.width / 2, "Entity still centered 10 frames later");
 
+
+		var e2 = Crafty.e("2D, DOM").attr({ x: 450, y: 450, w: 20, h: 20 });
+		Crafty.viewport.scroll('x', 1500);
+		Crafty.viewport.scroll('y', 300);
+		Crafty.viewport.centerOn(e2, 1);
+		Crafty.timer.simulateFrames(1);
+		equal(Crafty.viewport._x, -(e2.x + e2.w/2 - Crafty.viewport.width / 2), "Entity centered from non-zero origin");
+		equal(Crafty.viewport._y, -(e2.y + e2.h/2 - Crafty.viewport.height / 2), "Entity centered from non-zero origin");
+
 		Crafty.viewport.scroll('x', 0);
 		Crafty.viewport.scroll('y', 0);
 	});