fix: same key multiple uses

default/forge_project.cfg

@@ -272,6 +272,26 @@ GROUP_3_2_X=0
 GROUP_3_2_Y=16
 GROUP_3_2_Z=11089
 
+# Auto-Random Ignore (ARI) prefixes
+ARI_COUNT=17
+ARI_1=GROUP_3_1_Y
+ARI_2=GROUP_3_2_Z
+ARI_3=GROUP_2_1_X_4
+ARI_4=GROUP_2_1_Y_4
+ARI_5=GROUP_2_1_Z_4
+ARI_6=GROUP_2_2_X_4
+ARI_7=GROUP_2_2_Y_4
+ARI_8=GROUP_2_2_Z_4
+ARI_9=GROUP_2_4_X_4
+ARI_10=GROUP_2_4_Y_4
+ARI_11=GROUP_2_4_Z_4
+ARI_12=GROUP_2_6_X_4
+ARI_13=GROUP_2_6_Y_4
+ARI_14=GROUP_2_6_Z_4
+ARI_15=GROUP_2_7_X_4
+ARI_16=GROUP_2_7_Y_4
+ARI_17=GROUP_2_7_Z_4
+
 # =====
 # OTHER
 # =====

default/frag8.glsl

@@ -16,15 +16,11 @@ uniform sampler2D iTex0;
 uniform int iSeed8;
 uniform vec3 iGroup2_3[7];
 uniform vec3 iGroup3_1[2];
-uniform int iDemo;
-uniform int iAutoRand;
 
 void main() {
     vec4 color = fx_stage(vUV, iTex9, iTex0, iSeed8, iGroup2_3[0], iGroup2_3[1].xy, iGroup2_3[2], iGroup2_3[3].xy, iGroup2_3[4], iGroup2_3[5].xy, iGroup2_3[6]);
 
-    if (iDemo < 1 && iAutoRand < 1) {
-        color = mix(color, vec4(0), iGroup3_1[0].y);
-    }
+    color = mix(color, vec4(0), iGroup3_1[0].y);
 
     fragColor = color;
 }

default/frag9.glsl

@@ -9,21 +9,20 @@ out vec4 fragColor;
 #include inc_map.glsl
 
 uniform sampler2D iTex0;
