updated getBinaryGltf for gltfs with special characters #253
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
likangning93
commented
Apr 5, 2017
| var sceneString = JSON.stringify(gltf); | ||
| var sceneLength = Buffer.byteLength(sceneString); | ||
| sceneLength += 4 - (sceneLength % 4); | ||
| var padding = new Array(sceneLength + 1).join(' '); |
There was a problem hiding this comment.
I'm not 100% sure if there was a reason for the padding to be so big before, and then get sliced down to size. Any insights?
lilleyse
reviewed
Apr 6, 2017
lib/getBinaryGltf.js
Outdated
| var sceneLength = sceneBuffer.length; | ||
| var paddingLength = 4 - (sceneLength % 4); // pad out to 4 bytes as per glb specification | ||
| sceneLength += paddingLength; | ||
| var paddingBuffer = new Buffer(paddingLength).fill(' '); |
There was a problem hiding this comment.
Use Buffer.alloc(paddingLength, ' ') instead. We should avoid new Buffer throughout but that can be a sweeping change handled later.
lib/getBinaryGltf.js
Outdated
| var paddingLength = 4 - (sceneLength % 4); // pad out to 4 bytes as per glb specification | ||
| sceneLength += paddingLength; | ||
| var paddingBuffer = new Buffer(paddingLength).fill(' '); | ||
| var scene = (Buffer.concat([sceneBuffer, paddingBuffer])); |
There was a problem hiding this comment.
No need for the outer parentheses.
| var sceneString = JSON.stringify(gltf); | ||
| var sceneLength = Buffer.byteLength(sceneString); | ||
| sceneLength += 4 - (sceneLength % 4); | ||
| var padding = new Array(sceneLength + 1).join(' '); |
|
@lilleyse updated! Looks like a texture compression test is failing to finish in time though. |
lilleyse
reviewed
Apr 6, 2017
lib/getBinaryGltf.js
Outdated
| @@ -120,18 +120,18 @@ function getBinaryGltf(gltf, embed, embedImage) { | |||
|
|
|||
| // Create padded binary scene buffer and calculate total length | |||
| var sceneString = JSON.stringify(gltf); | |||
| var sceneBuffer = new Buffer(sceneString); | |||
| var sceneBuffer = Buffer.alloc(Buffer.byteLength(sceneString), sceneString); | |||
There was a problem hiding this comment.
Use Buffer.from(string) instead
|
@lilleyse yayyy updated and everything passes! |
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.
getBinaryGltfused to have a problem where gltfs with special characters would cause weird byte offset issues, since the stringified gltf's string length wouldn't be the same as the byte length.