From 100b3be62c4deca5c8a62b00b8133ecd6697918a Mon Sep 17 00:00:00 2001
From: Eilionoir Tunnicliff <me@crystall1ne.dev>
Date: Thu, 16 Mar 2023 20:11:29 -0400
Subject: [PATCH] WIP Haptic feedback for buttons, taps and scrolls

Haptics in iOS require a second-generation or newer Taptic Engine (sorry iPhone 6s users). Also move gamepad configs to controlmap/gamepads (you'll see why if you open the Load menu in the custom controls vc)
---
 Natives/customcontrols/CustomControlsUtils.m |   2 +-
 Natives/main.m                               |   2 ++
 Natives/resources/Assets.car                 | Bin 9232352 -> 9232352 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Natives/customcontrols/CustomControlsUtils.m b/Natives/customcontrols/CustomControlsUtils.m
index 0154ba2e..6ef609cc 100644
--- a/Natives/customcontrols/CustomControlsUtils.m
+++ b/Natives/customcontrols/CustomControlsUtils.m
@@ -311,7 +311,7 @@ void generateAndSaveDefaultControl() {
 }
 
 void generateAndSaveDefaultControlForGamepad() {
-    NSString *gamepadPath = [NSString stringWithFormat:@"%s/controlmap/gamepad-default.json", getenv("POJAV_HOME")];
+    NSString *gamepadPath = [NSString stringWithFormat:@"%s/controlmap/gamepads/gamepad-default.json", getenv("POJAV_HOME")];
     if ([NSFileManager.defaultManager fileExistsAtPath:gamepadPath]) {
         return;
     }
diff --git a/Natives/main.m b/Natives/main.m
index 6b5edbb5..cbd450cc 100644
--- a/Natives/main.m
+++ b/Natives/main.m
@@ -242,6 +242,8 @@ void init_setupCustomControls() {
     NSString *controlPath = [@(getenv("POJAV_HOME")) stringByAppendingPathComponent:@"controlmap"];
     [fm createDirectoryAtPath:controlPath withIntermediateDirectories:NO attributes:nil error:nil];
     generateAndSaveDefaultControl();
+    NSString *gamepadControlPath = [controlPath stringByAppendingPathComponent:@"gamepads"];
+    [fm createDirectoryAtPath:gamepadControlPath withIntermediateDirectories:NO attributes:nil error:nil];
     generateAndSaveDefaultControlForGamepad();
 }
 
diff --git a/Natives/resources/Assets.car b/Natives/resources/Assets.car
index 6acece54c01dad0a8d34341e8e5c347d17ee1ee2..50349590d11b405189f95df08b8d6649102a5e2c 100644
GIT binary patch
delta 651
zcmZwFOH+*j00!W%lv3yDq>J40QOFS~DxD8eA-OBJ+*PhoDECW=B4?K$Vy0$VSo8<X
z*jk<+VBsft+FLyH&b+&K=FKe3=4AN3kc<}wK~O-P*zC__n3#!0r8AjSI1xruVU$HS
zOUNOYrR0&%G72apMx5mok)W6rlu$|;<*cNFRjg(WYgtDn>j~MwMyjZ06PwvW4O>aF
zjas&|gF1FnPXoKyO(RV-vxgQ^EN<P)KK9ef0S?keI~^S2Fh}U*C|w-mI43yCDNb{S
zvvkwLInHx|i(I0Y%Ut0q*SO9NZgPu0`WfIhceu+v?(={_9`cAGhIz~ro-)EH&v?!Y
zUh<09yx}eHc+VK)d|-l)d}5L*KJ$fXzRrhH`p388q9929^`-0}h(wT>|MM$dm;ax>
J_IG+N?;k^_xcvYC

delta 651
zcmZwFOH+*j00!W%lv3yDq>J40QOFS~DxD8eA-OBJ+*PhoDECW=B4?K$Vy0$VSo8<X
z*jk<+VBsft+FLyH&b+&K=FKe3=4AN3kc`KJAc#>&!R*gun3#!0r8AjSI1xruVU$HS
zOUNOYrR0&%G72apMx5mok)W6rlu$|;<*cNFRjg(WYgtDn>j~MwMyjZ06PwvW4O>aF
zjas&|gF1FnPXoKyO(RV-vxgQ^EN<P)KK9ef0S?keI~^S2Fh}U*C|w-mI43yCDNb{S
zvvkwLInHx|i(I0Y%Ut0q*SO9NZgPu0`WfIhceu+v?(={_9`cAGhIz~ro-)EH&v?!Y
zUh<09yx}eHc+VK)d|-l)d}5L*KJ$fXzRrhH`p388L=dF@`ciffL?S4f|MM$dm;ax>
J_IG+N?;k_wxcvYC