-uniform int iAutoRand;
 uniform vec3 iGroup2_4[7];
 
 void main() {
-    bool visible = iAutoRand < 1 && iGroup2_4[0].x > 0;
-    bool invert = iAutoRand < 1 && iGroup2_4[0].y > 0;
-    bool rect = iAutoRand < 1 && iGroup2_4[0].z > 0;
+    bool visible = iGroup2_4[0].x > 0;
+    bool invert = iGroup2_4[0].y > 0;
+    float rect = iGroup2_4[0].z;
 
     vec2 uv2 = vUV;
 
     if (visible) {
-        vec2 p1 = iAutoRand < 1 ? vec2(iGroup2_4[6].xy) : vec2(0);
-        vec2 p2 = iAutoRand < 1 ? vec2(iGroup2_4[1].xy) : vec2(0);
-        vec2 p3 = iAutoRand < 1 ? vec2(iGroup2_4[3].xy) : vec2(0);
-        vec2 p4 = iAutoRand < 1 ? vec2(iGroup2_4[5].xy) : vec2(0);
+        vec2 p1 = vec2(iGroup2_4[6].xy);
+        vec2 p2 = vec2(iGroup2_4[1].xy);
+        vec2 p3 = vec2(iGroup2_4[3].xy);
+        vec2 p4 = vec2(iGroup2_4[5].xy);
 
         p2.x = 1 - p2.x;
         p3.y = 1 - p3.y;
@@ -38,7 +37,7 @@ void main() {
     if (visible) {
         float mask = step(0, uv2.x) * step(-1, -uv2.x) * step(0, uv2.y) * step(-1, -uv2.y);
         color *= mix(mask, 1 - mask, invert ? 1 : 0);
-        color = mix(color, mix(color, color + mask * vec4(1), step(uv2.x, 0.01) + step(uv2.y, 0.01) + step(1 - uv2.y, 0.01) + step(1 - uv2.x, 0.01)), rect ? 1 : 0);
+        color = mix(color, color + mask * vec4(1), rect * (step(uv2.x, 0.01) + step(uv2.y, 0.01) + step(1 - uv2.y, 0.01) + step(1 - uv2.x, 0.01)));
     }
 
     fragColor = color;

src/arr.c

@@ -12,6 +12,16 @@ unsigned int arr_uint_index_of(UintArray array, unsigned int value) {
   return ARRAY_NOT_FOUND;
 }
 
+bool arr_string_match(StringArray array, const char *needle) {
+  for (unsigned int i = 0; i < array.length; i++) {
+    if (strncmp(array.values[i], needle, strlen(array.values[i])) == 0) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 unsigned int arr_uint_remap_index(UintArray offsets, unsigned int *index) {
   if (offsets.length == 0) {
     return 0;

src/arr.h

@@ -7,4 +7,6 @@ unsigned int arr_uint_index_of(UintArray array, unsigned int value);
 
 unsigned int arr_uint_remap_index(UintArray offsets, unsigned int *index);
 
+bool arr_string_match(StringArray array, const char *needle);
+
 #endif /* ARR_H */

src/state.c

@@ -98,11 +98,15 @@ static void randomize(Context *context, StateConfig state_config) {
       l = state_config.values_offsets.values[part] +
           k * state_config.group_counts.values[part] + j;
 
-      if (arr_uint_index_of(state_config.fader_codes,
-                            state_config.codes.values[i]) != ARRAY_NOT_FOUND) {
-        context->values[l][i % 3] = (float)rand_uint(MIDI_MAX + 1) / MIDI_MAX;
-      } else {
-        context->values[l][i % 3] = rand_uint(2) == 1 ? 1 : 0;
+      if (arr_uint_index_of(state_config.random_ignored, (l * 3) + (i % 3)) ==
+          ARRAY_NOT_FOUND) {
+        if (arr_uint_index_of(state_config.fader_codes,
+                              state_config.codes.values[i]) !=
+            ARRAY_NOT_FOUND) {
+          context->values[l][i % 3] = (float)rand_uint(MIDI_MAX + 1) / MIDI_MAX;
+        } else {
+          context->values[l][i % 3] = rand_uint(2) == 1 ? 1 : 0;
+        }
       }
     }
   }
@@ -271,6 +275,8 @@ void state_parse_config(StateConfig *state_config, const ConfigFile *config) {
   unsigned int offset;
   unsigned int count;
   unsigned int length;
+  unsigned int value_offset;
+  StringArray ignored_codes;
   char name[STR_LEN];
 
   length = config_file_get_int(config, "SELECT_PAGE_COUNT", 0);
@@ -312,6 +318,18 @@ void state_parse_config(StateConfig *state_config, const ConfigFile *config) {
         config_file_get_int(config, name, UNSET_MIDI_CODE);
   }
 
+  length = config_file_get_int(config, "ARI_COUNT", 0);
+  if (length > ARRAY_SIZE) {
+    length = ARRAY_SIZE;
+  }
+  ignored_codes.length = length;
+
+  for (unsigned int i = 0; i < ignored_codes.length; i++) {
+    snprintf(name, STR_LEN, "ARI_%d", i + 1);
+    strlcpy(ignored_codes.values[i],
+            config_file_get_str(config, name, "unkown"), STR_LEN);
+  }
+
   length = config_file_get_int(config, "GROUP_COUNT", 0);
   if (length > ARRAY_SIZE) {
     length = ARRAY_SIZE;
@@ -361,26 +379,60 @@ void state_parse_config(StateConfig *state_config, const ConfigFile *config) {
     length = ARRAY_SIZE;
   }
   state_config->codes.length = count * 3;
+  state_config->random_ignored.length = 0;
 
   for (unsigned int i = 0; i < state_config->group_counts.length; i++) {
     offset = state_config->group_offsets.values[i];
+    value_offset = state_config->values_offsets.values[i];
     for (unsigned int j = 0; j < state_config->group_counts.values[i]; j++) {
       if ((offset + j) * 3 < ARRAY_SIZE) {
         snprintf(name, STR_LEN, "GROUP_%d_%d_X", i + 1, j + 1);
         state_config->codes.values[(offset + j) * 3] =
             config_file_get_int(config, name, UNSET_MIDI_CODE);
+        for (unsigned int k = 0;
+             k < state_config->group_active_counts.values[i]; k++) {
+          snprintf(name, STR_LEN, "GROUP_%d_%d_X_%d", i + 1, j + 1, k + 1);
+          if (arr_string_match(ignored_codes, name)) {
+            state_config->random_ignored
+                .values[state_config->random_ignored.length++] =
+                (value_offset + k * state_config->group_counts.values[i] + j) *
+                3;
+          }
+        }
       }
 
       if ((offset + j) * 3 + 1 < ARRAY_SIZE) {
         snprintf(name, STR_LEN, "GROUP_%d_%d_Y", i + 1, j + 1);
         state_config->codes.values[(offset + j) * 3 + 1] =
             config_file_get_int(config, name, UNSET_MIDI_CODE);
+        for (unsigned int k = 0;
+             k < state_config->group_active_counts.values[i]; k++) {
+          snprintf(name, STR_LEN, "GROUP_%d_%d_Y_%d", i + 1, j + 1, k + 1);
+          if (arr_string_match(ignored_codes, name)) {
+            state_config->random_ignored
+                .values[state_config->random_ignored.length++] =
+                (value_offset + k * state_config->group_counts.values[i] + j) *
+                    3 +
+                1;
+          }
+        }
       }
 
       if ((offset + j) * 3 + 2 < ARRAY_SIZE) {
         snprintf(name, STR_LEN, "GROUP_%d_%d_Z", i + 1, j + 1);
         state_config->codes.values[(offset + j) * 3 + 2] =
             config_file_get_int(config, name, UNSET_MIDI_CODE);
+        for (unsigned int k = 0;
+             k < state_config->group_active_counts.values[i]; k++) {
+          snprintf(name, STR_LEN, "GROUP_%d_%d_Z_%d", i + 1, j + 1, k + 1);
+          if (arr_string_match(ignored_codes, name)) {
+            state_config->random_ignored
+                .values[state_config->random_ignored.length++] =
+                (value_offset + k * state_config->group_counts.values[i] + j) *
+                    3 +
+                2;
+          }
+        }
       }
     }
   }
@@ -477,6 +529,9 @@ static bool compute_event(Context *context, StateConfig state_config,
   unsigned int j;
   unsigned int k;
   unsigned int part;
+  bool found;
+
+  found = false;
 
   // PAGE CHANGE
   i = arr_uint_index_of(state_config.select_page_codes, code);
@@ -485,7 +540,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       context->page = i;
       update_page(context, state_config, midi);
     }
-    return true;
+    found = true;
   }
 
   // TARGET CHANGE
@@ -495,7 +550,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       context->selected = i;
       update_page(context, state_config, midi);
     }
-    return true;
+    found = true;
   }
 
   // ITEM CHANGE
@@ -506,7 +561,7 @@ static bool compute_event(Context *context, StateConfig state_config,
           context->page * state_config.select_item_codes.length + i;
       update_page(context, state_config, midi);
     }
-    return true;
+    found = true;
   }
 
   // ACTIVE CHANGE
@@ -518,7 +573,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       update_active(context, state_config, midi, true);
       update_values(context, state_config, midi);
     }
-    return true;
+    found = true;
   }
 
   // VALUE CHANGE
@@ -540,7 +595,7 @@ static bool compute_event(Context *context, StateConfig state_config,
         safe_midi_write(midi, code, MIDI_MAX);
       }
     }
-    return true;
+    found = true;
   }
 
   // TAP TEMPO
@@ -549,7 +604,7 @@ static bool compute_event(Context *context, StateConfig state_config,
     if (value > 0) {
       tempo_tap(&context->tempo);
     }
-    return true;
+    found = true;
   }
 
   // OTHER KEYS
@@ -559,7 +614,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       randomize(context, state_config);
       update_values(context, state_config, midi);
     }
