@benev/math 0.2.0-0 → 0.2.0-2

package/s/shapes/3d/box.ts

@@ -1,38 +1,83 @@
 
-import {Vec3} from "../../primitives/vec3.js"
+import {Vec3, XyzArray, Xyz} from "../../core/vec3.js"
+
+export type BoxJson = [min: XyzArray, max: XyzArray]
+export type BoxLike = {min: Xyz, max: Xyz}
 
 export class Box {
 	constructor(
-			public center: Vec3,
-			public extent: Vec3,
-		) {
-		if (extent.x < 0 || extent.y < 0 || extent.z < 0)
-			throw new Error(`invalid negative extent, ${extent.toString()}`)
+		public min: Vec3,
+		public max: Vec3,
+	) {}
+
+	static from(data: BoxJson | BoxLike) {
+		return Array.isArray(data)
+			? new this(Vec3.from(data[0]), Vec3.from(data[1]))
+			: new this(Vec3.from(data.min), Vec3.from(data.max))
 	}
 
-	static fromCorner(min: Vec3, extent: Vec3) {
-		return new this(
-			min.clone().add(extent.clone().half()),
-			extent,
-		)
+	static fromCorner(min: Vec3, size: Vec3) {
+		return new this(min, min.clone().add(size))
 	}
 
-	get min() {
-		return this.center.clone()
-			.subtract(this.extent.clone().half())
+	static fromCenter(center: Vec3, size: Vec3) {
+		const halfSize = size.clone().half()
+		const min = center.clone().subtract(halfSize)
+		const max = center.clone().add(halfSize)
+		return new this(min, max)
 	}
 
-	get max() {
-		return this.center.clone()
-			.add(this.extent.clone().half())
+	toJSON(): BoxJson {
+		return [this.min.toJSON(), this.max.toJSON()]
 	}
 
 	clone() {
-		return new Box(this.center.clone(), this.extent.clone())
+		return new Box(this.min.clone(), this.max.clone())
+	}
+
+	set(box: BoxLike) {
+		this.min.set(box.min)
+		this.max.set(box.max)
+	}
+
+	size() {
+		return this.max.clone().subtract(this.min)
+	}
+
+	center() {
+		return this.min.clone().add(this.size().half())
+	}
+
+	normalize() {
+		const {min, max} = this
+		this.min.set(Vec3.min(min, max))
+		this.max.set(Vec3.max(min, max))
+		return this
+	}
+
+	translate_(x: number, y: number, z: number) {
+		this.min.add_(x, y, z)
+		this.max.add_(x, y, z)
+		return this
+	}
+
+	translate(delta: Vec3) {
+		this.min.add(delta)
+		this.max.add(delta)
+		return this
+	}
+
+	grow(increase: Vec3) {
+		const halfIncrease = increase.clone().half()
+		this.min.subtract(halfIncrease)
+		this.max.add(halfIncrease)
+		return this
 	}
 
-	grow(increase: number) {
-		this.extent.addBy(increase)
+	growBy(increase: number) {
+		const halfIncrease = increase / 2
+		this.min.subtractBy(halfIncrease)
+		this.max.addBy(halfIncrease)
 		return this
 	}
 }

package/s/shapes/3d/segment.ts

@@ -1,5 +1,5 @@
 
-import {Vec3} from "../../primitives/vec3.js"
+import {Vec3} from "../../core/vec3.js"
 
 export class Segment {
 	constructor(
@@ -7,18 +7,18 @@ export class Segment {
 		public end: Vec3,
 	) {}
 
-	get vector() {
+	vector() {
 		return this.end.clone().subtract(this.start)
 	}
 
-	get length() {
+	length() {
 		return this.start.distance(this.end)
 	}
 
-	get center() {
+	center() {
 		return this.start.clone()
 			.add(this.end)
-			.divideBy(2)
+			.half()
 	}
 
 	clone() {
@@ -29,18 +29,20 @@ export class Segment {
 	}
 
 	fromStart(length: number) {
-		const direction = this.vector.normalize()
+		const direction = this.vector().normalize()
 		return this.start.clone().add(direction.multiplyBy(length))
 	}
 
 	point(fraction: number) {
-		return this.start.clone().add(this.vector.multiplyBy(fraction))
+		return this.start.clone().add(this.vector().multiplyBy(fraction))
 	}
 
 	scale(fraction: number) {
-		const newHalfVector = this.vector.multiplyBy(fraction / 2)
-		this.start.set(this.center.subtract(newHalfVector))
-		this.end.set(this.center.add(newHalfVector))
+		const {center} = this
+		const newHalfVector = this.vector().multiplyBy(fraction / 2)
+		this.start.set(center().subtract(newHalfVector))
+		this.end.set(center().add(newHalfVector))
+		return this
 	}
 }
 

package/s/{utils → tools}/angles.ts

@@ -1,5 +1,5 @@
 
-import {Scalar} from "../primitives/scalar.js"
+import {Scalar} from "./scalar.js"
 
 const pi = Math.PI
 
@@ -27,6 +27,9 @@ export const Turns = {
 	toRadians(t: number) {
 		return t * Radians.circle
 	},
+	toDegrees(t: number) {
+		return Radians.toDegrees(Turns.toRadians(t))
+	},
 }
 
 export const Arcseconds = {
@@ -39,5 +42,8 @@ export const Degrees = {
 	toRadians(d: number) {
 		return d * (pi / 180)
 	},
+	toTurns(d: number) {
+		return Radians.toTurns(Degrees.toRadians(d))
+	},
 }
 

package/s/{primitives → tools}/circular.ts

@@ -1,6 +1,8 @@
 
 import {Scalar} from "./scalar.js"
 
+const circle = 2 * Math.PI
+
 export class Circular {
 	constructor(public x: number) {}
 
@@ -20,7 +22,7 @@ export class Circular {
 	}
 
 	static normalize(x: number) {
-		return Scalar.wrap(x, 0, 2 * Math.PI)
+		return Scalar.wrap(x, 0, circle)
 	} normalize() {
 		this.x = Circular.normalize(this.x)
 		return this
@@ -30,8 +32,8 @@ export class Circular {
 		x = this.normalize(x)
 		y = this.normalize(y)
 		let delta = y - x
-		if (delta > Math.PI) delta -= 2 * Math.PI
-		if (delta < -Math.PI) delta += 2 * Math.PI
+		if (delta > Math.PI) delta -= circle
+		if (delta < -Math.PI) delta += circle
 		return delta
 	} difference(y: number | Circular) {
 		return Circular.difference(this.x, Circular.value(y))

package/s/{primitives → tools}/scalar.ts

@@ -43,7 +43,7 @@ export class Scalar {
 			x += n
 		return x
 	} add(...nums: number[]) {
-		this.x = Scalar.add(...nums)
+		this.x = Scalar.add(this.x, ...nums)
 		return this
 	}
 
@@ -53,23 +53,23 @@ export class Scalar {
 		return this
 	}
 
-	static min(x: number, minimum: number = 0) {
-		return Math.max(x, minimum)
-	} min(minimum: number = 0) {
-		this.x = Scalar.min(this.x, minimum)
+	static atLeast(x: number, least: number = 0) {
+		return Math.max(x, least)
+	} atLeast(least: number = 0) {
+		this.x = Scalar.atLeast(this.x, least)
 		return this
 	}
 
-	static max(x: number, maximum: number = 1) {
-		return Math.min(x, maximum)
-	} max(maximum: number = 1) {
-		this.x = Scalar.max(this.x, maximum)
+	static atMost(x: number, most: number = 1) {
+		return Math.min(x, most)
+	} atMost(most: number = 1) {
+		this.x = Scalar.atMost(this.x, most)
 		return this
 	}
 
 	static clamp(x: number, a: number = 0, b: number = 1) {
-		x = Scalar.min(x, Math.min(a, b))
-		x = Scalar.max(x, Math.max(a, b))
+		x = Scalar.atLeast(x, Math.min(a, b))
+		x = Scalar.atMost(x, Math.max(a, b))
 		return x
 	} clamp(a: number = 0, b: number = 1) {
 		this.x = Scalar.clamp(this.x, a, b)

package/s/{utils → tools}/spline.ts

@@ -1,15 +1,14 @@
 
-import {Scalar} from "../primitives/scalar.js"
-import {Vec2Array} from "../primitives/vec2.js"
+import {Scalar} from "./scalar.js"
+import {XyArray} from "../core/vec2.js"
 
 /** resolve a number within a linear spline. */
-export function linear(x: number, points: Vec2Array[]): number {
+export function linear(x: number, points: XyArray[]): number {
 	if (points.length < 2)
 		throw new Error("need at least two points, come on")
 
 	const [first] = points.at(0)!
 	const [last] = points.at(-1)!
-
 	x = Scalar.clamp(x, first, last)
 
 	for (let i = 0; i < points.length - 1; i++) {
@@ -26,11 +25,13 @@ export function linear(x: number, points: Vec2Array[]): number {
 }
 
 /** resolve a number within a catmull-rom spline, that's all smooth-like. */
-export function catmullRom(x: number, points: Vec2Array[]) {
+export function catmullRom(x: number, points: XyArray[]) {
 	if (points.length < 4)
 		throw new Error("need at least four points for this magic")
 
-	x = Scalar.clamp(x)
+	const [first] = points.at(0)!
+	const [last] = points.at(-1)!
+	x = Scalar.clamp(x, first, last)
 
 	// find the segment where 'x' fits
 	for (let i = 1; i < points.length - 2; i++) {
@@ -54,7 +55,7 @@ export const ez = {
 			throw new Error("need at least two points, come on")
 
 		const points2 = points.map(
-			(p, index): Vec2Array =>
+			(p, index): XyArray =>
 				[Scalar.clamp(index / (points.length - 1)), p]
 		)
 
@@ -67,10 +68,10 @@ namespace helpers {
 	/** internal big-brain maths for the catmull-rom implementation */
 	export function catmullRom(
 			t: number,
-			[,p0]: Vec2Array,
-			[,p1]: Vec2Array,
-			[,p2]: Vec2Array,
-			[,p3]: Vec2Array,
+			[,p0]: XyArray,
+			[,p1]: XyArray,
+			[,p2]: XyArray,
+			[,p3]: XyArray,
 		) {
 
 		const t2 = t * t

package/x/{primitives → core}/quat.d.ts

@@ -1,5 +1,5 @@
 import { Xyz } from "./vec3.js";
-export type QuatArray = [number, number, number, number];
+export type XyzwArray = [x: number, y: number, z: number, w: number];
 export type Xyzw = {
     x: number;
     y: number;
@@ -14,14 +14,19 @@ export declare class Quat {
     constructor(x: number, y: number, z: number, w: number);
     static new(x: number, y: number, z: number, w: number): Quat;
     static identity(): Quat;
-    static array(q: QuatArray): Quat;
-    static import({ x, y, z, w }: Xyzw): Quat;
-    static from(q: QuatArray | Xyzw): Quat;
+    static from(q: XyzwArray | Xyzw): Quat;
     static rotate_(pitch: number, yaw: number, roll: number): Quat;
     static rotate(vec: Xyz): Quat;
-    array(): QuatArray;
+    toJSON(): XyzwArray;
     toString(): string;
     clone(): Quat;
+    lengthSquared(): number;
+    length(): number;
+    isUnit(epsilon?: number): boolean;
+    ensureUnit(): this;
+    normalize(): this;
+    conjugate(): this;
+    invert(): this;
     transform_(x: number, y: number, z: number, w: number, global?: boolean): Quat;
     transform({ x, y, z, w }: Xyzw, global?: boolean): Quat;
     rotate_(pitch: number, yaw: number, roll: number, global?: boolean): Quat;

package/x/{primitives → core}/quat.js

@@ -15,16 +15,10 @@ export class Quat {
     static identity() {
         return new this(0, 0, 0, 1);
     }
-    static array(q) {
-        return new this(...q);
-    }
-    static import({ x, y, z, w }) {
-        return new this(x, y, z, w);
-    }
     static from(q) {
         return Array.isArray(q)
-            ? this.array(q)
-            : this.import(q);
+            ? new this(...q)
+            : new this(q.x, q.y, q.z, q.w);
     }
     static rotate_(pitch, yaw, roll) {
         return this.identity().rotate_(pitch, yaw, roll);
@@ -32,7 +26,7 @@ export class Quat {
     static rotate(vec) {
         return this.identity().rotate(vec);
     }
-    array() {
+    toJSON() {
         const { x, y, z, w } = this;
         return [x, y, z, w];
     }
@@ -40,12 +34,55 @@ export class Quat {
         return `(Quat x${this.x.toFixed(2)}, y${this.y.toFixed(2)}, z${this.z.toFixed(2)}, w${this.w.toFixed(2)})`;
     }
     clone() {
-        return new Quat(...this.array());
+        return new Quat(...this.toJSON());
+    }
+    lengthSquared() {
+        return this.x * this.x + this.y * this.y + this.z * this.z + this.w * this.w;
+    }
+    length() {
+        return Math.sqrt(this.lengthSquared());
+    }
+    isUnit(epsilon = 1e-6) {
+        return Math.abs(this.length() - 1) <= epsilon;
+    }
+    ensureUnit() {
+        if (!this.isUnit())
+            this.normalize();
+        return this;
+    }
+    normalize() {
+        const m = this.length();
+        if (!m) {
+            this.x = this.y = this.z = 0;
+            this.w = 1;
+            return this;
+        }
+        this.x /= m;
+        this.y /= m;
+        this.z /= m;
+        this.w /= m;
+        return this;
+    }
+    conjugate() {
+        this.x *= -1;
+        this.y *= -1;
+        this.z *= -1;
+        return this;
+    }
+    invert() {
+        const len2 = this.lengthSquared();
+        if (!len2)
+            return this.set_(0, 0, 0, 1);
+        this.x = -this.x / len2;
+        this.y = -this.y / len2;
+        this.z = -this.z / len2;
+        this.w = this.w / len2;
+        return this;
     }
     transform_(x, y, z, w, global = false) {
         if (global) {
-            const original = this.array();
-            return this.set_(x, y, z, w).multiply_(...original);
+            const original = this.clone();
+            return this.set_(x, y, z, w).multiply(original);
         }
         else {
             return this.multiply_(x, y, z, w);

package/x/core/quat.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"quat.js","sourceRoot":"","sources":["../../s/core/quat.ts"],"names":[],"mappings":"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"}

package/x/{primitives → core}/vec2.d.ts

@@ -1,29 +1,25 @@
-export type Vec2Array = [number, number];
+export type XyArray = [x: number, y: number];
 export type Xy = {
     x: number;
     y: number;
 };
-/** https://github.com/microsoft/TypeScript/issues/5863 */
-type TsHack<T> = {
-    new (...a: ConstructorParameters<typeof Vec2>): T;
-};
 export declare class Vec2 implements Xy {
     x: number;
     y: number;
     constructor(x: number, y: number);
-    static new<T extends Vec2>(this: TsHack<T>, x: number, y: number): T;
-    static zero<T extends Vec2>(this: TsHack<T>): T;
-    static all<T extends Vec2>(this: TsHack<T>, value: number): T;
-    static array<T extends Vec2>(this: TsHack<T>, v: Vec2Array): T;
-    static import<T extends Vec2>(this: TsHack<T>, { x, y }: Xy): T;
-    static from(v: Vec2Array | Xy): Vec2;
+    static new(x: number, y: number): Vec2;
+    static zero(): Vec2;
+    static all(value: number): Vec2;
+    static from(v: XyArray | Xy): Vec2;
     static magnitudeSquared(x: number, y: number): number;
     static magnitude(x: number, y: number): number;
     static average(...vectors: Xy[]): Vec2;
-    static min(...vecs: Vec2[]): Vec2;
-    static max(...vecs: Vec2[]): Vec2;
+    static min(...vecs: Xy[]): Vec2;
+    static max(...vecs: Xy[]): Vec2;
+    static fromAngle(radians: number): Vec2;
     clone(): Vec2;
-    array(): Vec2Array;
+    [Symbol.iterator](): Generator<number, void, unknown>;
+    toJSON(): XyArray;
     toString(): string;
     /** mutator */
     set_(x: number, y: number): this;
@@ -34,6 +30,8 @@ export declare class Vec2 implements Xy {
     rotation(): number;
     equals_(x: number, y: number): boolean;
     equals(...vecs: Xy[]): boolean;
+    near_(x: number, y: number, epsilon?: number): boolean;
+    near({ x, y }: Xy, epsilon?: number): boolean;
     dot_(x: number, y: number): number;
     dot({ x, y }: Xy): number;
     distanceSquared_(x: number, y: number): number;
@@ -65,7 +63,9 @@ export declare class Vec2 implements Xy {
     /** mutator */
     map(fn: (a: number, index: number) => number): this;
     /** mutator */
-    clamp(min: number, max: number): this;
+    clamp(min?: Xy, max?: Xy): this;
+    /** mutator */
+    clampBy(min?: number, max?: number): this;
     /** mutator */
     negate(): this;
     /** mutator */
@@ -105,10 +105,9 @@ export declare class Vec2 implements Xy {
     /** mutator */
     rotateAroundPoint_(x: number, y: number, radians: number): this;
     /** mutator */
-    rotateAroundPoint({ x, y }: Vec2, radians: number): this;
+    rotateAroundPoint({ x, y }: Xy, radians: number): this;
     /** mutator */
     smooth_(x: number, y: number, smoothing: number): this;
     /** mutator */
     smooth({ x, y }: Xy, smoothing: number): this;
 }
-export {};

package/x/{primitives → core}/vec2.js

@@ -1,4 +1,4 @@
-import { Scalar } from "./scalar.js";
+import { Scalar } from "../tools/scalar.js";
 export class Vec2 {
     x;
     y;
@@ -6,7 +6,6 @@ export class Vec2 {
         this.x = x;
         this.y = y;
     }
-    ///////////////////////////////////////////////////////////////////////
     static new(x, y) {
         return new this(x, y);
     }
@@ -16,16 +15,10 @@ export class Vec2 {
     static all(value) {
         return new this(value, value);
     }
-    static array(v) {
-        return new this(...v);
-    }
-    static import({ x, y }) {
-        return new this(x, y);
-    }
     static from(v) {
         return Array.isArray(v)
-            ? this.array(v)
-            : this.import(v);
+            ? new this(...v)
+            : new this(v.x, v.y);
     }
     static magnitudeSquared(x, y) {
         return (x * x) + (y * y);
@@ -39,16 +32,22 @@ export class Vec2 {
             .divideBy(vectors.length);
     }
     static min(...vecs) {
-        return new Vec2(Math.min(...vecs.map(v => v.x)), Math.min(...vecs.map(v => v.y)));
+        return new this(Math.min(...vecs.map(v => v.x)), Math.min(...vecs.map(v => v.y)));
     }
     static max(...vecs) {
-        return new Vec2(Math.max(...vecs.map(v => v.x)), Math.max(...vecs.map(v => v.y)));
+        return new this(Math.max(...vecs.map(v => v.x)), Math.max(...vecs.map(v => v.y)));
+    }
+    static fromAngle(radians) {
+        return new this(Math.cos(radians), Math.sin(radians));
     }
-    ///////////////////////////////////////////////////////////////////////
     clone() {
         return new Vec2(this.x, this.y);
     }
-    array() {
+    *[Symbol.iterator]() {
+        yield this.x;
+        yield this.y;
+    }
+    toJSON() {
         return [this.x, this.y];
     }
     toString() {
@@ -66,7 +65,6 @@ export class Vec2 {
         this.y = y;
         return this;
     }
-    ///////////////////////////////////////////////////////////////////////
     magnitudeSquared() {
         return Vec2.magnitudeSquared(this.x, this.y);
     }
@@ -83,6 +81,13 @@ export class Vec2 {
     equals(...vecs) {
         return vecs.every(({ x, y }) => this.equals_(x, y));
     }
+    near_(x, y, epsilon = 1e-6) {
+        return (Math.abs(this.x - x) <= epsilon &&
+            Math.abs(this.y - y) <= epsilon);
+    }
+    near({ x, y }, epsilon = 1e-6) {
+        return this.near_(x, y, epsilon);
+    }
     dot_(x, y) {
         return (this.x * x) + (this.y * y);
     }
@@ -106,12 +111,14 @@ export class Vec2 {
     angleBetween_(x, y) {
         const dot = this.dot_(x, y);
         const magnitudes = this.magnitude() * Vec2.magnitude(x, y);
-        return Math.acos(dot / magnitudes);
+        if (magnitudes === 0)
+            return 0;
+        const ratio = Scalar.clamp(dot / magnitudes, -1, 1);
+        return Math.acos(ratio);
     }
     angleBetween({ x, y }) {
         return this.angleBetween_(x, y);
     }
-    ///////////////////////////////////////////////////////////////////////
     /** mutator */
     normalize() {
         return this.divideBy(this.magnitude());
@@ -174,9 +181,16 @@ export class Vec2 {
         return this;
     }
     /** mutator */
-    clamp(min, max) {
-        const clamp = (val) => Math.max(min, Math.min(max, val));
-        return this.map(clamp);
+    clamp(min = { x: 0, y: 0 }, max = { x: 1, y: 1 }) {
+        this.x = Scalar.clamp(this.x, min.x, max.x);
+        this.y = Scalar.clamp(this.y, min.y, max.y);
+        return this;
+    }
+    /** mutator */
+    clampBy(min = 0, max = 1) {
+        this.x = Scalar.clamp(this.x, min, max);
+        this.y = Scalar.clamp(this.y, min, max);
+        return this;
     }
     /** mutator */
     negate() {
@@ -247,8 +261,10 @@ export class Vec2 {
     }
     /** mutator */
     divide_(x, y) {
-        this.x /= x;
-        this.y /= y;
+        if (x !== 0)
+            this.x /= x;
+        if (y !== 0)
+            this.y /= y;
         return this;
     }
     /** mutator */