diff options
-rw-r--r-- | data/joints.tsv (renamed from src/joints.tsv) | 0 | ||||
-rw-r--r-- | data/muscles.tsv (renamed from src/muscles.tsv) | 0 | ||||
-rw-r--r-- | src/misc.zig | 17 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/joints.tsv b/data/joints.tsv index 52f81ef..52f81ef 100644 --- a/src/joints.tsv +++ b/data/joints.tsv diff --git a/src/muscles.tsv b/data/muscles.tsv index 795e036..795e036 100644 --- a/src/muscles.tsv +++ b/data/muscles.tsv diff --git a/src/misc.zig b/src/misc.zig index fc428b2..2e54416 100644 --- a/src/misc.zig +++ b/src/misc.zig @@ -137,7 +137,10 @@ const Joint = extern struct { /// Load joints in character's skeleton. export fn loadJoints(joints: [*]Joint) void { - var tsv = tokenize(@embedFile("joints.tsv"), "\n"); + const file = readFile(cwd(), data_dir ++ "joints.tsv", .{}) + catch unreachable; + defer allocator.free(file); + var tsv = tokenize(file, "\n"); _ = tsv.next().?; // ignore field names var i = @as(u8, 0); while (tsv.next()) |row| : (i += 1) @@ -189,10 +192,9 @@ export fn loadModel(path: [*:0]const u8) extern struct { len: usize, }, } { - var dir = cwd().openDir(data_dir ++ "models", .{}) catch unreachable; - defer dir.close(); - const file = dir.readFileAlloc(allocator, span(path), max_size) - catch unreachable; + const file = readFile(cwd(), data_dir ++ "models{c}{s}", .{ + sep, path, + }) catch unreachable; defer allocator.free(file); var lines = OffIterator.init(file); var counts = lines.next().?; @@ -256,7 +258,10 @@ const Muscle = extern struct { /// Load muscles in character's skeleton. export fn loadMuscles(muscles: [*]Muscle) void { - var tsv = tokenize(@embedFile("muscles.tsv"), "\n"); + const file = readFile(cwd(), data_dir ++ "muscles.tsv", .{}) + catch unreachable; + defer allocator.free(file); + var tsv = tokenize(file, "\n"); _ = tsv.next().?; // ignore field names var i = @as(u8, 0); while (tsv.next()) |row| : (i += 1) |