Add regex to remove leading underscore from shader identifiers #286
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
lilleyse
reviewed
May 30, 2017
lib/processModelMaterialsCommon.js
Outdated
| @@ -812,7 +812,9 @@ function ensureSemanticExistenceForPrimitive(gltf, primitive) { | |||
| var accessorId = attributes[semantic]; | |||
| var accessor = accessors[accessorId]; | |||
| var lowerCase = semantic.toLowerCase(); | |||
| lowerCase = lowerCase.replace(/^_*/g, ""); // Remove all starting _ from name. GLSL does not allow __ double underscores | |||
There was a problem hiding this comment.
Whoops. My bad. Copy paste mistake. Fixed in the same commit.
|
Looks good! |
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.
This fixes attributes names that have leading underscores, ex.
_batchid, which then cause attribute names to bea__batchid.The double underscore is reserved in GLSL and is not allowed for identifiers.