klemek/forge-steel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

refactor(state): rename src_xxx -> midi_xxx

Browse Source
This commit is contained in:
klemek
2025-11-01 18:41:52 +01:00
parent 85c919b60b
commit 4faf4cab30
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shaders.c
+6 -6
View File
@@ -328,10 +328,10 @@ static void init_single_program(ShaderProgram *program, unsigned int i,
if (program->midi_lengths.length == 0) { if (program->midi_lengths.length == 0) {
index1 = 0; index1 = 0;
for (j = 0; j < state_config.src_active_counts.length; j++) { for (j = 0; j < state_config.midi_active_counts.length; j++) {
for (k = 0; k < state_config.src_active_counts.values[j]; k++) { for (k = 0; k < state_config.midi_active_counts.values[j]; k++) {
program->midi_lengths.values[index1++] = program->midi_lengths.values[index1++] =
state_config.src_counts.values[j]; state_config.midi_counts.values[j];
} }
} }
program->midi_lengths.length = index1; program->midi_lengths.length = index1;
@@ -339,8 +339,8 @@ static void init_single_program(ShaderProgram *program, unsigned int i,
prefix = config_file_get_str(config, "UNIFORM_MIDI_PREFIX", "iMidi"); prefix = config_file_get_str(config, "UNIFORM_MIDI_PREFIX", "iMidi");
index2 = 0; index2 = 0;
for (j = 0; j < state_config.src_active_counts.length; j++) { for (j = 0; j < state_config.midi_active_counts.length; j++) {
for (k = 0; k < state_config.src_active_counts.values[j]; k++) { for (k = 0; k < state_config.midi_active_counts.values[j]; k++) {
sprintf(name, "%s%d_%d", prefix, j + 1, k + 1); sprintf(name, "%s%d_%d", prefix, j + 1, k + 1);
program->imidi_locations[i * program->midi_lengths.length + index2++] = program->imidi_locations[i * program->midi_lengths.length + index2++] =
glGetUniformLocation(program->programs[i], name); glGetUniformLocation(program->programs[i], name);
@@ -389,7 +389,7 @@ ShaderProgram shaders_init(FileArray fragment_shaders, ConfigFile config,
program.sub_type_count = config_file_get_int(config, "SUB_TYPE_COUNT", 0); program.sub_type_count = config_file_get_int(config, "SUB_TYPE_COUNT", 0);
program.in_count = config_file_get_int(config, "IN_COUNT", 0); program.in_count = config_file_get_int(config, "IN_COUNT", 0);
program.sub_variant_count = state_config.state_max; program.sub_variant_count = state_config.state_max;
program.active_count = state_config.src_active_counts.length; program.active_count = state_config.midi_active_counts.length;
program.midi_lengths.length = 0; program.midi_lengths.length = 0;
if (program.frag_count > MAX_FRAG) { if (program.frag_count > MAX_FRAG) {
src/state.c
+38 -37
View File
@@ -45,58 +45,59 @@ StateConfig state_parse_config(ConfigFile config) {
config_file_get_int(config, name, UNSET_MIDI_CODE); config_file_get_int(config, name, UNSET_MIDI_CODE);
} }
state_config.src_active_counts.length = state_config.src_counts.length = state_config.midi_active_counts.length = state_config.midi_counts.length =
state_config.src_active_offsets.length = state_config.src_offsets.length = state_config.midi_active_offsets.length =
state_config.midi_offsets.length =
state_config.values_offsets.length = state_config.values_offsets.length =
config_file_get_int(config, "MIDI_COUNT", 0); config_file_get_int(config, "MIDI_COUNT", 0);
total = 0; total = 0;
for (i = 0; i < state_config.src_active_counts.length; i++) { for (i = 0; i < state_config.midi_active_counts.length; i++) {
sprintf(name, "MIDI_%d_ACTIVE_COUNT", i + 1); sprintf(name, "MIDI_%d_ACTIVE_COUNT", i + 1);
state_config.src_active_counts.values[i] = state_config.midi_active_counts.values[i] =
config_file_get_int(config, name, 1); config_file_get_int(config, name, 1);
state_config.src_active_offsets.values[i] = total; state_config.midi_active_offsets.values[i] = total;
total += state_config.src_active_counts.values[i]; total += state_config.midi_active_counts.values[i];
} }
state_config.src_active_codes.length = total; state_config.midi_active_codes.length = total;
for (i = 0; i < state_config.src_active_counts.length; i++) { for (i = 0; i < state_config.midi_active_counts.length; i++) {
for (j = 0; j < state_config.src_active_counts.values[i]; j++) { for (j = 0; j < state_config.midi_active_counts.values[i]; j++) {
sprintf(name, "MIDI_%d_ACTIVE_%d", i + 1, j + 1); sprintf(name, "MIDI_%d_ACTIVE_%d", i + 1, j + 1);
state_config.src_active_codes state_config.midi_active_codes
.values[state_config.src_active_offsets.values[i] + j] = .values[state_config.midi_active_offsets.values[i] + j] =
config_file_get_int(config, name, UNSET_MIDI_CODE); config_file_get_int(config, name, UNSET_MIDI_CODE);
} }
} }
total = 0; total = 0;
offset = 0; offset = 0;
for (i = 0; i < state_config.src_counts.length; i++) { for (i = 0; i < state_config.midi_counts.length; i++) {
sprintf(name, "MIDI_%d_COUNT", i + 1); sprintf(name, "MIDI_%d_COUNT", i + 1);
state_config.src_counts.values[i] = config_file_get_int(config, name, 0); state_config.midi_counts.values[i] = config_file_get_int(config, name, 0);
state_config.src_offsets.values[i] = total; state_config.midi_offsets.values[i] = total;
state_config.values_offsets.values[i] = offset; state_config.values_offsets.values[i] = offset;
offset += state_config.src_counts.values[i] * offset += state_config.midi_counts.values[i] *
state_config.src_active_counts.values[i]; state_config.midi_active_counts.values[i];
total += state_config.src_counts.values[i]; total += state_config.midi_counts.values[i];
} }
state_config.src_codes.length = total * 3; state_config.midi_codes.length = total * 3;
for (i = 0; i < state_config.src_counts.length; i++) { for (i = 0; i < state_config.midi_counts.length; i++) {
offset = state_config.src_offsets.values[i]; offset = state_config.midi_offsets.values[i];
for (j = 0; j < state_config.src_counts.values[i]; j++) { for (j = 0; j < state_config.midi_counts.values[i]; j++) {
sprintf(name, "MIDI_%d_%d_X", i + 1, j + 1); sprintf(name, "MIDI_%d_%d_X", i + 1, j + 1);
state_config.src_codes.values[(offset + j) * 3] = state_config.midi_codes.values[(offset + j) * 3] =
config_file_get_int(config, name, UNSET_MIDI_CODE); config_file_get_int(config, name, UNSET_MIDI_CODE);
sprintf(name, "MIDI_%d_%d_Y", i + 1, j + 1); sprintf(name, "MIDI_%d_%d_Y", i + 1, j + 1);
state_config.src_codes.values[(offset + j) * 3 + 1] = state_config.midi_codes.values[(offset + j) * 3 + 1] =
config_file_get_int(config, name, UNSET_MIDI_CODE); config_file_get_int(config, name, UNSET_MIDI_CODE);
sprintf(name, "MIDI_%d_%d_Z", i + 1, j + 1); sprintf(name, "MIDI_%d_%d_Z", i + 1, j + 1);
state_config.src_codes.values[(offset + j) * 3 + 2] = state_config.midi_codes.values[(offset + j) * 3 + 2] =
config_file_get_int(config, name, UNSET_MIDI_CODE); config_file_get_int(config, name, UNSET_MIDI_CODE);
} }
} }
@@ -155,10 +156,10 @@ static void update_active(SharedContext *context, StateConfig state_config,
MidiDevice midi) { MidiDevice midi) {
unsigned int i, j, k; unsigned int i, j, k;
for (i = 0; i < state_config.src_active_counts.length; i++) { for (i = 0; i < state_config.midi_active_counts.length; i++) {
for (j = 0; j < state_config.src_active_counts.values[i]; j++) { for (j = 0; j < state_config.midi_active_counts.values[i]; j++) {
k = state_config.src_active_offsets.values[i] + j; k = state_config.midi_active_offsets.values[i] + j;
safe_midi_write(midi, state_config.src_active_codes.values[k], safe_midi_write(midi, state_config.midi_active_codes.values[k],
context->active[i] == j ? MIDI_MAX : 0); context->active[i] == j ? MIDI_MAX : 0);
} }
} }
@@ -168,12 +169,12 @@ static void update_values(SharedContext *context, StateConfig state_config,
MidiDevice midi) { MidiDevice midi) {
unsigned int i, j, k, part; unsigned int i, j, k, part;
for (i = 0; i < state_config.src_codes.length; i++) { for (i = 0; i < state_config.midi_codes.length; i++) {
j = i / 3; j = i / 3;
part = arr_uint_remap_index(state_config.src_offsets, &j); part = arr_uint_remap_index(state_config.midi_offsets, &j);
k = state_config.values_offsets.values[part] + k = state_config.values_offsets.values[part] +
context->active[part] * state_config.src_counts.values[part] + j; context->active[part] * state_config.midi_counts.values[part] + j;
safe_midi_write(midi, state_config.src_codes.values[i], safe_midi_write(midi, state_config.midi_codes.values[i],
context->values[k][i % 3] * MIDI_MAX); context->values[k][i % 3] * MIDI_MAX);
} }
} }
@@ -218,11 +219,11 @@ void state_apply_event(SharedContext *context, StateConfig state_config,
} }
// ACTIVE CHANGE // ACTIVE CHANGE
i = arr_uint_index_of(state_config.src_active_codes, code); i = arr_uint_index_of(state_config.midi_active_codes, code);
if (i != ARRAY_NOT_FOUND) { if (i != ARRAY_NOT_FOUND) {
found = true; found = true;
if (value > 0) { if (value > 0) {
part = arr_uint_remap_index(state_config.src_active_offsets, &i); part = arr_uint_remap_index(state_config.midi_active_offsets, &i);
context->active[part] = i; context->active[part] = i;
update_active(context, state_config, midi); update_active(context, state_config, midi);
update_values(context, state_config, midi); update_values(context, state_config, midi);
@@ -230,13 +231,13 @@ void state_apply_event(SharedContext *context, StateConfig state_config,
} }
// VALUE CHANGE // VALUE CHANGE
i = arr_uint_index_of(state_config.src_codes, code); i = arr_uint_index_of(state_config.midi_codes, code);
if (i != ARRAY_NOT_FOUND) { if (i != ARRAY_NOT_FOUND) {
found = true; found = true;
j = i / 3; j = i / 3;
part = arr_uint_remap_index(state_config.src_offsets, &j); part = arr_uint_remap_index(state_config.midi_offsets, &j);
k = state_config.values_offsets.values[part] + k = state_config.values_offsets.values[part] +
context->active[part] * state_config.src_counts.values[part] + j; context->active[part] * state_config.midi_counts.values[part] + j;
if (arr_uint_index_of(state_config.fader_codes, code) != ARRAY_NOT_FOUND) { if (arr_uint_index_of(state_config.fader_codes, code) != ARRAY_NOT_FOUND) {
context->values[k][i % 3] = (float)value / MIDI_MAX; context->values[k][i % 3] = (float)value / MIDI_MAX;
src/types.h
+6 -7
View File
@@ -173,13 +173,12 @@ typedef struct StateConfig {
UintArray select_page_codes; UintArray select_page_codes;
UintArray select_item_codes; UintArray select_item_codes;
UintArray select_frag_codes; UintArray select_frag_codes;
// TODO rename input_xxx UintArray midi_active_counts;
UintArray src_active_counts; UintArray midi_active_offsets;
UintArray src_active_offsets; UintArray midi_active_codes;
UintArray src_active_codes; UintArray midi_counts;
UintArray src_counts; UintArray midi_offsets;
UintArray src_offsets; UintArray midi_codes;
UintArray src_codes;
UintArray fader_codes; UintArray fader_codes;
UintArray values_offsets; UintArray values_offsets;