Merge pull request #1710 from Gama11/updateFramePixels

FlxSprite: getFlxFrameBitmapData -> updateFramePixels()
HaxeFlixel · Feb 1, 2016 · d608422 · d608422
2 parents 01f1f21 + bff1c46
commit d608422
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/flixel/FlxSprite.hx b/flixel/FlxSprite.hx
@@ -577,7 +577,7 @@ class FlxSprite extends FlxObject
 		if (FlxG.renderBlit)
 		{
 			dirty = true;
-			getFlxFrameBitmapData();
+			updateFramePixels();
 		}
 	}
 
@@ -852,7 +852,7 @@ class FlxSprite extends FlxObject
 		}
 		else // 2. Check pixel at (_flashPoint.x, _flashPoint.y)
 		{
-			var frameData:BitmapData = getFlxFrameBitmapData();
+			var frameData:BitmapData = updateFramePixels();
 			var pixelColor:FlxColor = frameData.getPixel32(Std.int(_flashPoint.x), Std.int(_flashPoint.y));
 			return pixelColor.alpha * alpha >= Mask;
 		}
@@ -871,13 +871,13 @@ class FlxSprite extends FlxObject
 		if (FlxG.renderTile && !RunOnCpp)
 			return;
 
-		getFlxFrameBitmapData();
+		updateFramePixels();
 	}
 
 	/**
 	 * Retrieves BitmapData of current FlxFrame. Updates framePixels.
 	 */
-	public function getFlxFrameBitmapData():BitmapData
+	public function updateFramePixels():BitmapData
 	{
 		if (_frame == null || !dirty)
 			return framePixels;
@@ -1317,7 +1317,7 @@ class FlxSprite extends FlxObject
 
 				if (value)
 				{
-					getFlxFrameBitmapData();
+					updateFramePixels();
 				}
 			}
 

diff --git a/tests/unit/src/flixel/FlxSpriteTest.hx b/tests/unit/src/flixel/FlxSpriteTest.hx
@@ -235,6 +235,6 @@ class FlxSpriteTest extends FlxTest
 		sprite.stamp(text);
 
 		Assert.areEqual(FlxColor.RED,
-			sprite.getFlxFrameBitmapData().getPixel32(3, 3));
+			sprite.updateFramePixels().getPixel32(3, 3));
 	}
 }