From 219804cbe4e9d494f0152f40155115bb308002d4 Mon Sep 17 00:00:00 2001
From: KiritoDev <36680385+KiritoDv@users.noreply.github.com>
Date: Wed, 13 Jul 2022 22:12:11 -0500
Subject: Controller Configuration UI and JSON Config (#760)

* Initial controller hud ui

* Reverted fbdemo changes

* Moved config to json and implemented controller config

* fix build on linux, gitignore new config file

* fix build

* Fix compilation and file directory paths

* Call save on cvar save

* Fixed cvar loading and added deck slots to the config

* Changed control deck port 0 to use a physical device by default

* Added gyro and rumble & fixed loading errors

* Save config on toggle menubar

* fix linux build

* Fixed drift calculation

* Controller config now saves when pressing F1

* Removed ExitGame hook from ImGuiImpl

* Moved mappings to a map

* Added GetKeyName

* untranslate scancodes

* Fixed hud layout on keyboard device

* Fixed keyboard read on hud

* Fixed crash when reloading controllers

* Removed ConfigFile and changed file extension

* Changed Dummy to Disconnected and fixed filters

* Removed function leftover

* Changed ControllerHud to InputEditor

Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: David Chavez <david@dcvz.io>
---
 soh/src/code/padmgr.c         | 2 +-
 soh/src/code/z_camera.c       | 2 +-
 soh/src/code/z_fbdemo_wipe1.c | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'soh/src/code')

diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c
index d89207e6f..9bd9d53e7 100644
--- a/soh/src/code/padmgr.c
+++ b/soh/src/code/padmgr.c
@@ -269,7 +269,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
         input->press.stick_y += (s8)(input->cur.stick_y - input->prev.stick_y);
     }
 
-    controllerCallback.rumble = CVar_GetS32("gRumbleEnabled", 0) && (padMgr->rumbleEnable[0] > 0);
+    controllerCallback.rumble = (padMgr->rumbleEnable[0] > 0);
 
     if (HealthMeter_IsCritical()) {
         controllerCallback.ledColor = 0;
diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c
index 704062b1b..287edeb60 100644
--- a/soh/src/code/z_camera.c
+++ b/soh/src/code/z_camera.c
@@ -1481,7 +1481,7 @@ s32 Camera_Free(Camera* camera) {
 
     camBgChk.pos = camera->eye;
 
-    float maxRadius = 160.0f;
+    float maxRadius = 150.0f;
     if (Camera_BGCheckInfo(camera, &at, &camBgChk)) {
         VecSph collSphere;
         OLib_Vec3fDiffToVecSphGeo(&collSphere, &at, &camBgChk.pos);
diff --git a/soh/src/code/z_fbdemo_wipe1.c b/soh/src/code/z_fbdemo_wipe1.c
index 1dfb0a501..d4502f8e7 100644
--- a/soh/src/code/z_fbdemo_wipe1.c
+++ b/soh/src/code/z_fbdemo_wipe1.c
@@ -89,6 +89,7 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) {
     TransitionWipe* this = (TransitionWipe*)thisx;
     s32 pad[4];
     Gfx* tex;
+    Gfx* wipeDl = sWipeDList;
 
     modelView = this->modelView[this->frame];
 
-- 
cgit v1.2.3