Improve shader preprocessor with regex-fu #4052

Merged
merged 2 commits into from Oct 23, 2015

Conversation

Projects
None yet
3 participants
@JakubValtar
Contributor

JakubValtar commented Oct 23, 2015

Context is now taken into account, so it's not just blind search and replace anymore.

Fixes #3961
Fixes #3968

- "texMap",
- "texture", "texture", "texture", "texture",
- "fragColor"
+ "in", "texMap", "texture", "_fragColor"

This comment has been minimized.

@codeanticode

codeanticode Oct 23, 2015

Member

@JakubValtar why do you use _fragColor instead of fragColor?

@codeanticode

codeanticode Oct 23, 2015

Member

@JakubValtar why do you use _fragColor instead of fragColor?

This comment has been minimized.

@JakubValtar

JakubValtar Oct 23, 2015

Contributor

To make it more unique. Somebody could already have fragColor variable in their code and we don't have collision detection yet.

@JakubValtar

JakubValtar Oct 23, 2015

Contributor

To make it more unique. Somebody could already have fragColor variable in their code and we don't have collision detection yet.

This comment has been minimized.

@JakubValtar

JakubValtar Oct 23, 2015

Contributor

@codeanticode Doesn't matter what the name is really. It just has to be "out"

@JakubValtar

JakubValtar Oct 23, 2015

Contributor

@codeanticode Doesn't matter what the name is really. It just has to be "out"

This comment has been minimized.

@codeanticode

codeanticode Oct 23, 2015

Member

Yes, I agree.

@codeanticode

codeanticode Oct 23, 2015

Member

Yes, I agree.

benfry added a commit that referenced this pull request Oct 23, 2015

Merge pull request #4052 from JakubValtar/fix-glsl-preproc
Improve shader preprocessor with regex-fu

@benfry benfry merged commit 8d5981d into processing:master Oct 23, 2015

@JakubValtar JakubValtar deleted the JakubValtar:fix-glsl-preproc branch Apr 8, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment