all: move mach.Timer, core Timer/Frequency to mach.time module
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
parent
d62ddbb6cd
commit
133c89638b
16 changed files with 90 additions and 110 deletions
|
|
@ -2,7 +2,6 @@ const std = @import("std");
|
|||
const mach = @import("../main.zig");
|
||||
const Core = @import("../Core.zig");
|
||||
const InputState = @import("InputState.zig");
|
||||
const Frequency = @import("Frequency.zig");
|
||||
const unicode = @import("unicode.zig");
|
||||
const detectBackendType = @import("common.zig").detectBackendType;
|
||||
const gpu = mach.gpu;
|
||||
|
|
|
|||
|
|
@ -1,65 +0,0 @@
|
|||
const std = @import("std");
|
||||
const Timer = @import("Timer.zig");
|
||||
|
||||
pub const Frequency = @This();
|
||||
|
||||
/// The target frequency (e.g. 60hz) or zero for unlimited
|
||||
target: u32 = 0,
|
||||
|
||||
/// The estimated delay that is needed to achieve the target frequency. Updated during tick()
|
||||
delay_ns: u64 = 0,
|
||||
|
||||
/// The actual measured frequency. This is updated every second.
|
||||
rate: u32 = 0,
|
||||
|
||||
delta_time: ?*f32 = null,
|
||||
delta_time_ns: *u64 = undefined,
|
||||
|
||||
/// Internal fields, this must be initialized via a call to start().
|
||||
internal: struct {
|
||||
// The frame number in this second's cycle. e.g. zero to 59
|
||||
count: u32,
|
||||
timer: Timer,
|
||||
last_time: u64,
|
||||
} = undefined,
|
||||
|
||||
/// Starts the timer used for frequency calculation. Must be called once before anything else.
|
||||
pub fn start(f: *Frequency) !void {
|
||||
f.internal = .{
|
||||
.count = 0,
|
||||
.timer = try Timer.start(),
|
||||
.last_time = 0,
|
||||
};
|
||||
}
|
||||
|
||||
/// Tick should be called at each occurrence (e.g. frame)
|
||||
pub inline fn tick(f: *Frequency) void {
|
||||
var current_time = f.internal.timer.readPrecise();
|
||||
|
||||
if (f.delta_time) |delta_time| {
|
||||
f.delta_time_ns.* = current_time -| f.internal.last_time;
|
||||
delta_time.* = @as(f32, @floatFromInt(f.delta_time_ns.*)) / @as(f32, @floatFromInt(std.time.ns_per_s));
|
||||
}
|
||||
|
||||
if (current_time >= std.time.ns_per_s) {
|
||||
f.rate = f.internal.count;
|
||||
f.internal.count = 0;
|
||||
f.internal.timer.reset();
|
||||
current_time -= std.time.ns_per_s;
|
||||
}
|
||||
f.internal.last_time = current_time;
|
||||
f.internal.count += 1;
|
||||
|
||||
if (f.target != 0) {
|
||||
const limited_count = @min(f.target, f.internal.count);
|
||||
const target_time_per_tick: u64 = (std.time.ns_per_s / f.target);
|
||||
const target_time = target_time_per_tick * limited_count;
|
||||
if (current_time > target_time) {
|
||||
f.delay_ns = 0;
|
||||
} else {
|
||||
f.delay_ns = target_time - current_time;
|
||||
}
|
||||
} else {
|
||||
f.delay_ns = 0;
|
||||
}
|
||||
}
|
||||
|
|
@ -5,7 +5,6 @@ const std = @import("std");
|
|||
const mach = @import("../main.zig");
|
||||
const Core = @import("../Core.zig");
|
||||
const InputState = @import("InputState.zig");
|
||||
const Frequency = @import("Frequency.zig");
|
||||
const unicode = @import("unicode.zig");
|
||||
const detectBackendType = @import("common.zig").detectBackendType;
|
||||
const gpu = mach.gpu;
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
const std = @import("std");
|
||||
const builtin = @import("builtin");
|
||||
const PlatformTimer = if (builtin.cpu.arch == .wasm32) @panic("TODO: support WASM") else NativeTimer;
|
||||
|
||||
const Timer = @This();
|
||||
|
||||
platform: PlatformTimer,
|
||||
|
||||
/// Initialize the timer.
|
||||
pub fn start() !Timer {
|
||||
return .{ .platform = try PlatformTimer.start() };
|
||||
}
|
||||
|
||||
/// Reads the timer value since start or the last reset in nanoseconds.
|
||||
pub inline fn readPrecise(timer: *Timer) u64 {
|
||||
return timer.platform.read();
|
||||
}
|
||||
|
||||
/// Reads the timer value since start or the last reset in seconds.
|
||||
pub inline fn read(timer: *Timer) f32 {
|
||||
return @as(f32, @floatFromInt(timer.readPrecise())) / @as(f32, @floatFromInt(std.time.ns_per_s));
|
||||
}
|
||||
|
||||
/// Resets the timer value to 0/now.
|
||||
pub inline fn reset(timer: *Timer) void {
|
||||
timer.platform.reset();
|
||||
}
|
||||
|
||||
/// Returns the current value of the timer in nanoseconds, then resets it.
|
||||
pub inline fn lapPrecise(timer: *Timer) u64 {
|
||||
return timer.platform.lap();
|
||||
}
|
||||
|
||||
/// Returns the current value of the timer in seconds, then resets it.
|
||||
pub inline fn lap(timer: *Timer) f32 {
|
||||
return @as(f32, @floatFromInt(timer.lapPrecise())) / @as(f32, @floatFromInt(std.time.ns_per_s));
|
||||
}
|
||||
|
||||
const NativeTimer = struct {
|
||||
timer: std.time.Timer,
|
||||
|
||||
pub fn start() !NativeTimer {
|
||||
return .{ .timer = try std.time.Timer.start() };
|
||||
}
|
||||
|
||||
pub inline fn read(timer: *NativeTimer) u64 {
|
||||
return timer.timer.read();
|
||||
}
|
||||
|
||||
pub inline fn reset(timer: *NativeTimer) void {
|
||||
timer.timer.reset();
|
||||
}
|
||||
|
||||
pub inline fn lap(timer: *NativeTimer) u64 {
|
||||
return timer.timer.lap();
|
||||
}
|
||||
};
|
||||
|
|
@ -3,7 +3,6 @@ const w = @import("win32/win32.zig");
|
|||
const mach = @import("../main.zig");
|
||||
const Core = @import("../Core.zig");
|
||||
const InputState = @import("InputState.zig");
|
||||
const Frequency = @import("Frequency.zig");
|
||||
const unicode = @import("unicode.zig");
|
||||
|
||||
const gpu = mach.gpu;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue