From 55e7c955c14bd7f9321a90148c5bcf61dbc351a2 Mon Sep 17 00:00:00 2001 From: peterino2 Date: Sun, 2 Nov 2025 00:55:21 -0700 Subject: [PATCH] saving --- build/generateApi.zig | 4 ++-- engine/backlog.zig | 2 +- engine/core/src/args.zig | 2 +- engine/core/src/stacks.zig | 2 +- engine/physics/src/physicsSystem.zig | 2 +- engine/ui/src/sgpu/papyrusSgpu.zig | 2 +- lib/p2/src/structures/perf-tests.zig | 2 +- lib/sdl3/src/samples/hello-triangle.zig | 2 +- lib/sdl3/src/samples/hello-window.zig | 2 +- lib/spng/test.zig | 2 +- projects/headless/main.zig | 2 +- projects/sampleGame/externGame/externGame.zig | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/build/generateApi.zig b/build/generateApi.zig index c43a4da..d01c8c8 100644 --- a/build/generateApi.zig +++ b/build/generateApi.zig @@ -90,7 +90,7 @@ pub fn main() !void { \\ pub fn startEngine(vtable: *core.EngineObjectVTable, spec: *core.SpecVariantMap) bool { \\ const args = getArgs() catch return false; \\ - \\ var backingAllocator: std.mem.Allocator = std.heap.c_allocator; + \\ var backingAllocator: std.mem.Allocator = std.heap.smp_allocator; \\ var gpa: std.heap.GeneralPurposeAllocator(.{ \\ .stack_trace_frames = 20, \\ }) = .{}; @@ -162,7 +162,7 @@ pub fn main() !void { try writer.print(allocator, ".{s} = true,\n", .{mod}); } - try writer.print(allocator, "}}, std.heap.c_allocator); }}\n", .{}); + try writer.print(allocator, "}}, std.heap.smp_allocator); }}\n", .{}); try writer.print(allocator, "const std = @import(\"std\");\n\n", .{}); diff --git a/engine/backlog.zig b/engine/backlog.zig index 2298c6e..334cdc9 100644 --- a/engine/backlog.zig +++ b/engine/backlog.zig @@ -156,7 +156,7 @@ pub const createSpecVariant = core.createSpecVariant; pub export fn initAndRun(vtable: *core.EngineObjectVTable, spec: *core.SpecVariantMap) bool { const args = getArgs() catch return false; - var backingAllocator: std.mem.Allocator = std.heap.c_allocator; + var backingAllocator: std.mem.Allocator = std.heap.smp_allocator; var gpa: std.heap.GeneralPurposeAllocator(.{ .stack_trace_frames = 20, }) = .{}; diff --git a/engine/core/src/args.zig b/engine/core/src/args.zig index 958a19d..e44c783 100644 --- a/engine/core/src/args.zig +++ b/engine/core/src/args.zig @@ -4,7 +4,7 @@ const std = @import("std"); pub fn ParseArgs(comptime T: type) !T { // I think i am actually totally cool with leaking this one and leaving it around... just dont spam call this function - var iter = try std.process.argsWithAllocator(std.heap.c_allocator); + var iter = try std.process.argsWithAllocator(std.heap.smp_allocator); var args: T = .{}; const shortBuf: [32]u8 = undefined; diff --git a/engine/core/src/stacks.zig b/engine/core/src/stacks.zig index d84c4a1..9561e63 100644 --- a/engine/core/src/stacks.zig +++ b/engine/core/src/stacks.zig @@ -141,7 +141,7 @@ pub const StackCompactor = struct { var stackCompactor: *core.StackCompactor = undefined; pub fn initStackCompactor() void { - stackCompactor = core.StackCompactor.create(std.heap.c_allocator) catch unreachable; + stackCompactor = core.StackCompactor.create(std.heap.smp_allocator) catch unreachable; } pub inline fn pushCallStack() void { diff --git a/engine/physics/src/physicsSystem.zig b/engine/physics/src/physicsSystem.zig index 56e11b9..4e10003 100644 --- a/engine/physics/src/physicsSystem.zig +++ b/engine/physics/src/physicsSystem.zig @@ -141,7 +141,7 @@ pub const PhysicsRuntime = struct { pub fn init(allocator: std.mem.Allocator) !*@This() { const self = try allocator.create(@This()); - try zphysics.init(std.heap.c_allocator, .{}); + try zphysics.init(std.heap.smp_allocator, .{}); //try zphysics.init(allocator, .{}); self.* = .{ diff --git a/engine/ui/src/sgpu/papyrusSgpu.zig b/engine/ui/src/sgpu/papyrusSgpu.zig index 0089e7d..05be84e 100644 --- a/engine/ui/src/sgpu/papyrusSgpu.zig +++ b/engine/ui/src/sgpu/papyrusSgpu.zig @@ -218,7 +218,7 @@ pub fn tick(self: *@This(), dt: f64) void { while (offset < count) { var next = self.debugTextQueue.popFromUnlocked().?; - next.duration -= fdt; + next.duration -= @min(fdt, 0.3); if (next.duration >= 0) { self.debugTextQueue.queue.push(next) catch {}; diff --git a/lib/p2/src/structures/perf-tests.zig b/lib/p2/src/structures/perf-tests.zig index 8d7dfcc..50dc91d 100644 --- a/lib/p2/src/structures/perf-tests.zig +++ b/lib/p2/src/structures/perf-tests.zig @@ -164,7 +164,7 @@ pub fn count(comptime n: anytype) [n]u0 { test "Perf test sparse vs hashmap" { // this test does NOT care about freeing memory, just gonna let the arena hit it. - var arena = std.heap.ArenaAllocator.init(std.heap.c_allocator); + var arena = std.heap.ArenaAllocator.init(std.heap.smp_allocator); defer arena.deinit(); const arenaAlloc = arena.allocator(); diff --git a/lib/sdl3/src/samples/hello-triangle.zig b/lib/sdl3/src/samples/hello-triangle.zig index cc10df3..e13338f 100644 --- a/lib/sdl3/src/samples/hello-triangle.zig +++ b/lib/sdl3/src/samples/hello-triangle.zig @@ -235,7 +235,7 @@ pub fn destroy(self: *@This()) void { pub fn main() !void { print("hello world... n", .{}); - const app = try create(std.heap.c_allocator); + const app = try create(std.heap.smp_allocator); try app.loop(); defer app.destroy(); } diff --git a/lib/sdl3/src/samples/hello-window.zig b/lib/sdl3/src/samples/hello-window.zig index f0b3c1d..6238374 100644 --- a/lib/sdl3/src/samples/hello-window.zig +++ b/lib/sdl3/src/samples/hello-window.zig @@ -93,7 +93,7 @@ pub fn destroy(self: *@This()) void { pub fn main() !void { std.debug.print("lmao?\n", .{}); print("hello world... n", .{}); - const app = try create(std.heap.c_allocator); + const app = try create(std.heap.smp_allocator); try app.loop(); defer app.destroy(); } diff --git a/lib/spng/test.zig b/lib/spng/test.zig index 367500b..ba5ed95 100644 --- a/lib/spng/test.zig +++ b/lib/spng/test.zig @@ -23,7 +23,7 @@ pub fn main() !void { try stdout.print("Run `zig build test` to run the tests.\n", .{}); try bw.flush(); // don't forget to flush! - var allocator = std.heap.c_allocator; + var allocator = std.heap.smp_allocator; const pngBuffer = try allocator.alloc(u8, 1000 * 1000 * 100); defer allocator.free(pngBuffer); diff --git a/projects/headless/main.zig b/projects/headless/main.zig index 184462d..a8ff443 100644 --- a/projects/headless/main.zig +++ b/projects/headless/main.zig @@ -157,7 +157,7 @@ pub fn testThing(self: *@This()) !void { core.setBarrierCount(workerCount); for (0..workerCount) |i| { - const name = try std.fmt.allocPrintSentinel(std.heap.c_allocator, "MultiJob{d}", .{i}, 0); + const name = try std.fmt.allocPrintSentinel(std.heap.smp_allocator, "MultiJob{d}", .{i}, 0); _ = name; // try core.dispatchJob(MultiJob{ .threadName = name, .threadId = @intCast(i), .threadCount = workerCount }); } diff --git a/projects/sampleGame/externGame/externGame.zig b/projects/sampleGame/externGame/externGame.zig index 7ae45ae..7b10160 100644 --- a/projects/sampleGame/externGame/externGame.zig +++ b/projects/sampleGame/externGame/externGame.zig @@ -33,7 +33,7 @@ pub fn start_module(args: core.ModuleLoaderArgs) !void { core.PatchOrCreateObject(imgui.utils.ConsoleWindow, .{}); core.PatchOrCreateObject(@import("fpgame/fpgame.zig"), .{}); - core.engine_log("hmm", .{}); + core.engine_log("this change definitely happened :^) ", .{}); _ = args; core.logDisplay("externGame", "accessing old object at {x} same object? {d}", .{ @intFromPtr(core.EngineObject(ExternGameObject).get()), @sizeOf(ExternGameObject) });