Make it possible to adjust the maximum rumble strength

Author: LIJI32

Cocoa/GBApp.m

@@ -108,6 +108,7 @@ - (void) applicationDidFinishLaunching:(NSNotification *)notification
 
                                                               @"GBColorPalette": @1,
                                                               @"GBTurboCap": @0,
+                                                              @"GBRumbleStrength" : @1,
 
                                                               // Default themes
                                                               @"GBThemes": @{

Cocoa/GBView.m

@@ -558,6 +558,10 @@ -(void)keyUp:(NSEvent *)theEvent
 
 - (void)setRumble:(double)amp
 {
+    double strength = [[NSUserDefaults standardUserDefaults] doubleForKey:@"GBRumbleStrength"];
+    if (strength != 1) {
+        amp = pow(amp, strength) * strength;
+    }
     [lastController setRumbleAmplitude:amp];
 }
 

Cocoa/Preferences.xib

@@ -51,4 +51,5 @@ configuration_t configuration =
     .cgb_revision = GB_MODEL_CGB_E - GB_MODEL_CGB_0,
     .dmg_palette = 1, // Replacing the old default (0) as of 0.15.2
     .agb_revision = GB_MODEL_AGB_A,
+    .rumble_strength = 8,
 };

SDL/configuration.c

@@ -165,6 +165,9 @@ typedef struct {
         /* v1.0.2 */
         int8_t vsync_mode;
         uint8_t turbo_cap;
+        
+        /* v1.0.3 */
+        uint8_t rumble_strength;
     };
 } configuration_t;
 

SDL/configuration.h

@@ -15,6 +15,7 @@ extern const uint8_t font_max;
 #define ELLIPSIS_STRING "\x87"
 #define MOJIBAKE_STRING "\x88"
 #define SLIDER_STRING "\x89\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8F\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8B"
+#define TICKLESS_SLIDER_STRING "\x89\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8A\x8B"
 #define SELECTED_SLIDER_STRING "\x8C\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8D\x8E"
 #define COPYRIGHT_STRING "\x90"
 #define CHECKBOX_OFF_STRING "\x93"

SDL/font.h

@@ -2144,12 +2144,36 @@ static const char *current_hotkey(unsigned index)
     }) [configuration.hotkey_actions[index - 2]];
 }
 
+static void increase_rumble_strength(unsigned index)
+{
+    if (configuration.rumble_strength < 8) {
+        configuration.rumble_strength++;
+    }
+}
+
+static void decrease_rumble_strength(unsigned index)
+{
+    if (configuration.rumble_strength > 1) {
+        configuration.rumble_strength--;
+    }
+}
+
+const char *current_rumble_strength(unsigned index)
+{
+    static char ret[22];
+    strcpy(ret, TICKLESS_SLIDER_STRING);
+    unsigned pos = ((configuration.rumble_strength - 1) * (strlen(TICKLESS_SLIDER_STRING) - 1) + 3) / 7;
+    ret[pos] = SELECTED_SLIDER_STRING[pos];
+    return ret;
+}
+
 static const struct menu_item joypad_menu[] = {
     {"Joypad:", cycle_joypads, current_joypad_name, cycle_joypads_backwards},
     {"Configure layout", detect_joypad_layout},
     {"Hotkey 1 Action:", cycle_hotkey, current_hotkey, cycle_hotkey_backwards},
     {"Hotkey 2 Action:", cycle_hotkey, current_hotkey, cycle_hotkey_backwards},
     {"Rumble Mode:", cycle_rumble_mode, current_rumble_mode, cycle_rumble_mode_backwards},
+    {"Rumble Strength:", increase_rumble_strength, current_rumble_strength, decrease_rumble_strength},
     {"Analog Stick Behavior:", toggle_use_faux_analog_inputs, current_faux_analog_inputs, toggle_use_faux_analog_inputs},
     {"Enable Control:", toggle_allow_background_controllers, current_background_control_mode, toggle_allow_background_controllers},
     {"Back", enter_controls_menu},

SDL/gui.c

@@ -715,6 +715,10 @@ static void vblank(GB_gameboy_t *gb, GB_vblank_type_t type)
 
 static void rumble(GB_gameboy_t *gb, double amp)
 {
+    if (configuration.rumble_strength != 8) {
+        double strength = configuration.rumble_strength / 8.0;
+        amp = pow(amp, strength) * strength;
+    }
     SDL_HapticRumblePlay(haptic, amp, 250);
 }
 
@@ -1441,13 +1445,17 @@ int main(int argc, char **argv)
         configuration.cgb_revision %= GB_MODEL_CGB_E - GB_MODEL_CGB_0 + 1;
         configuration.audio_driver[15] = 0;
         configuration.dmg_palette_name[24] = 0;
-        // Fix broken defaults, should keys 12-31 should be unmapped by default
+        // Fix broken defaults, keys 12-31 should be unmapped by default
         if (configuration.joypad_configuration[31] == 0) {
             memset(configuration.joypad_configuration + 12 , -1, 32 - 12);
         }
         if ((configuration.agb_revision & ~GB_MODEL_GBP_BIT) != GB_MODEL_AGB_A) {
             configuration.agb_revision = GB_MODEL_AGB_A;
         }
+        
+        if (configuration.rumble_strength > 8 || configuration.rumble_strength == 0) {
+            configuration.rumble_strength = 8;
+        }
     }
 
     if (configuration.model >= MODEL_MAX) {

SDL/main.c

@@ -369,6 +369,12 @@ + (UIImage *)settingsImageNamed:(NSString *)name
                 @{@"type": typeRadio, @"pref": @"GBRumbleMode", @"title": @"Always",                       @"value": @(GB_RUMBLE_ALL_GAMES),},
             ],
         },
+        @{
+            @"header": @"Rumble Strength",
+            @"items": @[
+                @{@"type": typeSlider, @"pref": @"GBRumbleStrength", @"min": @0.125, @"max": @1, @"minImage": @"waveform.weak", @"maxImage": @"waveform"}
+            ],
+        },
         @{
             @"items": @[
                 @{@"type": typeCheck, @"pref": @"GBControllersHideInterface", @"title": @"Hide UI While Using a Controller"},

iOS/GBSettingsViewController.m

@@ -225,6 +225,10 @@ static uint8_t cameraGetPixel(GB_gameboy_t *gb, uint8_t x, uint8_t y)
 static void rumbleCallback(GB_gameboy_t *gb, double amp)
 {
     GBViewController *self = (__bridge GBViewController *)GB_get_user_data(gb);
+    double strength = [[NSUserDefaults standardUserDefaults] doubleForKey:@"GBRumbleStrength"];
+    if (strength != 1) {
+        amp = pow(amp, strength) * strength;
+    }
     [self rumbleChanged:amp];
 }