zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

math: Make Mat3x3's underlying type Vec3

Browse source
This commit is contained in:
Joel D. Schüller 2023-10-20 14:01:30 +02:00 • committed by Stephen Gutekanst
parent ec53b24309
commit 3e025ef7b1
3 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/math/main.zig
View file

@ -51,7 +51,7 @@ pub const Vec2 = vec.Vec(2, f32);
pub const Vec3 = vec.Vec(3, f32); pub const Vec3 = vec.Vec(3, f32);
pub const Vec4 = vec.Vec(4, f32); pub const Vec4 = vec.Vec(4, f32);
pub const Quat = q.Quat(f32); pub const Quat = q.Quat(f32);
pub const Mat3x3 = mat.Mat(3, 3, Vec4); pub const Mat3x3 = mat.Mat(3, 3, Vec3);
pub const Mat4x4 = mat.Mat(4, 4, Vec4); pub const Mat4x4 = mat.Mat(4, 4, Vec4);
pub const Ray = ray.Ray(Vec3); pub const Ray = ray.Ray(Vec3);
@ -60,7 +60,7 @@ pub const Vec2h = vec.Vec(2, f16);
pub const Vec3h = vec.Vec(3, f16); pub const Vec3h = vec.Vec(3, f16);
pub const Vec4h = vec.Vec(4, f16); pub const Vec4h = vec.Vec(4, f16);
pub const Quath = q.Quat(f16); pub const Quath = q.Quat(f16);
pub const Mat3x3h = mat.Mat(3, 3, Vec4h); pub const Mat3x3h = mat.Mat(3, 3, Vec3h);
pub const Mat4x4h = mat.Mat(4, 4, Vec4h); pub const Mat4x4h = mat.Mat(4, 4, Vec4h);
pub const Rayh = ray.Ray(Vec3h); pub const Rayh = ray.Ray(Vec3h);
@ -69,7 +69,7 @@ pub const Vec2d = vec.Vec(2, f64);
pub const Vec3d = vec.Vec(3, f64); pub const Vec3d = vec.Vec(3, f64);
pub const Vec4d = vec.Vec(4, f64); pub const Vec4d = vec.Vec(4, f64);
pub const Quatd = q.Quat(f64); pub const Quatd = q.Quat(f64);
pub const Mat3x3d = mat.Mat(3, 3, Vec4d); pub const Mat3x3d = mat.Mat(3, 3, Vec3d);
pub const Mat4x4d = mat.Mat(4, 4, Vec4d); pub const Mat4x4d = mat.Mat(4, 4, Vec4d);
pub const Rayd = ray.Ray(Vec3d); pub const Rayd = ray.Ray(Vec3d);

40
src/math/mat.zig
View file