-    return true;
+    found = true;
   }
 
   if (code == state_config.key_reset) {
@@ -568,7 +623,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       reset(context);
       update_values(context, state_config, midi);
     }
-    return true;
+    found = true;
   }
 
   if (code == state_config.key_demo) {
@@ -576,7 +631,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       log_info((context->demo ? "[%d] Demo OFF" : "[%d] Demo ON"), code);
       context->demo = !context->demo;
     }
-    return true;
+    found = true;
   }
 
   if (code == state_config.key_autorand) {
@@ -585,7 +640,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       log_info("[%d] Auto Random %s", code,
                context->auto_random ? "ON" : "OFF");
     }
-    return true;
+    found = true;
   }
 
   if (code == state_config.key_autorand_down) {
@@ -595,7 +650,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       }
       log_info("[%d] Auto Random Cycle: %d", code, context->auto_random_cycle);
     }
-    return true;
+    found = true;
   }
 
   if (code == state_config.key_autorand_up) {
@@ -603,7 +658,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       context->auto_random_cycle += 1;
       log_info("[%d] Auto Random Cycle: %d", code, context->auto_random_cycle);
     }
-    return true;
+    found = true;
   }
 
   if (code == state_config.key_tempo_up) {
@@ -611,7 +666,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       tempo_set(&context->tempo, context->tempo.tempo + 1);
       log_info("[%d] Tempo: %f", code, context->tempo);
     }
-    return true;
+    found = true;
   }
 
   if (code == state_config.key_tempo_down) {
@@ -621,7 +676,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       }
       log_info("[%d] Tempo: %f", code, context->tempo.tempo);
     }
-    return true;
+    found = true;
   }
 
   // LOAD STATE
@@ -632,7 +687,7 @@ static bool compute_event(Context *context, StateConfig state_config,
       log_info("[%d] Loading state %d", code, i + 1);
       load_from_index_file(context, state_config, i + 1);
     }
-    return true;
+    found = true;
   }
 
   // SAVE STATE
@@ -643,10 +698,10 @@ static bool compute_event(Context *context, StateConfig state_config,
       log_info("[%d] Saving state %d", code, i + 1);
       save_to_index_file(context, state_config, i + 1);
     }
-    return true;
+    found = true;
   }
 
-  return false;
+  return found;
 }
 
 void state_midi_event(Context *context, StateConfig state_config,

src/types.h

@@ -251,6 +251,7 @@ typedef struct StateConfig {
   UintArray codes;
   UintArray fader_codes;
   UintArray values_offsets;
+  UintArray random_ignored;
 
   unsigned int value_count;