Skip to content

Refactor/create asset string #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Argmaster wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Refactor/create asset string #17

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a66cc82
Revert "Remove createAssetStringID"
Argmaster Mar 23, 2025
4e8df8b
Undo boy scout behavior
Argmaster Mar 23, 2025
952321e
Apply createAssetStringID to readAllObjFilesInAddonsHashmap
Argmaster Mar 23, 2025
1145663
Generialize ID generation
Argmaster Mar 23, 2025
fbb0861
Fix formatting issues
Argmaster Mar 23, 2025
bcbf21f
Only remove the extension
Argmaster Mar 24, 2025
f11eca7
Apply review requests
Argmaster Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/assets.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,7 @@ pub fn readAllZonFilesInAddons(
!std.ascii.startsWithIgnoreCase(entry.path, "textures") and
!std.ascii.eqlIgnoreCase(entry.basename, "_migrations.zig.zon"))
{
const fileSuffixLen = if(std.ascii.endsWithIgnoreCase(entry.basename, ".zig.zon")) ".zig.zon".len else ".zon".len;
const folderName = addonName;
const id: []u8 = externalAllocator.alloc(u8, folderName.len + 1 + entry.path.len - fileSuffixLen);
errdefer externalAllocator.free(id);
@memcpy(id[0..folderName.len], folderName);
id[folderName.len] = ':';
for(0..entry.path.len - fileSuffixLen) |i| {
if(entry.path[i] == '\\') { // Convert windows path seperators
id[folderName.len + 1 + i] = '/';
} else {
id[folderName.len + 1 + i] = entry.path[i];
}
}
const id = createAssetStringID(externalAllocator, addonName, entry.path);

const zon = main.files.Dir.init(dir).readToZon(externalAllocator, entry.path) catch |err| {
std.log.err("Could not open {s}/{s}: {s}", .{subPath, entry.path, @errorName(err)});
Expand Down Expand Up @@ -161,7 +149,30 @@ pub fn readAllZonFilesInAddons(
}
}
}
fn createAssetStringID(
externalAllocator: NeverFailingAllocator,
addonName: []const u8,
relativeFilePath: []const u8,
) []u8 {
const baseNameEndIndex = if(std.ascii.endsWithIgnoreCase(relativeFilePath, ".zig.zon")) relativeFilePath.len - ".zig.zon".len else std.mem.lastIndexOfScalar(u8, relativeFilePath, '.') orelse relativeFilePath.len;
const pathNoExtension: []const u8 = relativeFilePath[0..baseNameEndIndex];

const assetId: []u8 = externalAllocator.alloc(u8, addonName.len + 1 + pathNoExtension.len);

@memcpy(assetId[0..addonName.len], addonName);
assetId[addonName.len] = ':';

// Convert from windows to unix style separators.
for(0..pathNoExtension.len) |i| {
if(pathNoExtension[i] == '\\') {
assetId[addonName.len + 1 + i] = '/';
} else {
assetId[addonName.len + 1 + i] = pathNoExtension[i];
}
}

return assetId;
}
/// Reads obj files recursively from all subfolders.
pub fn readAllObjFilesInAddonsHashmap(
externalAllocator: NeverFailingAllocator,
Expand All @@ -187,18 +198,7 @@ pub fn readAllObjFilesInAddonsHashmap(
break :blk null;
}) |entry| {
if(entry.kind == .file and std.ascii.endsWithIgnoreCase(entry.basename, ".obj")) {
const folderName = addonName;
const id: []u8 = externalAllocator.alloc(u8, folderName.len + 1 + entry.path.len - 4);
errdefer externalAllocator.free(id);
@memcpy(id[0..folderName.len], folderName);
id[folderName.len] = ':';
for(0..entry.path.len - 4) |i| {
if(entry.path[i] == '\\') { // Convert windows path seperators
id[folderName.len + 1 + i] = '/';
} else {
id[folderName.len + 1 + i] = entry.path[i];
}
}
const id: []u8 = createAssetStringID(externalAllocator, addonName, entry.path);

const string = dir.readFileAlloc(externalAllocator.allocator, entry.path, std.math.maxInt(usize)) catch |err| {
std.log.err("Could not open {s}/{s}: {s}", .{subPath, entry.path, @errorName(err)});
Expand Down