Tensor: Standardize Vector2, Vector3, Vector4, Color3, Color4, Quaternion, and Matrix

packages/dev/core/src/Maths/math.color.ts

@@ -31,7 +31,7 @@ function colorChannelToGammaSpaceExact(color: number): number {
  * Class used to hold a RGB color
  */
 export class Color3 implements Tensor<Tuple<number, 3>> {
-    public readonly dimension: [number] = [3];
+    public declare readonly dimension: [4];
 
     /**
      * Creates a new Color3 object from red, green, blue values, all between 0 and 1
@@ -997,12 +997,13 @@ export class Color3 implements Tensor<Tuple<number, 3>> {
         return new Color3(Math.random(), Math.random(), Math.random());
     }
 }
+Object.defineProperty(Color3.prototype, "dimension", { value: 3 });
 
 /**
  * Class used to hold a RBGA color
  */
 export class Color4 implements Tensor<Tuple<number, 4>> {
-    public readonly dimension: [number] = [4];
+    public declare readonly dimension: [4];
 
     /**
      * Creates a new Color4 object from red, green, blue values, all between 0 and 1
@@ -1865,6 +1866,7 @@ export class Color4 implements Tensor<Tuple<number, 4>> {
         return colors;
     }
 }
+Object.defineProperty(Color4.prototype, "dimension", { value: 4 });
 
 /**
  * @internal

packages/dev/core/src/Maths/math.vector.ts

@@ -2,7 +2,7 @@
 import { Scalar } from "./math.scalar";
 import { Epsilon } from "./math.constants";
 import type { Viewport } from "./math.viewport";
-import type { DeepImmutable, Nullable, FloatArray, float, Constructor, Tuple } from "../types";
+import type { DeepImmutable, Nullable, FloatArray, float, Constructor, Tuple, Length } from "../types";
 import { ArrayTools } from "../Misc/arrayTools";
 import type { IPlaneLike } from "./math.like";
 import { RegisterClass } from "../Misc/typeStore";
@@ -21,6 +21,8 @@ const _ExtractAsInt = (value: number) => {
  * Reprents a vector of any dimension
  */
 export declare abstract class Vector<N extends number[] = number[]> extends Tensor<N> {
+    public readonly dimension: [Length<N>];
+
     /**
      * Gets the length of the vector
      * @returns the vector length (float)
@@ -199,7 +201,7 @@ export declare abstract class Vector<N extends number[] = number[]> extends Tens
 export class Vector2 implements Vector<Tuple<number, 2>> {
     private static _ZeroReadOnly = Vector2.Zero() as DeepImmutable<Vector2>;
 
-    public readonly dimension: [number] = [2];
+    public declare readonly dimension: [2];
 
     /**
      * Creates a new Vector2 from the given x and y coordinates
@@ -1197,6 +1199,7 @@ export class Vector2 implements Vector<Tuple<number, 2>> {
         return Vector2.Distance(p, proj);
     }
 }
+Object.defineProperty(Vector2.prototype, "dimension", { value: 2 });
 
 /**
  * Class used to store (x,y,z) vector representation
@@ -1217,7 +1220,7 @@ export class Vector3 implements Vector<Tuple<number, 3>> {
     private static _ZeroReadOnly = Vector3.Zero() as DeepImmutable<Vector3>;
     private static _OneReadOnly = Vector3.One() as DeepImmutable<Vector3>;
 
-    public readonly dimension: [number] = [3];
+    public declare readonly dimension: [3];
 
     /** @internal */
     public _x: number;
@@ -3353,14 +3356,15 @@ export class Vector3 implements Vector<Tuple<number, 3>> {
         return ref;
     }
 }
+Object.defineProperty(Vector3.prototype, "dimension", { value: 3 });
 
 /**
  * Vector4 class created for EulerAngle class conversion to Quaternion
  */
 export class Vector4 implements Vector<Tuple<number, 4>> {
     private static _ZeroReadOnly = Vector4.Zero() as DeepImmutable<Vector4>;
 
-    public readonly dimension: [4] = [4];
+    public declare readonly dimension: [4];
 
     /**
      * Creates a Vector4 object from the given floats.
@@ -4308,6 +4312,7 @@ export class Vector4 implements Vector<Tuple<number, 4>> {
         return new Vector4(source._x, source._y, source._z, w);
     }
 }
+Object.defineProperty(Vector4.prototype, "dimension", { value: 4 });
 
 /**
  * Class used to store quaternion data

packages/dev/core/src/Misc/arrayTools.ts

@@ -1,24 +1,6 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import type { Nullable } from "../types";
-
-/** @internal */
-interface TupleTypes<T> {
-    2: [T, T];
-    3: [T, T, T];
-    4: [T, T, T, T];
-    5: [T, T, T, T, T];
-    6: [T, T, T, T, T, T];
-    7: [T, T, T, T, T, T, T];
-    8: [T, T, T, T, T, T, T, T];
-    9: [T, T, T, T, T, T, T, T, T];
-    10: [T, T, T, T, T, T, T, T, T, T];
-    11: [T, T, T, T, T, T, T, T, T, T, T];
-    12: [T, T, T, T, T, T, T, T, T, T, T, T];
-    13: [T, T, T, T, T, T, T, T, T, T, T, T, T];
-    14: [T, T, T, T, T, T, T, T, T, T, T, T, T, T];
-    15: [T, T, T, T, T, T, T, T, T, T, T, T, T, T, T];
-}
+import type { Nullable, Tuple } from "../types";
 
 /**
  * Class containing a set of static utilities functions for arrays.
@@ -44,7 +26,7 @@ export class ArrayTools {
      * @param itemBuilder a callback responsible for creating new instance of item. Called once per tuple entry.
      * @returns a new tuple filled with new objects.
      */
-    public static BuildTuple<T, N extends keyof TupleTypes<unknown>>(size: N, itemBuilder: () => T): TupleTypes<T>[N] {
+    public static BuildTuple<T, N extends number>(size: N, itemBuilder: () => T): Tuple<T, N> {
         return ArrayTools.BuildArray(size, itemBuilder) as any;
     }
 }

packages/dev/core/src/types.ts

@@ -83,22 +83,22 @@ export type FromLength<N extends number> = _FromLength<N>;
 /**
  * Increments N
  */
-export type Increment<N extends number> = Length<Unshift<FromLength<N>, 0>>;
+export type Increment<N extends number> = Length<Unshift<_FromLength<N>, 0>>;
 
 /**
  * Decrements N
  */
-export type Decrement<N extends number> = Length<Shift<FromLength<N>>>;
+export type Decrement<N extends number> = Length<Shift<_FromLength<N>>>;
 
 /**
  * Gets the sum of A and B
  */
-export type Add<A extends number, B extends number> = Length<Concat<FromLength<A>, FromLength<B>>>;
+export type Add<A extends number, B extends number> = Length<Concat<_FromLength<A>, _FromLength<B>>>;
 
 /**
  * Subtracts B from A
  */
-export type Subtract<A extends number, B extends number> = Length<Remove<FromLength<A>, FromLength<B>>>;
+export type Subtract<A extends number, B extends number> = Length<Remove<_FromLength<A>, _FromLength<B>>>;
 
 /**
  * Gets the type of an array's members