fix(playcanvas): check for undefined props

basics · Aug 26, 2020 · 3a2dedd · 3a2dedd
1 parent b448062
commit 3a2dedd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/adapter/playcanvas.js b/src/adapter/playcanvas.js
@@ -327,7 +327,7 @@ export function hijackPlayCanvas(pc) {
         for (let i = 0; i < 9; i += 1) {
           this.data[i] = first;
         }
-      } else if (isNumber(first[0].w)) {
+      } else if (isNumber(first[0]?.w)) {
         [first[0], first[1], first[2]].forEach(({ x, y, z }, i) => { this[i] = new Vec3(x, y, z); });
       } else {
         axes.forEach((ax, i) => { this[i] = ax; });
@@ -343,7 +343,7 @@ export function hijackPlayCanvas(pc) {
         for (let i = 0; i < 16; i += 1) {
           this.data[i] = first;
         }
-      } else if (isNumber(first[0].x) && !isNumber(first[0].w)) {
+      } else if (first[0] && isNumber(first[0].x) && !isNumber(first[0].w)) {
         [first[0], first[1], first[2]].forEach(({ x, y, z }, i) => { this[i] = new Vec4(x, y, z, 0.0); });
       } else {
         axes.forEach((ax, i) => { this[i] = ax; });

diff --git a/src/utils/math.js b/src/utils/math.js
@@ -95,7 +95,7 @@ export function multiplyVecMat4(vecLeft, [column0, column1, column2, column3]) {
 }
 
 export function isNumber(nr) {
-  if (typeof nr === 'number' || (nr && nr.constructor === Number)) {
+  if (typeof nr === 'number' || nr?.constructor === Number) {
     return true;
   }
   return false;