@ -38,7 +38,7 @@ pub fn Mat(
/// The scalar type of this matrix, e.g. Mat3x3.T == f32 /// The scalar type of this matrix, e.g. Mat3x3.T == f32
pub const T = Vector.T; pub const T = Vector.T;
/// The underlying Vec type, e.g. Mat3x3.Vec == Vec4 /// The underlying Vec type, e.g. Mat3x3.Vec == Vec3
pub const Vec = Vector; pub const Vec = Vector;
/// The Vec type corresponding to the number of rows, e.g. Mat3x3.RowVec == Vec3 /// The Vec type corresponding to the number of rows, e.g. Mat3x3.RowVec == Vec3
@ -80,18 +80,18 @@ pub fn Mat(
/// ///
/// ``` /// ```
/// const m = Mat3x3.init( /// const m = Mat3x3.init(
/// vec4(1, 0, tx), /// vec3(1, 0, tx),
/// vec4(0, 1, ty), /// vec3(0, 1, ty),
/// vec4(0, 0, tz), /// vec3(0, 0, tz),
/// ); /// );
/// ``` /// ```
/// ///
/// Note that Mach matrices use [column-major storage and column-vectors](https://machengine.org/engine/math/matrix-storage/). /// Note that Mach matrices use [column-major storage and column-vectors](https://machengine.org/engine/math/matrix-storage/).
pub inline fn init(r0: *const RowVec, r1: *const RowVec, r2: *const RowVec) Matrix { pub inline fn init(r0: *const RowVec, r1: *const RowVec, r2: *const RowVec) Matrix {
return .{ .v = [_]Vec{ return .{ .v = [_]Vec{
Vec.init(r0.x(), r1.x(), r2.x(), 1), Vec.init(r0.x(), r1.x(), r2.x()),
Vec.init(r0.y(), r1.y(), r2.y(), 1), Vec.init(r0.y(), r1.y(), r2.y()),
Vec.init(r0.z(), r1.z(), r2.z(), 1), Vec.init(r0.z(), r1.z(), r2.z()),
} }; } };
} }
@ -112,9 +112,9 @@ pub fn Mat(
/// Transposes the matrix. /// Transposes the matrix.
pub inline fn transpose(m: *const Matrix) Matrix { pub inline fn transpose(m: *const Matrix) Matrix {
return .{ .v = [_]Vec{ return .{ .v = [_]Vec{
Vec.init(m.v[0].v[0], m.v[1].v[0], m.v[2].v[0], 1), Vec.init(m.v[0].v[0], m.v[1].v[0], m.v[2].v[0]),
Vec.init(m.v[0].v[1], m.v[1].v[1], m.v[2].v[1], 1), Vec.init(m.v[0].v[1], m.v[1].v[1], m.v[2].v[1]),
Vec.init(m.v[0].v[2], m.v[1].v[2], m.v[2].v[2], 1), Vec.init(m.v[0].v[2], m.v[1].v[2], m.v[2].v[2]),
} }; } };
} }
@ -436,8 +436,8 @@ test "zero_struct_overhead" {
test "n" { test "n" {
try testing.expect(usize, 3).eql(math.Mat3x3.cols); try testing.expect(usize, 3).eql(math.Mat3x3.cols);
try testing.expect(usize, 3).eql(math.Mat3x3.rows); try testing.expect(usize, 3).eql(math.Mat3x3.rows);
try testing.expect(type, math.Vec4).eql(math.Mat3x3.Vec); try testing.expect(type, math.Vec3).eql(math.Mat3x3.Vec);
try testing.expect(usize, 4).eql(math.Mat3x3.Vec.n); try testing.expect(usize, 3).eql(math.Mat3x3.Vec.n);
} }
test "init" { test "init" {
@ -446,20 +446,20 @@ test "init" {
&math.vec3(0, 1, 7331), &math.vec3(0, 1, 7331),
&math.vec3(0, 0, 1), &math.vec3(0, 0, 1),
)).eql(math.Mat3x3{ )).eql(math.Mat3x3{
.v = [_]math.Vec4{ .v = [_]math.Vec3{
math.Vec4.init(1, 0, 0, 1), math.Vec3.init(1, 0, 0),
math.Vec4.init(0, 1, 0, 1), math.Vec3.init(0, 1, 0),
math.Vec4.init(1337, 7331, 1, 1), math.Vec3.init(1337, 7331, 1),
}, },
}); });
} }
test "mat3x3_ident" { test "mat3x3_ident" {
try testing.expect(math.Mat3x3, math.Mat3x3.ident).eql(math.Mat3x3{ try testing.expect(math.Mat3x3, math.Mat3x3.ident).eql(math.Mat3x3{
.v = [_]math.Vec4{ .v = [_]math.Vec3{
math.Vec4.init(1, 0, 0, 1), math.Vec3.init(1, 0, 0),
math.Vec4.init(0, 1, 0, 1), math.Vec3.init(0, 1, 0),
math.Vec4.init(0, 0, 1, 1), math.Vec3.init(0, 0, 1),
}, },
}); });
} }

10
src/math/vec.zig
View file

@ -29,7 +29,7 @@ pub fn Vec(comptime n_value: usize, comptime Scalar: type) type {
} }
pub inline fn fromInt(xs: anytype, ys: anytype) VecN { pub inline fn fromInt(xs: anytype, ys: anytype) VecN {
return .{ .v = .{ @floatFromInt(xs), @floatFromInt(ys) } }; return .{ .v = .{ @floatFromInt(xs), @floatFromInt(ys) } };
} }
pub inline fn x(v: *const VecN) Scalar { pub inline fn x(v: *const VecN) Scalar {
return v.v[0]; return v.v[0];
} }
@ -43,7 +43,7 @@ pub fn Vec(comptime n_value: usize, comptime Scalar: type) type {
} }
pub inline fn fromInt(xs: anytype, ys: anytype, zs: anytype) VecN { pub inline fn fromInt(xs: anytype, ys: anytype, zs: anytype) VecN {
return .{ .v = .{ @floatFromInt(xs), @floatFromInt(ys), @floatFromInt(zs) } }; return .{ .v = .{ @floatFromInt(xs), @floatFromInt(ys), @floatFromInt(zs) } };
} }
pub inline fn x(v: *const VecN) Scalar { pub inline fn x(v: *const VecN) Scalar {
return v.v[0]; return v.v[0];
} }
@ -79,7 +79,7 @@ pub fn Vec(comptime n_value: usize, comptime Scalar: type) type {
} }
/// Vector * Matrix multiplication /// Vector * Matrix multiplication
pub inline fn mulMat(vector: *const VecN, matrix: *const mat.Mat(3, 3, Vec(4, T))) VecN { pub inline fn mulMat(vector: *const VecN, matrix: *const mat.Mat(3, 3, Vec(3, T))) VecN {
var result = [_]VecN.T{0} ** 3; var result = [_]VecN.T{0} ** 3;
inline for (0..3) |i| { inline for (0..3) |i| {
inline for (0..3) |j| { inline for (0..3) |j| {
@ -95,7 +95,7 @@ pub fn Vec(comptime n_value: usize, comptime Scalar: type) type {
} }
pub inline fn fromInt(xs: anytype, ys: anytype, zs: anytype, ws: anytype) VecN { pub inline fn fromInt(xs: anytype, ys: anytype, zs: anytype, ws: anytype) VecN {
return .{ .v = .{ @floatFromInt(xs), @floatFromInt(ys), @floatFromInt(zs), @floatFromInt(ws) } }; return .{ .v = .{ @floatFromInt(xs), @floatFromInt(ys), @floatFromInt(zs), @floatFromInt(ws) } };
} }
pub inline fn x(v: *const VecN) Scalar { pub inline fn x(v: *const VecN) Scalar {
return v.v[0]; return v.v[0];
} }
@ -948,4 +948,4 @@ test "Vec4d_fromInt" {
const v = math.vec4dFromInt(x, y, z, w); const v = math.vec4dFromInt(x, y, z, w);
const expected = math.vec4d(0, 1, 2, 3); const expected = math.vec4d(0, 1, 2, 3);
try testing.expect(math.Vec4d, expected).eql(v); try testing.expect(math.Vec4d, expected).eql(v);
} }