sc support and textures

ThirteenAG · Dec 30, 2023 · 215329e · 215329e
1 parent fafc75d
commit 215329e
Show file tree

Hide file tree

Showing 53 changed files with 40 additions and 18 deletions.
diff --git a/data/update/TBoGT/common/data/frontend_menus.xml b/data/update/TBoGT/common/data/frontend_menus.xml
@@ -417,6 +417,7 @@
       <options text="Playstation 5" action="ACTION_NONE" value="5" />
       <options text="Nintendo Switch" action="ACTION_NONE" value="6" />
       <options text="Steam Deck" action="ACTION_NONE" value="7" />
+      <options text="SteamController" action="ACTION_NONE" value="8" />
     </menupc>
     <menupc enum="MENU_DISPLAY_ANTIALIASING">
       <options text="MO_OFF" action="ACTION_NONE" value="1" />
@@ -507,7 +508,7 @@
       <options action="MENUOPT_ADJUST" label="MO_SNI" value="PREF_SNIPER_CONTROL" scaler="2" displayValue="MENU_DISPLAY_SNIPER_TYPE" />
       <options action="MENUOPT_ADJUST" label="MO_SENS" value="PREF_CONTROLLER_SENSITIVITY" scaler="3" displayValue="MENU_DISPLAY_CONTROLLER_SENSITIVITY" />
       <optionspc action="MENUOPT_ADJUST" label="Centering Delay" value="PREF_EPISODIC_RACECLASS_RACE_5" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" />
-      <optionspc action="MENUOPT_ADJUST" label="Gamepad Icons" value="PREF_BUTTONS" scaler="12" displayValue="MENU_DISPLAY_BUTTONS" />
+      <optionspc action="MENUOPT_ADJUST" label="Gamepad Icons" value="PREF_BUTTONS" scaler="13" displayValue="MENU_DISPLAY_BUTTONS" />
       <optionspc action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
       <optionspc action="MENUOPT_ADJUST" label="MO_DINPUT" value="PREF_DINPUT" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />

diff --git a/data/update/TLAD/common/data/frontend_menus.xml b/data/update/TLAD/common/data/frontend_menus.xml
@@ -493,6 +493,7 @@
       <options text="Playstation 5" action="ACTION_NONE" value="5" />
       <options text="Nintendo Switch" action="ACTION_NONE" value="6" />
       <options text="Steam Deck" action="ACTION_NONE" value="7" />
+      <options text="SteamController" action="ACTION_NONE" value="8" />
     </menupc>
     <menupc enum="MENU_DISPLAY_ANTIALIASING">
       <options text="MO_OFF" action="ACTION_NONE" value="1" />
@@ -583,7 +584,7 @@
       <options action="MENUOPT_ADJUST" label="MO_SNI" value="PREF_SNIPER_CONTROL" scaler="2" displayValue="MENU_DISPLAY_SNIPER_TYPE" />
       <options action="MENUOPT_ADJUST" label="MO_SENS" value="PREF_CONTROLLER_SENSITIVITY" scaler="3" displayValue="MENU_DISPLAY_CONTROLLER_SENSITIVITY" />
       <optionspc action="MENUOPT_ADJUST" label="Centering Delay" value="PREF_EPISODIC_RACECLASS_RACE_5" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" />
-      <optionspc action="MENUOPT_ADJUST" label="Gamepad Icons" value="PREF_BUTTONS" scaler="12" displayValue="MENU_DISPLAY_BUTTONS" />
+      <optionspc action="MENUOPT_ADJUST" label="Gamepad Icons" value="PREF_BUTTONS" scaler="13" displayValue="MENU_DISPLAY_BUTTONS" />
       <optionspc action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
       <optionspc action="MENUOPT_ADJUST" label="MO_DINPUT" value="PREF_DINPUT" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
       <optionspc action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />

diff --git a/data/update/common/data/frontend_menus.xml b/data/update/common/data/frontend_menus.xml
@@ -351,6 +351,7 @@
           <options text="Playstation 5" action="ACTION_NONE" value="5" />
           <options text="Nintendo Switch" action="ACTION_NONE" value="6" />
           <options text="Steam Deck" action="ACTION_NONE" value="7" />
+          <options text="SteamController" action="ACTION_NONE" value="8" />
         </menupc>
 
         <menupc enum="MENU_DISPLAY_ANTIALIASING">
