sergeypdev/engine
1
0
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Load external textures for scenes

Browse Source
This commit is contained in:
sergeypdev 2024-02-28 17:16:44 +04:00
parent 7b15f55173
commit 8fa5c63039
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/game.zig
View File

@ -275,10 +275,10 @@ export fn game_init(global_allocator: *std.mem.Allocator) void {
} }
} }
const ryzen = globals.g_mem.world.createScene(globals.g_assetman.resolveScene(a.Scenes.amd_ryzen_9.scene)); const scene = globals.g_mem.world.createScene(globals.g_assetman.resolveScene(a.Scenes.scifi_helmet.SciFiHelmet.scene));
const ent = globals.g_mem.world.getEntity(ryzen) orelse @panic("WTF"); const ent = globals.g_mem.world.getEntity(scene) orelse @panic("WTF");
ent.data.transform.pos = Vec3.new(0, 1, 0); ent.data.transform.pos = Vec3.new(0, 1, 0);
ent.data.transform.scale = Vec3.one().scale(0.2); // ent.data.transform.scale = Vec3.one().scale(4);
} }
export fn game_update() bool { export fn game_update() bool {

36
tools/asset_compiler.zig
View File

@ -147,6 +147,7 @@ const AI_MATKEY_GLTF_PBRMETALLICROUGHNESS_METALLICROUGHNESS_TEXTURE = c.aiTextur
/// It all depends on the source asset. /// It all depends on the source asset.
fn processScene(allocator: std.mem.Allocator, input: []const u8, output_dir: std.fs.Dir, asset_list_writer: anytype) !void { fn processScene(allocator: std.mem.Allocator, input: []const u8, output_dir: std.fs.Dir, asset_list_writer: anytype) !void {
const input_z = try std.mem.concatWithSentinel(allocator, u8, &.{input}, 0); const input_z = try std.mem.concatWithSentinel(allocator, u8, &.{input}, 0);
const input_dir = std.fs.path.dirname(input) orelse "";
// const config: *c.aiPropertyStore = @as(?*c.aiPropertyStore, @ptrCast(c.aiCreatePropertyStore())) orelse return error.PropertyStore; // const config: *c.aiPropertyStore = @as(?*c.aiPropertyStore, @ptrCast(c.aiCreatePropertyStore())) orelse return error.PropertyStore;
// defer c.aiReleasePropertyStore(config); // defer c.aiReleasePropertyStore(config);
@ -206,27 +207,27 @@ fn processScene(allocator: std.mem.Allocator, input: []const u8, output_dir: std
} }
if (c.aiGetMaterialTextureCount(material, c.aiTextureType_BASE_COLOR) > 0) { if (c.aiGetMaterialTextureCount(material, c.aiTextureType_BASE_COLOR) > 0) {
const mat_texture = try getMaterialTexture(allocator, material, c.aiTextureType_BASE_COLOR, 0); const mat_texture = try getMaterialTexture(allocator, input_dir, material, c.aiTextureType_BASE_COLOR, 0);
const entry = mat_texture.path.resolveAssetListEntry(texture_outputs); const entry = mat_texture.path.resolveAssetListEntry(texture_outputs);
mat_output.albedo_map.id = entry.getAssetId(); mat_output.albedo_map.id = entry.getAssetId();
} }
_ = c.aiGetMaterialFloat(material, AI_MATKEY_METALLIC_FACTOR, 0, 0, &mat_output.metallic); _ = c.aiGetMaterialFloat(material, AI_MATKEY_METALLIC_FACTOR, 0, 0, &mat_output.metallic);
if (c.aiGetMaterialTextureCount(material, c.aiTextureType_METALNESS) > 0) { if (c.aiGetMaterialTextureCount(material, c.aiTextureType_METALNESS) > 0) {
const mat_texture = try getMaterialTexture(allocator, material, c.aiTextureType_METALNESS, 0); const mat_texture = try getMaterialTexture(allocator, input_dir, material, c.aiTextureType_METALNESS, 0);
const entry = mat_texture.path.resolveAssetListEntry(texture_outputs); const entry = mat_texture.path.resolveAssetListEntry(texture_outputs);
mat_output.metallic_map.id = entry.getAssetId(); mat_output.metallic_map.id = entry.getAssetId();
} }
_ = c.aiGetMaterialFloat(material, AI_MATKEY_ROUGHNESS_FACTOR, 0, 0, &mat_output.roughness); _ = c.aiGetMaterialFloat(material, AI_MATKEY_ROUGHNESS_FACTOR, 0, 0, &mat_output.roughness);
if (c.aiGetMaterialTextureCount(material, c.aiTextureType_DIFFUSE_ROUGHNESS) > 0) { if (c.aiGetMaterialTextureCount(material, c.aiTextureType_DIFFUSE_ROUGHNESS) > 0) {
const mat_texture = try getMaterialTexture(allocator, material, c.aiTextureType_DIFFUSE_ROUGHNESS, 0); const mat_texture = try getMaterialTexture(allocator, input_dir, material, c.aiTextureType_DIFFUSE_ROUGHNESS, 0);
const entry = mat_texture.path.resolveAssetListEntry(texture_outputs); const entry = mat_texture.path.resolveAssetListEntry(texture_outputs);
mat_output.roughness_map.id = entry.getAssetId(); mat_output.roughness_map.id = entry.getAssetId();
} }
if (c.aiGetMaterialTextureCount(material, c.aiTextureType_NORMALS) > 0) { if (c.aiGetMaterialTextureCount(material, c.aiTextureType_NORMALS) > 0) {
const mat_texture = try getMaterialTexture(allocator, material, c.aiTextureType_NORMALS, 0); const mat_texture = try getMaterialTexture(allocator, input_dir, material, c.aiTextureType_NORMALS, 0);
const entry = mat_texture.path.resolveAssetListEntry(texture_outputs); const entry = mat_texture.path.resolveAssetListEntry(texture_outputs);
switch (mat_texture.path) { switch (mat_texture.path) {
.embedded => |idx| { .embedded => |idx| {
@ -355,7 +356,7 @@ const AssimpTextureRef = union(enum) {
external: []const u8, external: []const u8,
embedded: usize, embedded: usize,
pub fn fromString(str: []const u8) !AssimpTextureRef { pub fn fromRelativePath(allocator: std.mem.Allocator, input_dir: []const u8, str: []const u8) !AssimpTextureRef {
if (str.len == 0) return error.EmptyPath; if (str.len == 0) return error.EmptyPath;
if (str[0] == '*') { if (str[0] == '*') {
@ -364,7 +365,11 @@ const AssimpTextureRef = union(enum) {
return .{ .embedded = idx }; return .{ .embedded = idx };
} }
return .{ .external = str }; const resolved_path = try std.fs.path.resolve(allocator, &.{ input_dir, str });
defer allocator.free(resolved_path);
const cwd_relative_path = try std.fs.path.relative(allocator, try std.fs.cwd().realpathAlloc(allocator, "."), resolved_path);
return .{ .external = cwd_relative_path };
} }
pub fn resolveAssetListEntry(self: AssimpTextureRef, embedded: []const TextureOutput) AssetListEntry { pub fn resolveAssetListEntry(self: AssimpTextureRef, embedded: []const TextureOutput) AssetListEntry {
@ -389,7 +394,7 @@ const MaterialTexture = struct {
map_mode: [3]c.aiTextureMapMode = .{ 0, 0, 0 }, map_mode: [3]c.aiTextureMapMode = .{ 0, 0, 0 },
flags: c_uint = 0, flags: c_uint = 0,
}; };
fn getMaterialTexture(allocator: std.mem.Allocator, material: *c.aiMaterial, _type: c.aiTextureType, index: c_uint) !MaterialTexture { fn getMaterialTexture(allocator: std.mem.Allocator, input_dir: []const u8, material: *c.aiMaterial, _type: c.aiTextureType, index: c_uint) !MaterialTexture {
var path: c.aiString = undefined; var path: c.aiString = undefined;
var result: MaterialTexture = .{}; var result: MaterialTexture = .{};
@ -406,8 +411,8 @@ fn getMaterialTexture(allocator: std.mem.Allocator, material: *c.aiMaterial, _ty
&result.flags, &result.flags,
)); ));
const path_str: []u8 = try allocator.dupe(u8, @alignCast(path.data[0..path.length])); const path_str: []u8 = @alignCast(path.data[0..path.length]);
result.path = try AssimpTextureRef.fromString(path_str); result.path = try AssimpTextureRef.fromRelativePath(allocator, input_dir, path_str);
return result; return result;
} }
@ -546,10 +551,14 @@ fn processTextureFromFile(allocator: std.mem.Allocator, input: []const u8, outpu
/// Using naming conventions /// Using naming conventions
fn guessTextureTypeFromName(name: []const u8) TextureType { fn guessTextureTypeFromName(name: []const u8) TextureType {
const sub_ext = std.fs.path.extension(std.fs.path.stem(name)); const stem = std.fs.path.stem(name);
const sub_ext = std.fs.path.extension(stem);
if (std.mem.eql(u8, sub_ext, ".norm")) { if (std.mem.eql(u8, sub_ext, ".norm")) {
return .Normal; return .Normal;
} }
if (std.mem.endsWith(u8, stem, "Normal")) {
return .Normal;
}
return .Color; return .Color;
} }
@ -705,13 +714,10 @@ fn compressBlocksAlloc(
switch (format) { switch (format) {
.bc7 => { .bc7 => {
var settings: c.bc7_enc_settings = .{}; var settings: c.bc7_enc_settings = .{};
if (original_components == 3) { if (original_components == 4) {
c.GetProfile_ultrafast(&settings);
} else if (original_components == 4) {
c.GetProfile_alpha_ultrafast(&settings); c.GetProfile_alpha_ultrafast(&settings);
} else { } else {
std.log.debug("Channel count: {}\n", .{original_components}); c.GetProfile_ultrafast(&settings);
return error.UnsupportedChannelCount;
} }
c.CompressBlocksBC7(&rgba_surf, output.ptr, &settings); c.CompressBlocksBC7(&rgba_surf, output.ptr, &settings);
}, },