Color transform fix, closes #2192 #2195
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
…shader valid colorMultipliers
JoeCreates
force-pushed
the
ColorTransformFix
branch
from
8dad914
to
1b310b2
Compare
Gama11
reviewed
Dec 4, 2018
| @@ -12,7 +12,7 @@ import openfl.Vector; | |||
|
|
|||
| class FlxDrawQuadsItem extends FlxDrawBaseItem<FlxDrawQuadsItem> | |||
| { | |||
| static inline var VERTICES_PER_QUAD = #if (openfl >= "8.5.0") 4 #else 6 #end; | |||
| static inline var VERTICES_PER_QUAD = #if (openfl >= "8.5.0") 1 #else 1 #end; | |||
There was a problem hiding this comment.
Sorry, I didn't mean to push that but accidentally did when I did the force ppush to fix the codeclimate issue. It's probably worth looking at first, though, tbh. I'm not sure the looping is necessary.
JoeCreates
force-pushed
the
ColorTransformFix
branch
from
1b310b2
to
52a2a93
Compare
JoeCreates
force-pushed
the
ColorTransformFix
branch
from
52a2a93
to
2ac362c
Compare
|
Much thanks, I'm going to give this a test locally. |
|
It works! It works! Oh man I'm so happy @JoeCreates . Where shall I send the bounty? |
|
Thanks! |
|
Hm, I thought this would fix that issue in the FlxMouseEventManager demo, but it seems it hasn't... :/ |
|
Looks like that might be the same issue as #2158. |
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.
There were two issues in #2192.
Firstly, the color transform was being applied twice because the generated graphics were not being set to unique.
Secondly was the actual shader issue. The problem was that the shader applies the offsets and multipliers based off of a single flag,
hasColorTransform. However, in actually populating the values to be used for these, eachcoloredandhasColorOffsetsare checked individually to populate the inputs for the shader.In the case of a transform with multipliers but no offsets, this was fine, because the lack of offsets had no affect on the result as they effectively default to 0. In the case of offsets but no multipliers, however, treating the multipliers as 0 by default resulted in a black sprite.
I had two options for resolving this. One was to split up the application of offsets and multipliers in the shader and pass in two flag,s one for each, or make it so that if either are true when we are giving the shader the inputs that we populate both inputs instead of only one.
I opted for the latter solution as this means that the shader interface does not change, and I wasn't sure what else might have broken if I did change the shader interface.