@@ -450,7 +451,7 @@
             <options action="MENUOPT_ADJUST" label="MO_SNI" value="PREF_SNIPER_CONTROL" scaler="2" displayValue="MENU_DISPLAY_SNIPER_TYPE" />
             <options action="MENUOPT_ADJUST" label="MO_SENS" value="PREF_CONTROLLER_SENSITIVITY" scaler="3" displayValue="MENU_DISPLAY_CONTROLLER_SENSITIVITY" />
             <optionspc action="MENUOPT_ADJUST" label="Centering Delay" value="PREF_EPISODIC_RACECLASS_RACE_5" scaler="10" displayValue="MENU_DISPLAY_SLIDERBAR" />
-            <optionspc action="MENUOPT_ADJUST" label="Gamepad Icons" value="PREF_BUTTONS" scaler="12" displayValue="MENU_DISPLAY_BUTTONS" />
+            <optionspc action="MENUOPT_ADJUST" label="Gamepad Icons" value="PREF_BUTTONS" scaler="13" displayValue="MENU_DISPLAY_BUTTONS" />
             <optionspc action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />
             <optionspc action="MENUOPT_ADJUST" label="MO_DINPUT" value="PREF_DINPUT" scaler="2" displayValue="MENU_DISPLAY_ON_OFF" />
             <optionspc action="MENUOPT_NONE" label="" value="PREF_NULL" scaler="0" displayValue="MENU_DISPLAY_NONE" />

diff --git a/source/buttons.ixx b/source/buttons.ixx
@@ -20,6 +20,7 @@ private:
         "PS5_",
         "SWITCH_",
         "SD_",
