FlxSpriteUtil curveTo + fixes, etc #1263
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
beginFill only if a fillStyle is specified or assumed
| @@ -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) | |||
There was a problem hiding this comment.
Seems extremely redundant to have this in every function. Why not move it to beginDraw()?
There was a problem hiding this comment.
Good point, I'll work with that.
The Color param makes fillStyles moot. Added a default line thickness to setLineStyle.
|
Gonna look through the demos now... Edit: The addons package has a bunch, sifting through those now. |
| @@ -529,6 +551,7 @@ class FlxSpriteUtil | |||
| if (lineStyle != null) | |||
| { | |||
| var color = (lineStyle.color == null) ? FlxColor.BLACK : lineStyle.color; | |||
| if (lineStyle.thickness == null) { lineStyle.thickness = 1; } | |||
There was a problem hiding this comment.
If you create a lineStyle object, I feel like 99% of the time you want it to have a thickness. {color:FlxColor.RED} doesn't do anything right now since the default thickness is 0.
FillColor instead of Color
|
"Calculator" is failing in the Travis CI, but I don't see that demo anywhere...? |
|
Found it and fixed it. |
Gama11
added a commit
that referenced
this pull request
Aug 15, 2014
FlxSpriteUtil curveTo + fixes, etc
Gama11
added a commit
to HaxeFlixel/flixel-demos
that referenced
this pull request
Aug 15, 2014
Gama11
added a commit
to HaxeFlixel/flixel-addons
that referenced
this pull request
Aug 20, 2014
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added
curveTo(). The default filling behavior caused the curves to always be filled with a line drawn from end to start to complete the figure (graphics.beginFill + graphics.curveTodefault). Changed filling to create a defaultfillStyleif null in the drawShapes, which maintains the previous behavior of a nullfillStyle. A nullfillStylenow meansbeginFilldoesn't get called--happens indrawLineand optionally indrawCurve.Breaking: removed the
Colorparam ofbeginDraw. EitherfillStyle.colorwas overriding it, or it didn't get used. I doubt anyone used this function (should be private imo), so it's not a big deal. AddedfillStyle.alphato the fill which probably was forgotten in the FlxColor rework.Consistency in
drawCircleparams.I don't like
ColorandFillStyleboth as params, and some params start with a caps letter while others don't (class names), but those are issues for another time.