@nativewrappers/fivem 0.0.19 → 0.0.20

package/common/utils/Vector.d.ts

@@ -30,9 +30,12 @@ export declare class Vector {
     z?: number | undefined;
     w?: number | undefined;
     type: string;
-    static create<T extends VectorType>(this: T, x: VectorLike | number, y?: number, z?: number, w?: number): InstanceType<T>;
+    static create(x: number, y?: number): Vector2;
+    static create(x: number, y?: number, z?: number): Vector3;
+    static create(x: number, y?: number, z?: number, w?: number): Vector4;
+    static create(xyzw: VectorLike): Vector4;
     static fromBuffer({ buffer }: MsgpackBuffer): Vector;
-    static clone<T extends VectorType>(this: T, obj: VectorLike): InstanceType<T>;
+    static clone<T extends VectorType>(this: T, obj: VectorLike): Vector4;
     private static operate;
     static add<T extends VectorType, U extends VectorLike>(this: T, a: U, b: VectorLike | number): U;
     static subtract<T extends VectorType, U extends VectorLike>(this: T, a: U, b: VectorLike | number): U;
@@ -52,7 +55,7 @@ export declare class Vector {
     static fromArrays<T extends VectorType>(this: T, primitives: VectorArray[]): InstanceType<T>[];
     static Length<T extends VectorType, U extends VectorLike>(this: T, obj: U): number;
     constructor(size: number, x?: number, y?: number, z?: number | undefined, w?: number | undefined);
-    [Symbol.iterator](): Iterator<[string, number]>;
+    [Symbol.iterator](): Iterator<number>;
     toString(): string;
     toJSON(): string;
     clone(): this;
@@ -76,8 +79,8 @@ export declare class Vector {
     subtract(v: VectorLike): this;
     multiply(v: VectorLike | number): this;
     divide(v: VectorLike | number): this;
-    toArray(): [number, number];
-    replace(v: VectorLike): void;
+    toArray(): number[];
+    replace<T extends VectorLike>(v: T): void;
     get Length(): number;
 }
 export declare class Vector2 extends Vector {

package/common/utils/Vector.js

@@ -64,7 +64,7 @@ export class Vector {
         return result;
     }
     static normalize(a) {
-        const length = a.Length || this.Length(a);
+        const length = a instanceof Vector ? a.Length : this.Length(a);
         return this.divide(a, length);
     }
     /**
@@ -93,9 +93,10 @@ export class Vector {
     static Length(obj) {
         let sum = 0;
         for (const key of ['x', 'y', 'z', 'w']) {
-            const value = obj[key];
-            if (value)
+            if (key in obj) {
+                const value = obj[key];
                 sum += value * value;
+            }
         }
         return Math.sqrt(sum);
     }
@@ -108,12 +109,12 @@ export class Vector {
         this.type = 'vec';
     }
     *[Symbol.iterator]() {
-        yield ['x', this.x];
-        yield ['y', this.y];
+        yield this.x;
+        yield this.y;
         if (this.z)
-            yield ['z', this.z];
+            yield this.z;
         if (this.w)
-            yield ['w', this.w];
+            yield this.w;
     }
     toString() {
         const { x, y, z, w } = this;
@@ -163,15 +164,17 @@ export class Vector {
         return Vector.divide(this, v);
     }
     toArray() {
-        return [this.x, this.y];
+        return [...this];
     }
     replace(v) {
-        this.x = v.x;
-        this.y = v.y;
+        for (const key of ['x', 'y', 'z', 'w']) {
+            if (key in this && key in v)
+                this[key] = v[key];
+        }
     }
     get Length() {
         let sum = 0;
-        for (let [_, value] of this)
+        for (let value of this)
             sum += value * value;
         return Math.sqrt(sum);
     }

package/package.json

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