simplify glb-parser buffer usage slightly and fix possible alignment error (playcanvas#2000)

slimbuck · Donovan Hutchence · web-flow · commit 78d7cb94137a · 2020-04-15T14:47:04.000+01:00
* simplify buffer usage slightly and fix alignement error

Co-authored-by: Donovan Hutchence &lt;dhutchence@snapchat.com&gt;
diff --git a/src/resources/parser/glb-parser.js b/src/resources/parser/glb-parser.js
@@ -143,8 +143,7 @@ Object.assign(pc, function () {
                     var size = getNumComponents(accessor.type) * getComponentSizeInBytes(accessor.componentType);
                     var buffer = buffers[bufferView.buffer];
                     sourceDesc[semantic] = {
-                        array: new Uint32Array(buffer.buffer),
-                        buffer: bufferView.buffer,
+                        buffer: buffer.buffer,
                         size: size,
                         offset: (accessor.hasOwnProperty('byteOffset') ? accessor.byteOffset : 0) +
                                 (bufferView.hasOwnProperty('byteOffset') ? bufferView.byteOffset : 0) +
@@ -178,8 +177,7 @@ Object.assign(pc, function () {
             });
 
             sourceDesc[pc.SEMANTIC_NORMAL] = {
-                array: new Uint32Array(normals.buffer),
-                buffer: null,
+                buffer: normals.buffer,
                 size: 12,
                 offset: 0,
                 stride: 12,
@@ -220,25 +218,26 @@ Object.assign(pc, function () {
 
         var vertexData = vertexBuffer.lock();
         var targetArray = new Uint32Array(vertexData);
-        var sourceArray, targetStride, sourceStride;
+        var sourceArray;
 
         if (isCorrectlyInterleaved) {
             // copy data
-            sourceArray = new Uint32Array(positionDesc.array.buffer,
+            sourceArray = new Uint32Array(positionDesc.buffer,
                                           positionDesc.offset,
                                           numVertices * vertexBuffer.format.size / 4);
             targetArray.set(sourceArray);
         } else {
+            var targetStride, sourceStride;
             // copy data and interleave
             for (i = 0; i < vertexBuffer.format.elements.length; ++i) {
                 target = vertexBuffer.format.elements[i];
                 targetStride = target.stride / 4;
 
                 source = sourceDesc[target.name];
-                sourceArray = source.array;
+                sourceArray = new Uint32Array(source.buffer, source.offset, source.count * source.stride / 4);
                 sourceStride = source.stride / 4;
 
-                var src = source.offset / 4;
+                var src = 0;
                 var dst = target.offset / 4;
                 for (j = 0; j < numVertices; ++j) {
                     for (k = 0; k < source.size / 4; ++k) {
