Skip to content

Support for Zig 0.14.0 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Support for Zig 0.14.0 #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e65e01
updated output dirs
TotoShampoin Jan 23, 2025
ea6305b
compatibility with zig 0.14.0
TotoShampoin Jan 23, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
zig-cache
.zig-cache
68 changes: 34 additions & 34 deletions src/zlm-generic.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// Initializes all values of the vector with the given value.
pub fn all(value: Real) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = value;
}
return result;
Expand All @@ -31,7 +31,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// adds all components from `a` with the components of `b`.
pub fn add(a: Self, b: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = @field(a, fld.name) + @field(b, fld.name);
}
return result;
Expand All @@ -40,7 +40,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// subtracts all components from `a` with the components of `b`.
pub fn sub(a: Self, b: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = @field(a, fld.name) - @field(b, fld.name);
}
return result;
Expand All @@ -49,7 +49,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// multiplies all components from `a` with the components of `b`.
pub fn mul(a: Self, b: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = @field(a, fld.name) * @field(b, fld.name);
}
return result;
Expand All @@ -58,7 +58,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// divides all components from `a` by the components of `b`.
pub fn div(a: Self, b: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = @field(a, fld.name) / @field(b, fld.name);
}
return result;
Expand All @@ -67,7 +67,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// multiplies all components by a scalar value.
pub fn scale(a: Self, b: Real) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = @field(a, fld.name) * b;
}
return result;
Expand All @@ -76,8 +76,8 @@ pub fn SpecializeOn(comptime Real: type) type {
/// returns the negative of self
pub fn neg(self: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
@field(result, fld.name) = - @field(self, fld.name);
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = -@field(self, fld.name);
}
return result;
}
Expand All @@ -86,7 +86,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// This is the sum of products of all components.
pub fn dot(a: Self, b: Self) Real {
var result: Real = 0;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
result += @field(a, fld.name) * @field(b, fld.name);
}
return result;
Expand Down Expand Up @@ -125,7 +125,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// applies component-wise absolute values
pub fn abs(a: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = @abs(@field(a, fld.name));
}
return result;
Expand Down Expand Up @@ -178,7 +178,7 @@ pub fn SpecializeOn(comptime Real: type) type {
/// returns a new vector where each component is the minimum of the components of the input vectors.
pub fn componentMin(a: Self, b: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = @min(@field(a, fld.name), @field(b, fld.name));
}
return result;
Expand All @@ -187,18 +187,18 @@ pub fn SpecializeOn(comptime Real: type) type {
/// returns a new vector where each component is the maximum of the components of the input vectors.
pub fn componentMax(a: Self, b: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = @max(@field(a, fld.name), @field(b, fld.name));
}
return result;
}

/// returns a new vector where each component is clamped to the given range.
/// `min` and `max` must be of the same type as the vector, and every field of
/// `min` and `max` must be of the same type as the vector, and every field of
/// `min` must be smaller or equal to the corresponding field of `max`.
pub fn componentClamp(a: Self, min: Self, max: Self) Self {
var result: Self = undefined;
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
@field(result, fld.name) = std.math.clamp(@field(a, fld.name), @field(min, fld.name), @field(max, fld.name));
}
return result;
Expand All @@ -211,23 +211,23 @@ pub fn SpecializeOn(comptime Real: type) type {
}

pub fn eql(a: Self, b: Self) bool {
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
if (@field(a, fld.name) != @field(b, fld.name))
return false;
}
return true;
}

pub fn approxEqAbs(a: Self, b: Self, tolerance: Real) bool {
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
if (!std.math.approxEqAbs(Real, @field(a, fld.name), @field(b, fld.name), tolerance))
return false;
}
return true;
}

pub fn approxEqRel(a: Self, b: Self, tolerance: Real) bool {
inline for (@typeInfo(Self).Struct.fields) |fld| {
inline for (@typeInfo(Self).@"struct".fields) |fld| {
if (!std.math.approxEqRel(Real, @field(a, fld.name), @field(b, fld.name), tolerance))
return false;
}
Expand Down Expand Up @@ -566,11 +566,11 @@ pub fn SpecializeOn(comptime Real: type) type {
result.fields[0][1] = u.x;
result.fields[1][1] = u.y;
result.fields[2][1] = u.z;
result.fields[0][2] = - f.x;
result.fields[1][2] = - f.y;
result.fields[2][2] = - f.z;
result.fields[3][0] = - Vec3.dot(s, eye);
result.fields[3][1] = - Vec3.dot(u, eye);
result.fields[0][2] = -f.x;
result.fields[1][2] = -f.y;
result.fields[2][2] = -f.z;
result.fields[3][0] = -Vec3.dot(s, eye);
result.fields[3][1] = -Vec3.dot(u, eye);
result.fields[3][2] = Vec3.dot(f, eye);
return result;
}
Expand Down Expand Up @@ -598,9 +598,9 @@ pub fn SpecializeOn(comptime Real: type) type {
var result = Self.zero;
result.fields[0][0] = 1.0 / (aspect * tanHalfFovy);
result.fields[1][1] = 1.0 / (tanHalfFovy);
result.fields[2][2] = - (far + near) / (far - near);
result.fields[2][3] = - 1;
result.fields[3][2] = - (2 * far * near) / (far - near);
result.fields[2][2] = -(far + near) / (far - near);
result.fields[2][3] = -1;
result.fields[3][2] = -(2 * far * near) / (far - near);
return result;
}

Expand All @@ -614,12 +614,12 @@ pub fn SpecializeOn(comptime Real: type) type {
const y = normalized.y;
const z = normalized.z;

return Self{
return Self{
.fields = [4][4]Real{
[4]Real{ cos + x * x * (1 - cos), x * y * (1 - cos) + z * sin, x * z * (1 - cos) - y * sin, 0 },
[4]Real{ y * x * (1 - cos) - z * sin, cos + y * y * (1 - cos), y * z * (1 - cos) + x * sin, 0 },
[4]Real{ z * x * (1 - cos) + y * sin, z * y * (1 - cos) - x * sin, cos + z * z * (1 - cos), 0 },
[4]Real{ 0, 0, 0, 1 },
[4]Real{ cos + x * x * (1 - cos), x * y * (1 - cos) + z * sin, x * z * (1 - cos) - y * sin, 0 },
[4]Real{ y * x * (1 - cos) - z * sin, cos + y * y * (1 - cos), y * z * (1 - cos) + x * sin, 0 },
[4]Real{ z * x * (1 - cos) + y * sin, z * y * (1 - cos) - x * sin, cos + z * z * (1 - cos), 0 },
[4]Real{ 0, 0, 0, 1 },
},
};
}
Expand Down Expand Up @@ -672,10 +672,10 @@ pub fn SpecializeOn(comptime Real: type) type {
var result = Self.identity;
result.fields[0][0] = 2 / (right - left);
result.fields[1][1] = 2 / (top - bottom);
result.fields[2][2] = - 2 / (far - near);
result.fields[3][0] = - (right + left) / (right - left);
result.fields[3][1] = - (top + bottom) / (top - bottom);
result.fields[3][2] = - (far + near) / (far - near);
result.fields[2][2] = -2 / (far - near);
result.fields[3][0] = -(right + left) / (right - left);
result.fields[3][1] = -(top + bottom) / (top - bottom);
result.fields[3][2] = -(far + near) / (far - near);
return result;
}

Expand Down