@nativewrappers/fivem 0.0.27 → 0.0.28

package/common/utils/Vector.d.ts

@@ -196,7 +196,6 @@ export declare class Vector {
     constructor(size: number, x?: number, y?: number, z?: number | undefined, w?: number | undefined);
     [Symbol.iterator](): Iterator<number>;
     toString(): string;
-    toJSON(): string;
     /**
      * @see Vector.clone
      */

package/common/utils/Vector.js

@@ -17,16 +17,14 @@ export class Vector {
             return new Vector2(x, x);
         if (typeof x === 'object')
             ({ x, y, z, w } = x);
-        const type = this instanceof Vector
-            ? this.type
-            : `vec${[x, y, z, w].filter(arg => arg !== undefined).length}`;
-        switch (type) {
+        const size = this instanceof Vector ? this.size : [x, y, z, w].filter(arg => arg !== undefined).length;
+        switch (size) {
             default:
-            case ClassTypes.Vector2:
+            case 2:
                 return new Vector2(x, y);
-            case ClassTypes.Vector3:
+            case 3:
                 return new Vector3(x, y, z);
-            case ClassTypes.Vector4:
+            case 4:
                 return new Vector4(x, y, z, w);
         }
     }
@@ -156,11 +154,12 @@ export class Vector {
     static dotProduct(a, b) {
         let result = 0;
         for (const key of ['x', 'y', 'z', 'w']) {
-            if (key in a && key in b)
-                result += a[key] * b[key];
-            else {
+            const x = a[key];
+            const y = b[key];
+            if (!!x && !!y)
+                result += x * y;
+            else if (x || y)
                 throw new Error('Vectors must have the same dimensions');
-            }
         }
         return result;
     }
@@ -259,11 +258,7 @@ export class Vector {
             yield this.w;
     }
     toString() {
-        const { x, y, z, w } = this;
-        return `${this.type}(${[x, y, z, w].filter(val => val !== undefined).join(', ')})`;
-    }
-    toJSON() {
-        return this.toString();
+        return `vector${this.size}(${this.toArray().join(', ')})`;
     }
     /**
      * @see Vector.clone

package/package.json

@@ -4,7 +4,7 @@
   "author": "Remco Troost <d0p3t>",
   "license": "MIT",
   "type": "module",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "publishConfig": {
     "directory": "lib"
   },