Skip to content

6.1.0 upkeep, non-null colorTransform #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

6.1.0 upkeep, non-null colorTransform #460

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions flixel/addons/display/FlxNestedSprite.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package flixel.addons.display;

import flixel.util.FlxDirectionFlags;
import openfl.geom.ColorTransform;
import flixel.FlxBasic;
import flixel.FlxG;
import flixel.FlxSprite;
Expand All @@ -12,6 +10,8 @@ import flixel.math.FlxVelocity;
import flixel.system.FlxAssets.FlxGraphicAsset;
import flixel.util.FlxColor;
import flixel.util.FlxDestroyUtil;
import flixel.util.FlxDirectionFlags;
import openfl.geom.ColorTransform;

using flixel.util.FlxArrayUtil;

Expand Down Expand Up @@ -297,6 +297,7 @@ class FlxNestedSprite extends FlxSprite
var green:Float = (color >> 8 & 0xff) * _parentGreen / 255;
var blue:Float = (color & 0xff) * _parentBlue / 255;

#if (flixel < version("6.1.0"))
if (colorTransform == null)
{
colorTransform = new ColorTransform(red, green, blue, alpha);
Expand All @@ -309,9 +310,16 @@ class FlxNestedSprite extends FlxSprite
colorTransform.alphaMultiplier = alpha;
}
useColorTransform = true;
#else
colorTransform.redMultiplier = red;
colorTransform.greenMultiplier = green;
colorTransform.blueMultiplier = blue;
colorTransform.alphaMultiplier = alpha;
#end
}
else
{
#if (flixel < version("6.1.0"))
if (colorTransform != null)
{
colorTransform.redMultiplier = 1;
Expand All @@ -320,6 +328,12 @@ class FlxNestedSprite extends FlxSprite
colorTransform.alphaMultiplier = 1;
}
useColorTransform = false;
#else
colorTransform.redMultiplier = 1;
colorTransform.greenMultiplier = 1;
colorTransform.blueMultiplier = 1;
colorTransform.alphaMultiplier = 1;
#end
}
dirty = true;

Expand Down Expand Up @@ -348,6 +362,7 @@ class FlxNestedSprite extends FlxSprite
color = combinedColor;
if ((alpha != 1) || (color != 0x00ffffff))
{
#if (flixel < version("6.1.0"))
if (colorTransform == null)
{
colorTransform = new ColorTransform(combinedRed, combinedGreen, combinedBlue, alpha);
Expand All @@ -360,9 +375,16 @@ class FlxNestedSprite extends FlxSprite
colorTransform.alphaMultiplier = alpha;
}
useColorTransform = true;
#else
colorTransform.redMultiplier = combinedRed;
colorTransform.greenMultiplier = combinedGreen;
colorTransform.blueMultiplier = combinedBlue;
colorTransform.alphaMultiplier = alpha;
#end
}
else
{
#if (flixel < version("6.1.0"))
if (colorTransform != null)
{
colorTransform.redMultiplier = 1;
Expand All @@ -371,6 +393,12 @@ class FlxNestedSprite extends FlxSprite
colorTransform.alphaMultiplier = 1;
}
useColorTransform = false;
#else
colorTransform.redMultiplier = 1;
colorTransform.greenMultiplier = 1;
colorTransform.blueMultiplier = 1;
colorTransform.alphaMultiplier = 1;
#end
}

dirty = true;
Expand Down