diff options
Diffstat (limited to 'src/sketch/tween.zig')
| -rw-r--r-- | src/sketch/tween.zig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sketch/tween.zig b/src/sketch/tween.zig index d3b53a1..6d1cef1 100644 --- a/src/sketch/tween.zig +++ b/src/sketch/tween.zig @@ -25,7 +25,7 @@ pub fn lerp(a: anytype, b: @TypeOf(a), t: f32) @TypeOf(a) { }, .@"struct" => |s| blk: { var out: T = undefined; - inline for (s.fields) |field| @field(out, field.name) = lerp(@field(a, field.name), @field(b, field.name), t); + inline for (s.field_names) |name| @field(out, name) = lerp(@field(a, name), @field(b, name), t); break :blk out; }, else => if (t >= 1) b else a, @@ -49,14 +49,14 @@ pub fn lerpFields(a: anytype, b: @TypeOf(a), t: f32, comptime names: anytype) @T pub fn toward(a: anytype, target: anytype, t: f32) @TypeOf(a) { const T = @TypeOf(a); var out = a; - inline for (@typeInfo(@TypeOf(target)).@"struct".fields) |field| { - if (!@hasField(T, field.name)) @compileError(@typeName(T) ++ " has no field '" ++ field.name ++ "' to animate"); - const F = @FieldType(T, field.name); + inline for (@typeInfo(@TypeOf(target)).@"struct".field_names) |name| { + if (!@hasField(T, name)) @compileError(@typeName(T) ++ " has no field '" ++ name ++ "' to animate"); + const F = @FieldType(T, name); const goal: F = switch (@typeInfo(F)) { - .@"struct" => toward(@field(a, field.name), @field(target, field.name), 1), - else => @field(target, field.name), + .@"struct" => toward(@field(a, name), @field(target, name), 1), + else => @field(target, name), }; - @field(out, field.name) = lerp(@field(a, field.name), goal, t); + @field(out, name) = lerp(@field(a, name), goal, t); } return out; } |
