zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Audio: add volume component

Browse source
This commit is contained in:
Ali Chraghi 2024-05-13 11:06:50 +03:30 • committed by Stephen Gutekanst
parent 9a059d6f8c
commit 39bf303057
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Audio.zig
View file

@ -11,6 +11,7 @@ pub const Mod = mach.Mod(@This());
pub const components = .{ pub const components = .{
.samples = .{ .type = []const f32 }, .samples = .{ .type = []const f32 },
.channels = .{ .type = u8 }, .channels = .{ .type = u8 },
.volume = .{ .type = f32 },
.playing = .{ .type = bool }, .playing = .{ .type = bool },
.index = .{ .type = usize }, .index = .{ .type = usize },
}; };
@ -146,15 +147,17 @@ fn audioTick(entities: *mach.Entities.Mod, audio: *Mod) !void {
var did_state_change = false; var did_state_change = false;
var q = try entities.query(.{ var q = try entities.query(.{
.ids = mach.Entities.Mod.read(.id),
.samples_slices = Mod.read(.samples), .samples_slices = Mod.read(.samples),
.channels = Mod.read(.channels), .channels = Mod.read(.channels),
.playings = Mod.write(.playing), .playings = Mod.write(.playing),
.indexes = Mod.write(.index), .indexes = Mod.write(.index),
}); });
while (q.next()) |v| { while (q.next()) |v| {
for (v.samples_slices, v.channels, v.playings, v.indexes) |samples, channels, *playing, *index| { for (v.ids, v.samples_slices, v.channels, v.playings, v.indexes) |id, samples, channels, *playing, *index| {
if (!playing.*) continue; if (!playing.*) continue;
const volume = audio.get(id, .volume) orelse 1.0;
const channels_diff = player_channels - channels + 1; const channels_diff = player_channels - channels + 1;
const to_read = @min(samples.len - index.*, mixing_buffer.items.len) / channels_diff; const to_read = @min(samples.len - index.*, mixing_buffer.items.len) / channels_diff;
if (channels == 1 and player_channels > 1) { if (channels == 1 and player_channels > 1) {
@ -165,7 +168,7 @@ fn audioTick(entities: *mach.Entities.Mod, audio: *Mod) !void {
i += player_channels; i += player_channels;
} }
} else { } else {
mixSamples(mixing_buffer.items[0..to_read], samples[index.*..][0..to_read]); mixSamples(mixing_buffer.items[0..to_read], samples[index.*..][0..to_read], volume);
} }
if (index.* + to_read >= samples.len) { if (index.* + to_read >= samples.len) {
@ -270,7 +273,7 @@ const vector_length = switch (builtin.mode) {
else => null, else => null,
}; };
inline fn mixSamples(a: []f32, b: []const f32) void { inline fn mixSamples(a: []f32, b: []const f32, volume: f32) void {
std.debug.assert(a.len >= b.len); std.debug.assert(a.len >= b.len);
var i: usize = 0; var i: usize = 0;
@ -282,12 +285,12 @@ inline fn mixSamples(a: []f32, b: []const f32) void {
while (i < vec_blocks_len) : (i += vec_len) { while (i < vec_blocks_len) : (i += vec_len) {
const b_vec: Vec = b[i..][0..vec_len].*; const b_vec: Vec = b[i..][0..vec_len].*;
a[i..][0..vec_len].* += b_vec; a[i..][0..vec_len].* += b_vec * @as(Vec, @splat(volume));
} }
} }
for (a[i..b.len], b[i..]) |*a_sample, b_sample| { for (a[i..b.len], b[i..]) |*a_sample, b_sample| {
a_sample.* += b_sample; a_sample.* += b_sample * volume;
} }
} }