fix(playcanvas): hijackArray working fine

basics · Sep 9, 2021 · ba17b26 · ba17b26
1 parent 047145e
commit ba17b26
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 18 deletions.
diff --git a/src/adapter/array.js b/src/adapter/array.js
@@ -9,7 +9,8 @@ export const hijackArray = (ArrayClass) => {
     },
     set(x) {
       this[0] = x;
-    }
+    },
+    configurable: true
   });
 
   Object.defineProperty(prototype, 'y', {
@@ -18,7 +19,8 @@ export const hijackArray = (ArrayClass) => {
     },
     set(y) {
       this[1] = y;
-    }
+    },
+    configurable: true
   });
 
   Object.defineProperty(prototype, 'z', {
@@ -27,17 +29,19 @@ export const hijackArray = (ArrayClass) => {
     },
     set(z) {
       this[2] = z;
-    }
+    },
+    configurable: true
   });
 
   cachedValueOf(ArrayClass);
 
   Object.defineProperty(prototype, 'len', {
     get() {
-      return Math.sqrt((this[0] ** 2) + (this[1] ** 2) + (this[2] ** 2)) ** (1 / 2);
+      return ((this[0] ** 2) + (this[1] ** 2) + (this[2] ** 2)) ** (1 / 2);
     },
     set() {
       throw new Error('set len not allowed');
-    }
+    },
+    configurable: true
   });
 };
diff --git a/src/adapter/playcanvas.js b/src/adapter/playcanvas.js
@@ -1,11 +1,12 @@
-// @ts-nocheck
 import {
   operatorCalc, cachedValueOf, defineVectorLength, cachedFactory, cachedFunction, defineMatrixLength
 } from '../operator';
 import {
   multiplyMat3Vec, multiplyMat3Mat3, multiplyVecMat3, isNumber, multiplyVecMat4
 } from '../utils/math';
 
+export { hijackArray } from './array';
+
 export function hijackPlayCanvas(pc) {
   const {
     Vec2, Vec3, Vec4, Quat, Mat3: AMat3, Mat4: AMat4, math

diff --git a/src/array.js b/src/array.js
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { cachedValueOf } from './operator';
 import { isArray } from './utils/math';
 

diff --git a/src/color.js b/src/color.js
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { isArray, isNumber } from './utils/math';
 import {
   cachedFunction, cachedMethod, cachedValueOf, defineVectorLength, operatorCalc

diff --git a/src/degree.js b/src/degree.js
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { normRad, isNumber } from './utils/math';
 import { convertToCSSVars } from './utils/css';
 

diff --git a/src/formatter.js b/src/formatter.js
@@ -1,5 +1,5 @@
 // https://code.open-xchange.com/#contentPanel;a7550a02-aa41-45d9-9cad-7e1c920815f3;null;ui/apps/io.ox/office/tk/utils.js;content
-// @ts-nocheck
+
 const DECIMAL = (0.5).toLocaleString().substring(1, 2) || '.';
 const ZERO = (0).toLocaleString() || '0';
 

diff --git a/src/operator.js b/src/operator.js
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { isNumber } from './utils/math';
 
 const X = 0;

diff --git a/src/point.js b/src/point.js
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import { isArray, normRad, isNumber } from './utils/math';
 import {
   cachedFunction, cachedGetter, cachedMethod, cachedValueOf, defineVectorLength, operatorCalc

diff --git a/src/quaternion.js b/src/quaternion.js
@@ -1,10 +1,9 @@
-// @ts-nocheck
 import {
-  FORWARD, LEFT, RIGHT, UP, Vector, Victor
+  FORWARD, LEFT, RIGHT, UP
 } from './vector';
 import { isArray, multQuatVec, isNumber } from './utils/math';
 import {
-  cachedFunction, defineMatrixLength, cachedValueOf, operatorCalc as calc
+  cachedFunction, defineMatrixLength, cachedValueOf
 } from './operator';
 import { degree, isAngle } from './degree';
 import { convertToCSSVars } from './utils/css';

diff --git a/src/vector.js b/src/vector.js
@@ -1,4 +1,3 @@
-// @ts-nocheck
 import {
   acos, isArray, multQuatVec, normRad, multiplyVecMat3, isNumber
 } from './utils/math';

diff --git a/test/adapter/playcanvas.js b/test/adapter/playcanvas.js
@@ -1,5 +1,5 @@
 import { assert } from 'chai';
-import { hijackPlayCanvas } from '../../src/adapter/playcanvas';
+import { hijackArray, hijackPlayCanvas } from '../../src/adapter/playcanvas';
 
 class Vec2 {
   constructor(x, y) {
@@ -43,7 +43,7 @@ const pc = {
   math
 };
 
-describe('override valueOf of playcanvas Vec3', () => {
+describe('override valueOf of playcanvas vector classes', () => {
   it('calculations with the new class', () => {
     hijackPlayCanvas(pc);
 
@@ -56,4 +56,17 @@ describe('override valueOf of playcanvas Vec3', () => {
     assert.equal(pos.y, 18);
     assert.equal(pos.z, 21);
   });
+
+  it('calculations with Array class', () => {
+    hijackArray(Array);
+
+    const t1 = [3, 4, 5];
+    const t2 = [6, 7, 8];
+    const pos = pc.calc(() => t1 + t2 * 2);
+
+    assert.instanceOf(pos, Array);
+    assert.equal(pos.x, 15);
+    assert.equal(pos.y, 18);
+    assert.equal(pos.z, 21);
+  });
 });