Move glsl code from ShaderLib to *.glsl files using the new #include system #8223
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
bhouston
force-pushed
the
material_glsl_files
branch
from
91e713f to
807a8ec
Compare
|
@mrdoob, this is a major restructuring PR which will become invalid if other things are merged as those merges will not be reflected in the separated out *.glsl files. Sort of annoying that major restructuring PR like this one are so fragile. I do not mind if you want to do this at some point in the future and not today. |
| @@ -194,11 +194,12 @@ THREE.WebGLProgram = ( function () { | |||
|
|
|||
| function parseIncludes( string ) { | |||
|
|
|||
| var pattern = /#include +<([\w\d.]+)>/g; | |||
| var pattern = /#include[ \t]+<([\w\d.]+)>/g; | |||
There was a problem hiding this comment.
why also tabs? I would be strict about it...
Merged
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.
I've split out all of the inlined glsl code from ShaderLib.js moved it into the directory:
three.js\src\renderers\shaders\ShaderLib
Basically I followed the pattern that ShaderChunk\ directory contained the contents of ShaderChunk.js so ShaderLib\ directory would contain the contents of ShaderLib.js.
I love this new layout, it makes editing the glsl so easy and now I have syntax highlighting.
I also added very simplistic error checking for the includeParser to know when an include can not be found.