Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
zig-cache
.zig-cache/
26 changes: 26 additions & 0 deletions src/test.zig
Original file line number Diff line number Diff line change
Expand Up @@ -238,3 +238,29 @@ test "vec4 swizzle" {
assert(std.meta.eql(vec4(3, 4, 2, 1), vec4(1, 2, 3, 4).swizzle("zwyx")));
assert(std.meta.eql(@as(f32, 3), vec4(1, 2, 3, 4).swizzle("z")));
}

test "vec2 format" {
try std.testing.expectFmt("vec2(1.00, 2.00)", "{f}", .{vec2(1, 2)});
}

test "vec3 format" {
try std.testing.expectFmt("vec3(1.00, 2.00, 3.00)", "{f}", .{vec3(1, 2, 3)});
}

test "vec4 format" {
try std.testing.expectFmt("vec4(1.00, 2.00, 3.00, 4.00)", "{f}", .{vec4(1, 2, 3, 4)});
}

test "mat4 format" {
const mat = Mat4{
.fields = [4][4]f32{
// zig fmt: off
[4]f32{ 1, 2, 3, 4 },
[4]f32{ 5, 6, 7, 8 },
[4]f32{ 9, 10, 11, 12 },
[4]f32{ 13, 14, 15, 16 },
// zig-fmt: on
},
};
try std.testing.expectFmt("mat4{ (1.00 2.00 3.00 4.00) (5.00 6.00 7.00 8.00) (9.00 10.00 11.00 12.00) (13.00 14.00 15.00 16.00) }", "{f}", .{mat});
}
20 changes: 10 additions & 10 deletions src/zlm.zig
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,8 @@ pub fn as(comptime Real: type) type {
};
}

pub fn format(value: Self, comptime _: []const u8, _: std.fmt.FormatOptions, stream: anytype) !void {
try stream.print("vec2({d:.2}, {d:.2})", .{ value.x, value.y });
pub fn format(this: Self, writer: *std.Io.Writer) !void {
try writer.print("vec2({d:.2}, {d:.2})", .{ this.x, this.y });
}

fn getField(vec: Self, comptime index: comptime_int) Real {
Expand Down Expand Up @@ -343,8 +343,8 @@ pub fn as(comptime Real: type) type {
};
}

pub fn format(value: Self, comptime _: []const u8, _: std.fmt.FormatOptions, stream: anytype) !void {
try stream.print("vec3({d:.2}, {d:.2}, {d:.2})", .{ value.x, value.y, value.z });
pub fn format(value: Self, writer: *std.Io.Writer) !void {
try writer.print("vec3({d:.2}, {d:.2}, {d:.2})", .{ value.x, value.y, value.z });
}

/// calculates the cross product. result will be perpendicular to a and b.
Expand Down Expand Up @@ -474,8 +474,8 @@ pub fn as(comptime Real: type) type {
};
}

pub fn format(value: Self, comptime _: []const u8, _: std.fmt.FormatOptions, stream: anytype) !void {
try stream.print("vec4({d:.2}, {d:.2}, {d:.2}, {d:.2})", .{ value.x, value.y, value.z, value.w });
pub fn format(value: Self, writer: *std.Io.Writer) !void {
try writer.print("vec4({d:.2}, {d:.2}, {d:.2}, {d:.2})", .{ value.x, value.y, value.z, value.w });
}

/// multiplies the vector with a matrix.
Expand Down Expand Up @@ -578,15 +578,15 @@ pub fn as(comptime Real: type) type {
},
};

pub fn format(value: Self, comptime _: []const u8, _: std.fmt.FormatOptions, stream: anytype) !void {
try stream.writeAll("mat4{");
pub fn format(value: Self, writer: *std.Io.Writer) !void {
try writer.writeAll("mat4{");

inline for (0..4) |i| {
const row = value.fields[i];
try stream.print(" ({d:.2} {d:.2} {d:.2} {d:.2})", .{ row[0], row[1], row[2], row[3] });
try writer.print(" ({d:.2} {d:.2} {d:.2} {d:.2})", .{ row[0], row[1], row[2], row[3] });
}

try stream.writeAll(" }");
try writer.writeAll(" }");
}

/// performs matrix multiplication of a*b
Expand Down