Fix *.sub and *.mul

baku89 · Feb 18, 2024 · df30e11 · df30e11
1 parent c6d2bc8
commit df30e11
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 20 deletions.
diff --git a/src/vec2.ts b/src/vec2.ts
@@ -83,8 +83,7 @@ export namespace vec2 {
 		}
 
 		if (vs.length === 1) {
-			const v = vs[0]
-			return [-v[0], -v[1]]
+			return [-vs[0][0], -vs[0][1]]
 		}
 
 		const [first, ...rest] = vs
@@ -143,7 +142,7 @@ export namespace vec2 {
 		}
 
 		if (vs.length === 1) {
-			return divide(one, vs[0])
+			return [1 / vs[0][0], 1 / vs[0][1]]
 		}
 
 		const [first, ...rest] = vs

diff --git a/src/vec3.ts b/src/vec3.ts
@@ -96,7 +96,7 @@ export namespace vec3 {
 		}
 
 		if (vs.length === 1) {
-			return [-vs[0], -vs[1], -vs[2]]
+			return [-vs[0][0], -vs[0][1], -vs[0][2]]
 		}
 
 		const [first, ...rest] = vs
@@ -142,16 +142,23 @@ export namespace vec3 {
 	export function divide(...vs: vec3[]): vec3 {
 		if (vs.length === 0) {
 			return one
-		} else if (vs.length === 1) {
-			return divide(one, vs[0])
-		} else if (vs.length > 2) {
-			const [a, b, ...rest] = vs
-			return divide(divide(a, b), ...rest)
 		}
 
-		const [a, b] = vs
+		if (vs.length === 1) {
+			return [1 / vs[0][0], 1 / vs[0][1], 1 / vs[0][2]]
+		}
 
-		return [a[0] / b[0], a[1] / b[1], a[2] / b[2]]
+		const [first, ...rest] = vs
+
+		let [x, y, z] = first
+
+		for (const v of rest) {
+			x /= v[0]
+			y /= v[1]
+			z /= v[2]
+		}
+
+		return [x, y, z]
 	}
 
 	/**

diff --git a/src/vec4.ts b/src/vec4.ts
@@ -104,7 +104,7 @@ export namespace vec4 {
 		}
 
 		if (vs.length === 1) {
-			return [-vs[0], -vs[1], -vs[2], -vs[3]]
+			return [-vs[0][0], -vs[0][1], -vs[0][2], -vs[0][3]]
 		}
 
 		const [first, ...rest] = vs
@@ -153,18 +153,25 @@ export namespace vec4 {
 	export function divide(...vs: vec4[]): vec4 {
 		if (vs.length === 0) {
 			return one
-		} else if (vs.length === 1) {
-			return divide(one, vs[0])
-		} else if (vs.length > 2) {
-			const [a, b, ...rest] = vs
-			return divide(divide(a, b), ...rest)
 		}
 
-		const [a, b] = vs
+		if (vs.length === 1) {
+			return [1 / vs[0][0], 1 / vs[0][1], 1 / vs[0][2], 1 / vs[0][3]]
+		}
 
-		return [a[0] / b[0], a[1] / b[1], a[2] / b[2], a[3] / b[3]]
-	}
+		const [first, ...rest] = vs
+
+		let [x, y, z, w] = first
 
+		for (const v of rest) {
+			x /= v[0]
+			y /= v[1]
+			z /= v[2]
+			w /= v[3]
+		}
+
+		return [x, y, z, w]
+	}
 	/**
 	 * symmetric round the components of a vec4
 	 */