Pad GLB data to 8 bytes

CesiumGS · Oct 12, 2022 · 15a45ea · 15a45ea
1 parent 3042a1c
commit 15a45ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/createB3dm.js b/lib/createB3dm.js
@@ -47,13 +47,16 @@ function createB3dm(options) {
 }
 
 function createB3dmCurrent(glb, featureTableJson, featureTableBinary, batchTableJson, batchTableBinary) {
+
+    const glbPadded = getBufferPadded(glb);
+
     const version = 1;
     const headerByteLength = 28;
     const featureTableJsonByteLength = featureTableJson.length;
     const featureTableBinaryByteLength = featureTableBinary.length;
     const batchTableJsonByteLength = batchTableJson.length;
     const batchTableBinaryByteLength = batchTableBinary.length;
-    const gltfByteLength = glb.length;
+    const gltfByteLength = glbPadded.length;
     const byteLength = headerByteLength + featureTableJsonByteLength + featureTableBinaryByteLength + batchTableJsonByteLength + batchTableBinaryByteLength + gltfByteLength;
 
     const header = Buffer.alloc(headerByteLength);
@@ -65,7 +68,7 @@ function createB3dmCurrent(glb, featureTableJson, featureTableBinary, batchTable
     header.writeUInt32LE(batchTableJsonByteLength, 20);
     header.writeUInt32LE(batchTableBinaryByteLength, 24);
 
-    return Buffer.concat([header, featureTableJson, featureTableBinary, batchTableJson, batchTableBinary, glb]);
+    return Buffer.concat([header, featureTableJson, featureTableBinary, batchTableJson, batchTableBinary, glbPadded]);
 }
 
 function createB3dmDeprecated1(glb, batchLength, batchTableJson) {

diff --git a/lib/createI3dm.js b/lib/createI3dm.js
@@ -30,12 +30,13 @@ function createI3dm(options) {
 
     const gltfFormat = defined(options.glb) ? 1 : 0;
     const gltfBuffer = defined(options.glb) ? options.glb : getGltfUriBuffer(options.uri);
+    const gltfBufferPadded = getBufferPadded(gltfBuffer);
 
     const featureTableJsonByteLength = featureTableJson.length;
     const featureTableBinaryByteLength = featureTableBinary.length;
     const batchTableJsonByteLength = batchTableJson.length;
     const batchTableBinaryByteLength = batchTableBinary.length;
-    const gltfByteLength = gltfBuffer.length;
+    const gltfByteLength = gltfBufferPadded.length;
     const byteLength = headerByteLength + featureTableJsonByteLength + featureTableBinaryByteLength + batchTableJsonByteLength + batchTableBinaryByteLength + gltfByteLength;
 
     const header = Buffer.alloc(headerByteLength);
@@ -48,7 +49,7 @@ function createI3dm(options) {
     header.writeUInt32LE(batchTableBinaryByteLength, 24);
     header.writeUInt32LE(gltfFormat, 28);
 
-    return Buffer.concat([header, featureTableJson, featureTableBinary, batchTableJson, batchTableBinary, gltfBuffer]);
+    return Buffer.concat([header, featureTableJson, featureTableBinary, batchTableJson, batchTableBinary, gltfBufferPadded]);
 }
 
 function getGltfUriBuffer(uri) {