Refactoring/fields #40
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
grandchild
force-pushed
the
refactoring/fields
branch
2 times, most recently
from
b692733
to
1023253
Compare
|
The matching branch on the converter is grandchild/AVS-File-Decoder/refactoring/fields. |
azeem
requested changes
Jun 25, 2018
src/webgl/ShaderProgram.ts
Outdated
| [BlendMode.MULTIPLY]: "clamp(color * texture2D(u_srcTexture, v_position) * 256.0, 0.0, 1.0)", | ||
| // [BlendMode.XOR]: "uint3(color) ^ uint3(getSrcColor())", | ||
| // [BlendMode.EVERY_OTHER_PIXEL]: "mix(color, getSrcColor(), float(uint(dot(v_position, u_resolution-1.0)) & 1u))", | ||
| // [BlendMode.EVERY_OTHER_LINE]: "mix(color, getSrcColor(), float(uint(v_position.y * u_resolution.y) & 1u))", |
There was a problem hiding this comment.
Did you mean to un-comment these? If not, let's create tickets for these instead of leaving them commented out in the code.
test/func/trans/ColorMap.test.ts
Outdated
| @@ -25,7 +25,7 @@ describe("ColorMap", () => { | |||
| return mainTest({ | |||
| expectImageSrc: "ColorMap_1.png", | |||
| preset: makePreset({ | |||
| key: "RED", maps, output: "AVERAGE", | |||
| key: "RED", maps, output: "FIFTY_FIFTY", | |||
There was a problem hiding this comment.
This breaks the func test. Should be blendMode: "FIFTY_FIFTY"
grandchild
force-pushed
the
refactoring/fields
branch
from
1023253
to
bb0c09e
Compare
* AVERAGE -> FIFTY_FIFTY * SUBTRACTIVE1/2 -> SUB_DEST_SRC/SUB_SRC_DEST * add MINIMUM * add ABSOLUTE_DIFFERENCE
* Channels -> AudioChannels * Source -> AudioSource * source/channel -> audioSource/audioChannel in SuperScope * source -> audioSource in Texer
ColorMap: * ONBEATSEQUENTIAL -> ONBEAT_SEQUENTIAL * ONBEATRANDOM -> ONBEAT_RANDOM * (R+G+B)/2 -> CHANNEL_SUM_HALF * (R+G+B)/3 -> CHANNEL_AVERAGE BufferSave: * SAVERESTORE -> ALTERNATE_SAVE_RESTORE * RESTORESAVE -> ALTERNATE_RESTORE_SAVE Fix shader code indentation in ColorMap.
grandchild
force-pushed
the
refactoring/fields
branch
from
bb0c09e
to
1790150
Compare
|
Rebased onto master and fixed the requested changes (and linting errors, which I wasn't aware of. thanks circleci ;P) |
|
Thanks! |
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.
The commit messages are verbose and should say it all.