RGBCube/DOOM-fire-zig
1
Fork 0
mirror of https://github.com/RGBCube/DOOM-fire-zig synced 2025-07-28 01:27:44 +00:00
Code Issues Activity Actions

Merge pull request #4 from zhangkaizhao/zig-0.11.0

Browse source 
Update to zig 0.11.0
This commit is contained in:
const void* 2023-09-22 05:25:23 -04:00 • committed by GitHub
commit fa035dc29d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
build.zig
View file

@ -9,16 +9,19 @@ pub fn build(b: *std.build.Builder) void {
// Standard release options allow the person running `zig build` to select // Standard release options allow the person running `zig build` to select
// between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall.
const mode = b.standardReleaseOptions(); const optimize = b.standardOptimizeOption(.{});
const exe = b.addExecutable("DOOM-fire", "src/main.zig"); const exe = b.addExecutable(.{
.name = "DOOM-fire",
.root_source_file = .{ .path = "src/main.zig" },
.target = target,
.optimize = optimize,
});
exe.linkLibC(); exe.linkLibC();
exe.setTarget(target); b.installArtifact(exe);
exe.setBuildMode(mode);
exe.install();
const run_cmd = exe.run(); const run_cmd = b.addRunArtifact(exe);
run_cmd.step.dependOn(b.getInstallStep()); run_cmd.step.dependOn(b.getInstallStep());
if (b.args) |args| { if (b.args) |args| {
run_cmd.addArgs(args); run_cmd.addArgs(args);
@ -27,9 +30,12 @@ pub fn build(b: *std.build.Builder) void {
const run_step = b.step("run", "Run the app"); const run_step = b.step("run", "Run the app");
run_step.dependOn(&run_cmd.step); run_step.dependOn(&run_cmd.step);
const exe_tests = b.addTest("src/main.zig"); const exe_tests = b.addTest(.{
exe_tests.setTarget(target); .name = "exe_tests",
exe_tests.setBuildMode(mode); .root_source_file = .{ .path = "src/main.zig" },
.target = target,
.optimize = optimize,
});
const test_step = b.step("test", "Run unit tests"); const test_step = b.step("test", "Run unit tests");
test_step.dependOn(&exe_tests.step); test_step.dependOn(&exe_tests.step);

10
src/main.zig
View file

@ -147,7 +147,7 @@ pub fn initColor() void {
//get terminal size given a tty //get terminal size given a tty
pub fn getTermSz(tty: std.os.fd_t) !TermSz { pub fn getTermSz(tty: std.os.fd_t) !TermSz {
var winsz = c.winsize{ .ws_col = 0, .ws_row = 0, .ws_xpixel = 0, .ws_ypixel = 0 }; var winsz = c.winsize{ .ws_col = 0, .ws_row = 0, .ws_xpixel = 0, .ws_ypixel = 0 };
const rv = std.os.system.ioctl(tty, TIOCGWINSZ, @ptrToInt(&winsz)); const rv = std.os.system.ioctl(tty, TIOCGWINSZ, @intFromPtr(&winsz));
const err = std.os.errno(rv); const err = std.os.errno(rv);
if (rv == 0) { if (rv == 0) {
return TermSz{ .height = winsz.ws_row, .width = winsz.ws_col }; return TermSz{ .height = winsz.ws_row, .width = winsz.ws_col };
@ -502,8 +502,8 @@ pub fn paintBuf() void {
bs_sz_avg = bs_sz_avg * (bs_frame_tic - 1) / bs_frame_tic + bs_len / bs_frame_tic; bs_sz_avg = bs_sz_avg * (bs_frame_tic - 1) / bs_frame_tic + bs_len / bs_frame_tic;
} }
t_dur = @intToFloat(f64, t_now - t_start) / 1000.0; t_dur = @as(f64, @floatFromInt(t_now - t_start)) / 1000.0;
fps = @intToFloat(f64, bs_frame_tic) / t_dur; fps = @as(f64, @floatFromInt(bs_frame_tic)) / t_dur;
emit(fg[0]); emit(fg[0]);
emitFmt("mem: {s:.2} min / {s:.2} avg / {s:.2} max [ {d:.2} fps ]", .{ std.fmt.fmtIntSizeBin(bs_sz_min), std.fmt.fmtIntSizeBin(bs_sz_avg), std.fmt.fmtIntSizeBin(bs_sz_max), fps }); emitFmt("mem: {s:.2} min / {s:.2} avg / {s:.2} max [ {d:.2} fps ]", .{ std.fmt.fmtIntSizeBin(bs_sz_min), std.fmt.fmtIntSizeBin(bs_sz_avg), std.fmt.fmtIntSizeBin(bs_sz_max), fps });
@ -516,8 +516,8 @@ pub fn freeBuf() void {
pub fn showDoomFire() void { pub fn showDoomFire() void {
//term size => fire size //term size => fire size
const FIRE_H: u16 = @intCast(u16, term_sz.height) * 2; const FIRE_H: u16 = @as(u16, @intCast(term_sz.height)) * 2;
const FIRE_W: u16 = @intCast(u16, term_sz.width); const FIRE_W: u16 = @as(u16, @intCast(term_sz.width));
const FIRE_SZ: u16 = FIRE_H * FIRE_W; const FIRE_SZ: u16 = FIRE_H * FIRE_W;
const FIRE_LAST_ROW: u16 = (FIRE_H - 1) * FIRE_W; const FIRE_LAST_ROW: u16 = (FIRE_H - 1) * FIRE_W;