+        "SC_",
     };
 
     static inline std::vector<std::string> buttons = {
@@ -43,7 +44,7 @@ private:
         {
             prefvalue++;
 
-            if (prefvalue > FusionFixSettings.ButtonsText.eSteamDeck)
+            if (prefvalue > FusionFixSettings.ButtonsText.eSteamController)
                 prefvalue = FusionFixSettings.ButtonsText.eXbox360;
 
             prefvalueindex = prefvalue - FusionFixSettings.ButtonsText.eXbox360;

diff --git a/source/cutscenecam.ixx b/source/cutscenecam.ixx
@@ -15,7 +15,6 @@ public:
         FusionFix::onInitEvent() += []()
         {
             // By Sergeanur
-
             auto pattern = find_pattern("74 20 83 FF 03 74 1B 83", "74 24 8B 44 24 2C");
             injector::WriteMemory<uint8_t>(pattern.get_first(), 0xEB, true);
 
@@ -41,7 +40,8 @@ public:
                 bool Hookster(float a2)
                 {
 #if 1
-                    incrementalTimeStep += *fTimeStep;
+                    //idk what's going on here, but seems better than with timestep check
+                    //incrementalTimeStep += *fTimeStep;
 
                     CutsceneCamJitterWorkaround temp = *this;
 
@@ -50,8 +50,8 @@ public:
 
                     CutsceneCamJitterWorkaround temp2 = *this;
 
-                    if (incrementalTimeStep < 0.3333)
-                        return result;
+                    ///if (incrementalTimeStep < 0.3333)
+                    //    return result;
 
                     *this = temp;
 
@@ -60,14 +60,14 @@ public:
 
                     temp = *this;
 
-                    if (fabs(temp.data[8] - temp2.data[8]) > 0.05f
-                        || fabs(temp.data[9] - temp2.data[9]) > 0.05f
-                        || fabs(temp.data[10] - temp2.data[10]) > 0.05f
-                        || fabs(temp.data[16] - temp2.data[16]) > 0.5f
-                        || fabs(temp.data[17] - temp2.data[17]) > 0.5f
-                        || fabs(temp.data[18] - temp2.data[18]) > 0.5f)
+                    if (fabs(temp.data[8] - temp2.data[8]) > 0.03333f
+                        || fabs(temp.data[9] - temp2.data[9]) > 0.03333f
+                        || fabs(temp.data[10] - temp2.data[10]) > 0.03333f
+                        || fabs(temp.data[16] - temp2.data[16]) > 0.3333f
+                        || fabs(temp.data[17] - temp2.data[17]) > 0.3333f
+                        || fabs(temp.data[18] - temp2.data[18]) > 0.3333f)
                     {
-                        incrementalTimeStep = 0.0;
+                        //incrementalTimeStep = 0.0;
                         *this = temp2;
                         return result;
                     }

diff --git a/source/dllblacklist.ixx b/source/dllblacklist.ixx
@@ -22,6 +22,24 @@ std::vector<std::wstring> dlllist = {
     L"Nahimic2OSD.dll",
     L"NahimicMSIOSD.dll",
     L"nhAsusPhoebusOSD.dll", // ASUS Phoebus
+    L"MirillisActionVulkanLayer.dll",
+    L"\x56\x52\x61\x64\x69\x6F\x2E\x61\x73\x69",
+    L"\x56\x57\x65\x61\x70\x6F\x6E\x2E\x61\x73\x69",
+    L"\x49\x56\x46\x69\x78\x65\x73\x49\x6D\x70\x72\x6F\x76\x65\x6D\x65\x6E\x74\x73\x2E\x61\x73\x69",
+    L"\x49\x56\x45\x78\x74\x72\x61\x4D\x69\x73\x73\x69\x6F\x6E\x73\x2E\x61\x73\x69",
+    L"\x47\x46\x57\x4C\x50\x72\x6F\x74\x65\x63\x74\x69\x6F\x6E\x44\x69\x73\x61\x62\x6C\x65\x72\x32\x30\x31\x39\x2E\x61\x73\x69",
+    L"\x43\x68\x61\x72\x53\x77\x69\x74\x63\x68\x41\x64\x64\x6F\x6E\x2E\x61\x73\x69",
+    L"\x49\x56\x53\x69\x64\x65\x41\x63\x74\x69\x76\x69\x74\x69\x65\x73\x4D\x50\x2E\x61\x73\x69",
+    L"\x49\x56\x53\x69\x64\x65\x41\x63\x74\x69\x76\x69\x74\x69\x65\x73\x2E\x61\x73\x69",
+    L"\x5A\x4D\x65\x6E\x75\x49\x56\x2E\x61\x73\x69",
+    L"\x49\x56\x54\x77\x65\x61\x6B\x65\x72\x2E\x61\x73\x69",
+    L"\x42\x6F\x64\x79\x67\x75\x61\x72\x64\x73\x4D\x6F\x64\x2E\x61\x73\x69",
+    L"\x53\x74\x65\x61\x6D\x41\x63\x68\x69\x65\x76\x65\x6D\x65\x6E\x74\x73\x2E\x61\x73\x69",
+    L"\x57\x61\x72\x64\x72\x6F\x62\x65\x4D\x6F\x64\x2E\x61\x73\x69",
+    L"\x49\x56\x4D\x65\x6E\x75\x41\x50\x49\x2E\x61\x73\x69",
+    L"\x5A\x6F\x6C\x69\x6B\x61\x50\x61\x74\x63\x68\x2E\x61\x73\x69",
+    L"\x44\x69\x76\x69\x6E\x67\x4D\x6F\x64\x2E\x61\x73\x69",
+    L"\x47\x54\x41\x49\x56\x45\x78\x74\x72\x61\x4F\x70\x74\x69\x6F\x6E\x73\x2E\x61\x73\x69",
 };
 
 typedef void(WINAPI* LdrLoadDllFunc) (IN PWCHAR PathToFile OPTIONAL, IN PULONG Flags OPTIONAL, IN PUNICODE_STRING ModuleFileName, OUT HMODULE* ModuleHandle);

diff --git a/source/fixes.ixx b/source/fixes.ixx
@@ -322,7 +322,7 @@ public:
 
                 FusionFix::D3D9::onBeforeDrawPrimitive() += [](LPDIRECT3DDEVICE9& pDevice, D3DPRIMITIVETYPE& PrimitiveType, UINT& StartVertex, UINT& PrimitiveCount)
                 {
-                    IDirect3DVertexShader9* vShader = 0;
+                    IDirect3DVertexShader9* vShader = nullptr;
                     pDevice->GetVertexShader(&vShader);
                     if (vShader && CoronaVertexShader && vShader == CoronaVertexShader)
                     {

diff --git a/source/settings.ixx b/source/settings.ixx
@@ -372,8 +372,8 @@ public:
 
     struct
     {
-        enum eButtonsText { eOff, eLow, eMedium, eHigh, eVeryHigh, eXbox360, eXboxOne, ePlaystation3, ePlaystation4, ePlaystation5, eNintendoSwitch, eSteamDeck };
-        std::vector<const char*> data = { "Off", "Low", "Medium", "High", "Very High", "Xbox 360", "Xbox One", "Playstation 3", "Playstation 4", "Playstation 5", "Nintendo Switch", "Steam Deck" };
+        enum eButtonsText { eOff, eLow, eMedium, eHigh, eVeryHigh, eXbox360, eXboxOne, ePlaystation3, ePlaystation4, ePlaystation5, eNintendoSwitch, eSteamDeck, eSteamController };
+        std::vector<const char*> data = { "Off", "Low", "Medium", "High", "Very High", "Xbox 360", "Xbox One", "Playstation 3", "Playstation 4", "Playstation 5", "Nintendo Switch", "Steam Deck", "Steam Controller" };
     } ButtonsText;
 
     struct

diff --git a/textures/pc/textures/buttons_360.wtd/sc_a_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_a_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_b_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_b_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_back_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_back_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_controller.dds b/textures/pc/textures/buttons_360.wtd/sc_controller.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_controller_clean.dds b/textures/pc/textures/buttons_360.wtd/sc_controller_clean.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_down_arrow.dds b/textures/pc/textures/buttons_360.wtd/sc_down_arrow.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_dpad_all.dds b/textures/pc/textures/buttons_360.wtd/sc_dpad_all.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_dpad_down.dds b/textures/pc/textures/buttons_360.wtd/sc_dpad_down.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_dpad_left.dds b/textures/pc/textures/buttons_360.wtd/sc_dpad_left.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_dpad_leftright.dds b/textures/pc/textures/buttons_360.wtd/sc_dpad_leftright.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_dpad_none.dds b/textures/pc/textures/buttons_360.wtd/sc_dpad_none.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_dpad_right.dds b/textures/pc/textures/buttons_360.wtd/sc_dpad_right.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_dpad_up.dds b/textures/pc/textures/buttons_360.wtd/sc_dpad_up.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_dpad_updown.dds b/textures/pc/textures/buttons_360.wtd/sc_dpad_updown.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lb_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_lb_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_left_arrow.dds b/textures/pc/textures/buttons_360.wtd/sc_left_arrow.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lstick_all.dds b/textures/pc/textures/buttons_360.wtd/sc_lstick_all.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lstick_down.dds b/textures/pc/textures/buttons_360.wtd/sc_lstick_down.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lstick_left.dds b/textures/pc/textures/buttons_360.wtd/sc_lstick_left.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lstick_leftright.dds b/textures/pc/textures/buttons_360.wtd/sc_lstick_leftright.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lstick_none.dds b/textures/pc/textures/buttons_360.wtd/sc_lstick_none.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lstick_right.dds b/textures/pc/textures/buttons_360.wtd/sc_lstick_right.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lstick_up.dds b/textures/pc/textures/buttons_360.wtd/sc_lstick_up.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lstick_updown.dds b/textures/pc/textures/buttons_360.wtd/sc_lstick_updown.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_lt_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_lt_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rb_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_rb_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_right_arrow.dds b/textures/pc/textures/buttons_360.wtd/sc_right_arrow.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rstick_all.dds b/textures/pc/textures/buttons_360.wtd/sc_rstick_all.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rstick_down.dds b/textures/pc/textures/buttons_360.wtd/sc_rstick_down.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rstick_left.dds b/textures/pc/textures/buttons_360.wtd/sc_rstick_left.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rstick_leftright.dds b/textures/pc/textures/buttons_360.wtd/sc_rstick_leftright.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rstick_none.dds b/textures/pc/textures/buttons_360.wtd/sc_rstick_none.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rstick_right.dds b/textures/pc/textures/buttons_360.wtd/sc_rstick_right.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rstick_up.dds b/textures/pc/textures/buttons_360.wtd/sc_rstick_up.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rstick_updown.dds b/textures/pc/textures/buttons_360.wtd/sc_rstick_updown.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_rt_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_rt_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_start_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_start_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_up_arrow.dds b/textures/pc/textures/buttons_360.wtd/sc_up_arrow.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_x_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_x_butt.dds
diff --git a/textures/pc/textures/buttons_360.wtd/sc_y_butt.dds b/textures/pc/textures/buttons_360.wtd/sc_y_butt.dds
diff --git a/textures/pc/textures/dancing.wtd/sc_lb_butt.dds b/textures/pc/textures/dancing.wtd/sc_lb_butt.dds
diff --git a/textures/pc/textures/dancing.wtd/sc_lt_butt.dds b/textures/pc/textures/dancing.wtd/sc_lt_butt.dds
diff --git a/textures/pc/textures/dancing.wtd/sc_rb_butt.dds b/textures/pc/textures/dancing.wtd/sc_rb_butt.dds
diff --git a/textures/pc/textures/dancing.wtd/sc_rt_butt.dds b/textures/pc/textures/dancing.wtd/sc_rt_butt.dds
diff --git a/tools/ResourceBuilder/ResourceBuilder.exe b/tools/ResourceBuilder/ResourceBuilder.exe