Merge pull request scratchfoundation#541 from LLK/fix_edge_bounce

cwillisf · cwillisf · commit 9a8c9023ca66 · 2014-11-12T12:29:44.000-05:00
Use ScratchSprite::bounds() instead of Flash's less accurate getRect() m...
diff --git a/src/primitives/MotionAndPenPrims.as b/src/primitives/MotionAndPenPrims.as
@@ -311,7 +311,7 @@ public class MotionAndPenPrims {
 		// turn away from the nearest edge if it's close enough; otherwise do nothing
 		// Note: comparisons are in the stage coordinates, with origin (0, 0)
 		// use bounding rect of the sprite to account for costume rotation and scale
-		var r:Rectangle = s.getRect(app.stagePane);
+		var r:Rectangle = s.bounds();
 		// measure distance to edges
 		var d1:Number = Math.max(0, r.left);
 		var d2:Number = Math.max(0, r.top);
@@ -338,7 +338,7 @@ public class MotionAndPenPrims {
 	}
 
 	private function ensureOnStageOnBounce(s:ScratchSprite):void {
-		var r:Rectangle = s.getRect(app.stagePane);
+		var r:Rectangle = s.bounds();
 		if (r.left < 0) moveSpriteTo(s, s.scratchX - r.left, s.scratchY);
 		if (r.top < 0) moveSpriteTo(s, s.scratchX, s.scratchY + r.top);
 		if (r.right > ScratchObj.STAGEW) {
