Skip to content
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

Jump to bottom

FlxSpriteUtil curveTo + fixes, etc #1263

Merged
merged 4 commits into from Aug 15, 2014
Merged

FlxSpriteUtil curveTo + fixes, etc #1263

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4c1690
Merge pull request #1 from HaxeFlixel/dev
MSGhero Aug 8, 2014
dc978fd
CurveTo, fixes, etc
MSGhero Aug 9, 2014
29dac62
Removed FillStyle
MSGhero Aug 9, 2014
49f3746
Few updates
MSGhero Aug 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
94 changes: 80 additions & 14 deletions flixel/util/FlxSpriteUtil.hx
View file
Open in desktop
Expand Up @@ -256,13 +256,46 @@ class FlxSpriteUtil
if (lineStyle.color == null)
lineStyle.color = FlxColor.WHITE;

beginDraw(0, lineStyle);
beginDraw(lineStyle);
flashGfx.moveTo(StartX, StartY);
flashGfx.lineTo(EndX, EndY);
endDraw(sprite, drawStyle);
return sprite;
}

/**
* This function draws a curve on a FlxSprite from position X1,Y1
* to anchor position X2,Y2 using control points X3,Y3 with the specified color.
*
* @param sprite The FlxSprite to manipulate
* @param StartX X coordinate of the curve's start point.
* @param StartY Y coordinate of the curve's start point.
* @param EndX X coordinate of the curve's end/anchor point.
* @param EndY Y coordinate of the curve's end/anchor point.
* @param ControlX X coordinate of the curve's control point.
* @param ControlY Y coordinate of the curve's control point.
* @param lineStyle A LineStyle typedef containing the params of Graphics.lineStyle()
* @param fillStyle A FillStyle typedef containing the params of Graphics.fillStyle(). Using this will draw a line from start to end to complete the figure.
* @param drawStyle A DrawStyle typdef containing the params of BitmapData.draw()
* @return The FlxSprite for chaining
*/
public static function drawCurve(sprite:FlxSprite, StartX:Float, StartY:Float, EndX:Float, EndY:Float, ControlX:Float, ControlY:Float,
?lineStyle:LineStyle, ?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
{
if (lineStyle == null)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably be moved into a helper function, exact same code section in drawLine().

lineStyle = { thickness: 1, color: FlxColor.WHITE };
if (lineStyle.thickness == null)
lineStyle.thickness = 1;
if (lineStyle.color == null)
lineStyle.color = FlxColor.WHITE;

beginDraw(lineStyle, fillStyle);
flashGfx.moveTo(StartX, StartY);
flashGfx.curveTo(EndX, EndY, ControlX, ControlY);
endDraw(sprite, drawStyle);
return sprite;
}

/**
* This function draws a rectangle on a FlxSprite.
*
Expand All @@ -280,7 +313,12 @@ class FlxSpriteUtil
public static function drawRect(sprite:FlxSprite, X:Float, Y:Float, Width:Float, Height:Float, Color:FlxColor,
?lineStyle:LineStyle, ?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
{
beginDraw(Color, lineStyle, fillStyle);
if (fillStyle == null)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems extremely redundant to have this in every function. Why not move it to beginDraw()?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, I'll work with that.

{
fillStyle = { hasFill: true, color: Color, alpha: 1 };
}

beginDraw(lineStyle, fillStyle);
flashGfx.drawRect(X, Y, Width, Height);
endDraw(sprite, drawStyle);
return sprite;
Expand All @@ -305,7 +343,12 @@ class FlxSpriteUtil
public static function drawRoundRect(sprite:FlxSprite, X:Float, Y:Float, Width:Float, Height:Float, EllipseWidth:Float,
EllipseHeight:Float, Color:FlxColor, ?lineStyle:LineStyle, ?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
{
beginDraw(Color, lineStyle, fillStyle);
if (fillStyle == null)
{
fillStyle = { hasFill: true, color: Color, alpha: 1 };
}

beginDraw(lineStyle, fillStyle);
flashGfx.drawRoundRect(X, Y, Width, Height, EllipseWidth, EllipseHeight);
endDraw(sprite, drawStyle);
return sprite;
Expand Down Expand Up @@ -335,7 +378,12 @@ class FlxSpriteUtil
TopLeftRadius:Float, TopRightRadius:Float, BottomLeftRadius:Float, BottomRightRadius:Float, Color:FlxColor,
?lineStyle:LineStyle, ?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
{
beginDraw(Color, lineStyle, fillStyle);
if (fillStyle == null)
{
fillStyle = { hasFill: true, color: Color, alpha: 1 };
}

beginDraw(lineStyle, fillStyle);
flashGfx.drawRoundRectComplex(X, Y, Width, Height, TopLeftRadius, TopRightRadius, BottomLeftRadius, BottomRightRadius);
endDraw(sprite, drawStyle);
return sprite;
Expand All @@ -356,7 +404,7 @@ class FlxSpriteUtil
* @return The FlxSprite for chaining
*/
public static function drawCircle(sprite:FlxSprite, X:Float = - 1, Y:Float = - 1, Radius:Float = -1,
Color:FlxColor = FlxColor.WHITE, ?lineStyle:LineStyle, ?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
Color:FlxColor, ?lineStyle:LineStyle, ?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why remove the default color value?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's the only place where the default color is specified, I could add the default color to each draw- if that's better. Consistency mostly.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather add a default to the others than remove it here for no reason (which also breaks backwards-compatibility).

{
if ((X == -1) || (Y == -1))
{
Expand All @@ -376,7 +424,12 @@ class FlxSpriteUtil
Radius = (minVal / 2);
}

beginDraw(Color, lineStyle, fillStyle);
if (fillStyle == null)
{
fillStyle = { hasFill: true, color: Color, alpha: 1 };
}

beginDraw(lineStyle, fillStyle);
flashGfx.drawCircle(X, Y, Radius);
endDraw(sprite, drawStyle);
return sprite;
Expand All @@ -399,7 +452,12 @@ class FlxSpriteUtil
public static function drawEllipse(sprite:FlxSprite, X:Float, Y:Float, Width:Float, Height:Float, Color:FlxColor,
?lineStyle:LineStyle, ?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
{
beginDraw(Color, lineStyle, fillStyle);
if (fillStyle == null)
{
fillStyle = { hasFill: true, color: Color, alpha: 1 };
}

beginDraw(lineStyle, fillStyle);
flashGfx.drawEllipse(X, Y, Width, Height);
endDraw(sprite, drawStyle);
return sprite;
Expand All @@ -421,7 +479,12 @@ class FlxSpriteUtil
public static function drawTriangle(sprite:FlxSprite, X:Float, Y:Float, Height:Float, Color:FlxColor,
?lineStyle:LineStyle, ?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
{
beginDraw(Color, lineStyle, fillStyle);
if (fillStyle == null)
{
fillStyle = { hasFill: true, color: Color, alpha: 1 };
}

beginDraw(lineStyle, fillStyle);
flashGfx.moveTo(X + Height / 2, Y);
flashGfx.lineTo(X + Height, Height + Y);
flashGfx.lineTo(X, Height + Y);
Expand All @@ -444,7 +507,12 @@ class FlxSpriteUtil
public static function drawPolygon(sprite:FlxSprite, Vertices:Array<FlxPoint>, Color:FlxColor, ?lineStyle:LineStyle,
?fillStyle:FillStyle, ?drawStyle:DrawStyle):FlxSprite
{
beginDraw(Color, lineStyle, fillStyle);
if (fillStyle == null)
{
fillStyle = { hasFill: true, color: Color, alpha: 1 };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously, the Color param was treated as ARBG I think. Now alpha is always 1.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like fillStyle is kinda useless, if Color can be both the color and alpha fields. Only useful thing is hasFill. Will fix in a bit.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is, kind of... it was added later on I think. I guess hasFill could theoretically be covered by a color != FlxColor.TRANSPARENT check?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I was thinking. That breaks compatibility, but it makes more sense.

}

beginDraw(lineStyle, fillStyle);
var p:FlxPoint = Vertices.shift();
flashGfx.moveTo(p.x, p.y);
for (p in Vertices)
Expand All @@ -463,18 +531,16 @@ class FlxSpriteUtil
* @param fillStyle A FillStyle typedef containing the params of Graphics.fillStyle()
*/
@:noUsing
public static inline function beginDraw(Color:FlxColor, ?lineStyle:LineStyle, ?fillStyle:FillStyle):Void
public static inline function beginDraw(?lineStyle:LineStyle, ?fillStyle:FillStyle):Void
{
flashGfx.clear();
setLineStyle(lineStyle);

if ((fillStyle != null) && (fillStyle.hasFill))
{
//use the fillStyle for color information
Color = fillStyle.color;
flashGfx.beginFill(fillStyle.color.to24Bit(), fillStyle.alpha);
}

flashGfx.beginFill(Color.to24Bit(), Color.alphaFloat);
}

/**
Expand Down Expand Up @@ -663,4 +729,4 @@ typedef DrawStyle = {
?blendMode:BlendMode,
?clipRect:Rectangle,
?smoothing:Bool
}
}