small fixes for safari (playcanvas#2022)

slimbuck · Donovan Hutchence · web-flow · commit 3096777c7cd1 · 2020-04-27T13:14:36.000+01:00
* small fixes for safari


Co-authored-by: Donovan Hutchence &lt;dhutchence@snapchat.com&gt;
diff --git a/src/graphics/vertex-iterator.js b/src/graphics/vertex-iterator.js
@@ -1,6 +1,9 @@
 Object.assign(pc, function () {
     'use strict';
 
+    // map of engine pc.TYPE_*** enums to their corresponding typed array constructors
+    var typesMap = [Int8Array, Uint8Array, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array];
+
     /**
      * @class
      * @name pc.VertexIteratorAccessor
@@ -52,33 +55,11 @@ Object.assign(pc, function () {
         this.index = 0;
         this.numComponents = vertexElement.numComponents;
 
-        // map only section of underlaying buffer for non-interleaved format
-        var bufferLength;
-        if (!vertexFormat.interleaved)
-            bufferLength = vertexFormat.vertexCount * vertexElement.numComponents;
-
-        switch (vertexElement.dataType) {
-            case pc.TYPE_INT8:
-                this.array = new Int8Array(buffer, vertexElement.offset, bufferLength);
-                break;
-            case pc.TYPE_UINT8:
-                this.array = new Uint8Array(buffer, vertexElement.offset, bufferLength);
-                break;
-            case pc.TYPE_INT16:
-                this.array = new Int16Array(buffer, vertexElement.offset, bufferLength);
-                break;
-            case pc.TYPE_UINT16:
-                this.array = new Uint16Array(buffer, vertexElement.offset, bufferLength);
-                break;
-            case pc.TYPE_INT32:
-                this.array = new Int32Array(buffer, vertexElement.offset, bufferLength);
-                break;
-            case pc.TYPE_UINT32:
-                this.array = new Uint32Array(buffer, vertexElement.offset, bufferLength);
-                break;
-            case pc.TYPE_FLOAT32:
-                this.array = new Float32Array(buffer, vertexElement.offset, bufferLength);
-                break;
+        // create the typed array based on the element data type
+        if (vertexFormat.interleaved) {
+            this.array = new typesMap[vertexElement.dataType](buffer, vertexElement.offset);
+        } else {
+            this.array = new typesMap[vertexElement.dataType](buffer, vertexElement.offset, vertexFormat.vertexCount * vertexElement.numComponents);
         }
 
         // BYTES_PER_ELEMENT is on the instance and constructor for Chrome, Safari and Firefox, but just the constructor for Opera
diff --git a/src/scene/mesh.js b/src/scene/mesh.js
@@ -459,7 +459,7 @@ Object.assign(pc, function () {
                 var streamIndices = this._geometryData.indices;
                 count = this._geometryData.indexCount;
 
-                if (ArrayBuffer.isView(data)) {
+                if (ArrayBuffer.isView(indices)) {
                     // destination data is typed array
                     indices.set(streamIndices);
                 } else {
