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

Fix mipmap gen for normal maps

Browse Source
This commit is contained in:
sergeypdev 2024-02-19 08:18:12 +04:00
parent 8f40efc6a2
commit 1c5b0357a8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game.zig
View File

@ -182,7 +182,7 @@ export fn game_init(global_allocator: *std.mem.Allocator) void {
.handle = a.Meshes.bunny, .handle = a.Meshes.bunny,
.material = .{ .material = .{
.albedo_map = a.Textures.bunny_tex1, .albedo_map = a.Textures.bunny_tex1,
// .normal_map = a.Textures.@"tile.norm", .normal_map = a.Textures.@"tile.norm",
}, },
}, },
}); });

12
tools/asset_compiler.zig
View File

@ -230,6 +230,10 @@ fn processTexture(allocator: std.mem.Allocator, input: [*:0]const u8, output: []
const rgba_data = rgba_data_c[0 .. width * height * 4]; const rgba_data = rgba_data_c[0 .. width * height * 4];
if (comps == 4) {
premultiplyAlpha(rgba_data);
}
const data_channels: usize = if (format == .bc5) 2 else 4; const data_channels: usize = if (format == .bc5) 2 else 4;
const data = if (data_channels < 4) dropChannels(rgba_data, data_channels) else rgba_data; const data = if (data_channels < 4) dropChannels(rgba_data, data_channels) else rgba_data;
@ -239,11 +243,7 @@ fn processTexture(allocator: std.mem.Allocator, input: [*:0]const u8, output: []
return error.ImageSizeShouldBeDivisibleBy4; return error.ImageSizeShouldBeDivisibleBy4;
} }
if (comps == 4) { const mip_levels_to_gen = 1 + @as(
premultiplyAlpha(data);
}
const mip_levels_to_gen = if (data_channels == 2) 1 else 1 + @as(
u32, u32,
@intFromFloat(@log2(@as(f32, @floatFromInt(@max(width, height))))), @intFromFloat(@log2(@as(f32, @floatFromInt(@max(width, height))))),
); );
@ -430,7 +430,7 @@ fn downsampleRGImage2X(src: *const MipLevel, dst: *const MipLevel) void {
} }
} }
result /= @splat(2); result /= @splat(4);
storeColorVec2(dst.data[y * dstStride + x * 2 ..], result); storeColorVec2(dst.data[y * dstStride + x * 2 ..], result);
} }
} }