Refactor math for no good reason; I just really like math

src/math/Vector4.zig

@@ -1,9 +1,11 @@
+const Vector2 = @import("Vector2.zig").Vector2;
 const Vector3 = @import("Vector3.zig").Vector3;
 
 pub const Vector4 = extern struct {
     vector: Vector,
 
     pub const Vector = @Vector(4, f32);
+    pub const Mask = enum(i32) { x = 0, y = 1, z = 2, w = 3 };
 
     pub const zero = Vector4.init(0, 0, 0, 0);
     pub const one = Vector4.init(1, 1, 1, 1);
@@ -12,10 +14,32 @@ pub const Vector4 = extern struct {
     pub const unit_z = Vector4.init(0, 0, 1, 0);
     pub const unit_w = Vector4.init(0, 0, 0, 1);
 
+    // --- INIT ---
+
     pub inline fn init(x: f32, y: f32, z: f32, w: f32) Vector4 {
         return .{ .vector = .{ x, y, z, w } };
     }
 
+    pub inline fn initArray(array: [4]f32) Vector4 {
+        return .{ .vector = array };
+    }
+
+    // --- CONVERSION ---
+
+    pub inline fn asArray(self: Vector4) [4]f32 {
+        return self.vector;
+    }
+
+    pub inline fn asVector2(self: Vector4) Vector2 {
+        return .{ .vector = @shuffle(f32, self.vector, undefined, .{ 0, 1 }) };
+    }
+
+    pub inline fn asVector3(self: Vector4) Vector3 {
+        return .{ .vector = @shuffle(f32, self.vector, undefined, .{ 0, 1, 2 }) };
+    }
+
+    // --- ACCESSORS ---
+
     pub inline fn getX(self: Vector4) f32 {
         return self.vector[0];
     }
@@ -34,24 +58,26 @@ pub const Vector4 = extern struct {
 
     pub inline fn setX(self: Vector4, x: f32) Vector4 {
         const x_vector: Vector = @splat(x);
-        return .{ .vector = @shuffle(Vector, self, x_vector, .{ ~@as(i32, 0), 1, 2, 3 }) };
+        return .{ .vector = @shuffle(f32, self, x_vector, .{ ~@as(i32, 0), 1, 2, 3 }) };
     }
 
     pub inline fn setY(self: Vector4, y: f32) Vector4 {
         const y_vector: Vector = @splat(y);
-        return .{ .vector = @shuffle(Vector, self, y_vector, .{ 0, ~@as(i32, 1), 2, 3 }) };
+        return .{ .vector = @shuffle(f32, self, y_vector, .{ 0, ~@as(i32, 1), 2, 3 }) };
     }
 
     pub inline fn setZ(self: Vector4, z: f32) Vector4 {
         const z_vector: Vector = @splat(z);
-        return .{ .vector = @shuffle(Vector, self, z_vector, .{ 0, 1, ~@as(i32, 2), 3 }) };
+        return .{ .vector = @shuffle(f32, self, z_vector, .{ 0, 1, ~@as(i32, 2), 3 }) };
     }
 
     pub inline fn setW(self: Vector4, w: f32) Vector4 {
         const w_vector: Vector = @splat(w);
-        return .{ .vector = @shuffle(Vector, self, w_vector, .{ 0, 1, 2, ~@as(i32, 3) }) };
+        return .{ .vector = @shuffle(f32, self, w_vector, .{ 0, 1, 2, ~@as(i32, 3) }) };
     }
 
+    // --- COMPONENT-WISE ---
+
     pub inline fn add(self: Vector4, other: Vector4) Vector4 {
         return .{ .vector = self.vector + other.vector };
     }
@@ -68,6 +94,10 @@ pub const Vector4 = extern struct {
         return .{ .vector = self.vector / other.vector };
     }
 
+    pub inline fn negate(self: Vector4) Vector4 {
+        return .{ .vector = -self.vector };
+    }
+
     pub inline fn mulScalar(self: Vector4, scalar: f32) Vector4 {
         const scalar_vector: Vector = @splat(scalar);
         return .{ .vector = self.vector * scalar_vector };
@@ -78,8 +108,36 @@ pub const Vector4 = extern struct {
         return .{ .vector = self.vector / scalar_vector };
     }
 
-    pub inline fn negate(self: Vector4) Vector4 {
-        return .{ .vector = -self.vector };
+    // --- SWIZZLE ---
+
+    pub inline fn swizzle2(self: Vector4, comptime mask: [2]Mask) Vector2 {
+        return .{ .vector = @shuffle(f32, self.vector, undefined, @as([2]i32, @bitCast(mask))) };
+    }
+
+    pub inline fn swizzle3(self: Vector4, comptime mask: [3]Mask) Vector3 {
+        return .{ .vector = @shuffle(f32, self.vector, undefined, @as([3]i32, @bitCast(mask))) };
+    }
+
+    pub inline fn swizzle4(self: Vector4, comptime mask: [4]Mask) Vector4 {
+        return .{ .vector = @shuffle(f32, self.vector, undefined, @as([4]i32, @bitCast(mask))) };
+    }
+
+    // --- OTHER ---
+
+    pub inline fn len(self: Vector4) f32 {
+        return @sqrt(@reduce(.Add, self.vector * self.vector));
+    }
+
+    pub inline fn lenSquared(self: Vector4) f32 {
+        return @reduce(.Add, self.vector * self.vector);
+    }
+
+    pub inline fn normalize(self: Vector4) Vector4 {
+        return .{ .vector = self.vector / @sqrt(@reduce(.Add, self.vector * self.vector)) };
+    }
+
+    pub inline fn dot(self: Vector4, other: Vector4) f32 {
+        return @reduce(.Add, self.vector * other.vector);
     }
 
     pub inline fn lerp(self: Vector4, other: Vector4, t: f32) Vector4 {
@@ -88,20 +146,4 @@ pub const Vector4 = extern struct {
         const s_vector: Vector = @splat(s);
         return .{ .vector = self * t_vector + other * s_vector };
     }
-
-    pub inline fn asVector3(self: Vector4) Vector3 {
-        return .{ .vector = @shuffle(Vector3.Vector, self.vector, undefined, .{ 0, 1, 2 }) };
-    }
-
-    pub inline fn swizzle3(self: Vector4, comptime mask: @Vector(3, i32)) Vector3 {
-        return .{ .vector = @shuffle(Vector3.Vector, self.vector, undefined, mask) };
-    }
-
-    pub inline fn swizzle4(self: Vector4, comptime mask: @Vector(4, i32)) Vector4 {
-        return .{ .vector = @shuffle(Vector, self.vector, undefined, mask) };
-    }
-
-    pub inline fn asArray(self: Vector4) [4]f32 {
-        return self.vector;
-    }
 };