Update for HaxeFlixel/flixel#1060

HaxeFlixel · May 8, 2014 · af9359f · af9359f
1 parent bf39c01
commit af9359f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/flixel/addons/display/FlxNestedSprite.hx b/flixel/addons/display/FlxNestedSprite.hx
@@ -257,7 +257,7 @@ class FlxNestedSprite extends FlxSprite
 				child.angularVelocity = child.angularAcceleration = 0;
 				child.postUpdate();
 
-				if (isSimpleRender())
+				if (isSimpleRender(camera))
 				{
 					child.x = x + child.relativeX - offset.x;
 					child.y = y + child.relativeY - offset.y;

diff --git a/flixel/addons/display/FlxSkewedSprite.hx b/flixel/addons/display/FlxSkewedSprite.hx
@@ -99,7 +99,7 @@ class FlxSkewedSprite extends FlxSprite
 		#end
 
 #if FLX_RENDER_BLIT
-			if (isSimpleRender())
+			if (isSimpleRender(camera))
 			{
 				_point.copyToFlash(_flashPoint);
 				camera.buffer.copyPixels(framePixels, _flashRect, _flashPoint, null, null, true);
@@ -138,7 +138,7 @@ class FlxSkewedSprite extends FlxSprite
 			var sx:Float = scale.x * _facingHorizontalMult;
 			var sy:Float = scale.y * _facingVerticalMult;
 
-			if (isSimpleRender())
+			if (isSimpleRender(camera))
 			{
 				if (flipX)
 				{
@@ -215,12 +215,8 @@ class FlxSkewedSprite extends FlxSprite
 		}
 	}
 
-	public override function isSimpleRender():Bool
+	override public function isSimpleRender(?camera:FlxCamera):Bool
 	{
-		#if FLX_RENDER_BLIT
-		return (((angle == 0) || (bakedRotationAngle > 0)) && (scale.x == 1) && (scale.y == 1) && (skew.x == 0) && (skew.y == 0));
-		#else
-		return (((angle == 0) || (bakedRotationAngle > 0)) && (scale.x == 1) && (scale.y == 1) && (blend == null) && (skew.x == 0) && (skew.y == 0) && pixelPerfectRender);
-		#end
+		return super.isSimpleRender(camera) && (skew.x == 0) && (skew.y == 0);
 	}
 }
diff --git a/flixel/addons/text/FlxBitmapFont.hx b/flixel/addons/text/FlxBitmapFont.hx
@@ -310,7 +310,7 @@ class FlxBitmapFont extends FlxSprite
 			var ssx:Float = 0;
 			var csy:Float = 1;
 
-			if (!isSimpleRender())
+			if (!isSimpleRender(camera))
 			{
 				if (_angleChanged)
 				{
@@ -367,9 +367,9 @@ class FlxBitmapFont extends FlxSprite
 		}
 	}
 
-	override public function isSimpleRender():Bool
+	override public function isSimpleRender(?camera:FlxCamera):Bool
 	{ 
-		return ((angle == 0) && (scale.x == 1) && (scale.y == 1));
+		return (angle == 0) && (scale.x == 1) && (scale.y == 1);
 	}
 	#end