initial GamepadUI from EZ2

This commit is contained in:
2024-04-13 19:58:55 +03:00
parent 29985681a1
commit 19ce478dd0
49 changed files with 11335 additions and 49 deletions

View File

@@ -131,6 +131,11 @@
#include "haptics/haptic_utils.h"
#include "haptics/haptic_msgs.h"
#ifdef GAMEPADUI
#include "../gamepadui/igamepadui.h"
ConVar cl_gamepadui_mainmenu_draw("cl_gamepadui_mainmenu_draw", "0", FCVAR_DEVELOPMENTONLY);
#endif // GAMEPADUI
#if defined( TF_CLIENT_DLL )
#include "abuse_report.h"
#endif
@@ -217,6 +222,10 @@ IEngineClientReplay *g_pEngineClientReplay = NULL;
IReplaySystem *g_pReplay = NULL;
#endif
#if defined(GAMEPADUI)
IGamepadUI* g_pGamepadUI = nullptr;
#endif // GAMEPADUI
IHaptics* haptics = NULL;// NVNT haptics system interface singleton
//=============================================================================
@@ -1156,6 +1165,54 @@ void CHLClient::PostInit()
}
}
#endif
#ifndef PORTAL
#if defined(GAMEPADUI)
if (IsGamepadUI())
{
CSysModule* pGamepadUIModule = g_pFullFileSystem->LoadModule("gamepadui", "GAMEBIN", false);
if (pGamepadUIModule != nullptr)
{
GamepadUI_Log("Loaded gamepadui module.\n");
CreateInterfaceFn gamepaduiFactory = Sys_GetFactory(pGamepadUIModule);
if (gamepaduiFactory != nullptr)
{
g_pGamepadUI = (IGamepadUI*)gamepaduiFactory(GAMEPADUI_INTERFACE_VERSION, NULL);
if (g_pGamepadUI != nullptr)
{
GamepadUI_Log("Initializing IGamepadUI interface...\n");
factorylist_t factories;
FactoryList_Retrieve(factories);
g_pGamepadUI->Initialize(factories.appSystemFactory);
#ifdef STEAM_INPUT
g_pSteamInput->SetGamepadUI(true);
g_pGamepadUI->SetSteamInput(g_pSteamInput);
#endif
}
else
{
GamepadUI_Log("Unable to pull IGamepadUI interface.\n");
}
}
else
{
GamepadUI_Log("Unable to get gamepadui factory.\n");
}
}
else
{
GamepadUI_Log("Unable to load gamepadui module\n");
}
}
#endif // GAMEPADUI
#else
if (IsGamepadUI())
GamepadUI_Log("This version of GamepadUI doesnt work with portal 1. Idk why.");
#endif // !PORTAL
}
//-----------------------------------------------------------------------------
@@ -1196,6 +1253,11 @@ void CHLClient::Shutdown( void )
UncacheAllMaterials();
IGameSystem::ShutdownAllSystems();
#if defined(GAMEPADUI)
if (g_pGamepadUI != nullptr)
g_pGamepadUI->Shutdown();
#endif // GAMEPADUI
gHUD.Shutdown();
VGui_Shutdown();
@@ -1243,6 +1305,11 @@ int CHLClient::HudVidInit( void )
GetClientVoiceMgr()->VidInit();
#if defined(GAMEPADUI)
if (g_pGamepadUI != nullptr)
g_pGamepadUI->VidInit();
#endif // GAMEPADUI
return 1;
}
@@ -1293,6 +1360,11 @@ void CHLClient::HudUpdate( bool bActive )
g_pSixenseInput->SixenseFrame( 0, NULL );
}
#endif
#if defined(GAMEPADUI)
if (g_pGamepadUI != nullptr)
g_pGamepadUI->OnUpdate(frametime);
#endif // GAMEPADUI
}
//-----------------------------------------------------------------------------
@@ -1301,6 +1373,7 @@ void CHLClient::HudUpdate( bool bActive )
void CHLClient::HudReset( void )
{
gHUD.VidInit();
PhysicsReset();
}
@@ -1640,6 +1713,11 @@ void CHLClient::LevelInitPreEntity( char const* pMapName )
CReplayRagdollRecorder::Instance().Init();
}
#endif
#if defined(GAMEPADUI)
if (g_pGamepadUI != nullptr)
g_pGamepadUI->OnLevelInitializePreEntity();
#endif // GAMEPADUI
}
@@ -1651,6 +1729,11 @@ void CHLClient::LevelInitPostEntity( )
IGameSystem::LevelInitPostEntityAllSystems();
C_PhysPropClientside::RecreateAll();
internalCenterPrint->Clear();
#if defined(GAMEPADUI)
if (g_pGamepadUI != nullptr)
g_pGamepadUI->OnLevelInitializePostEntity();
#endif // GAMEPADUI
}
//-----------------------------------------------------------------------------
@@ -1717,6 +1800,11 @@ void CHLClient::LevelShutdown( void )
StopAllRumbleEffects();
#if defined(GAMEPADUI)
if (g_pGamepadUI != nullptr)
g_pGamepadUI->OnLevelShutdown();
#endif // GAMEPADUI
gHUD.LevelShutdown();
internalCenterPrint->Clear();

View File

@@ -55,6 +55,8 @@ $Configuration
$PreprocessorDefinitions "$BASE;ENABLE_CHROMEHTMLWINDOW;fopen=dont_use_fopen" [$WIN32]
$PreprocessorDefinitions "$BASE;ENABLE_CHROMEHTMLWINDOW;" [$OSXALL]
$PreprocessorDefinitions "$BASE;ENABLE_CHROMEHTMLWINDOW;USE_WEBM_FOR_REPLAY;" [$LINUXALL]
$PreprocessorDefinitions "$BASE;GAMEPADUI_DLL;"
$PreprocessorDefinitions "$BASE;GAMEPADUI;"
$PreprocessorDefinitions "$BASE;CURL_STATICLIB" [$WIN32 && $BUILD_REPLAY]
$Create/UsePrecompiledHeader "Use Precompiled Header (/Yu)"
$Create/UsePCHThroughFile "cbase.h"

View File

@@ -13,7 +13,11 @@
// default FOV for HL1
ConVar default_fov( "default_fov", "90", FCVAR_CHEAT );
ConVar fov_desired( "fov_desired", "90", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 110.0 );
#ifdef GAMEPADUI
ConVar fov_desired("fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 120.0);
#else
ConVar fov_desired("fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 110.0);
#endif // GAMEPADUI
// The current client mode. Always ClientModeNormal in HL.
IClientMode *g_pClientMode = NULL;

View File

@@ -19,7 +19,11 @@
extern bool g_bRollingCredits;
#ifdef GAMEPADUI
ConVar fov_desired("fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 120.0);
#else
ConVar fov_desired( "fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 110.0 );
#endif // GAMEPADUI
//-----------------------------------------------------------------------------
// Globals

View File

@@ -259,7 +259,7 @@ void CHudCrosshair::Paint( void )
}
int iScreenDiv = 1600;
if ( IsSteamDeck() )
if ( IsGamepadUI() )
iScreenDiv = 1440;
float flPlayerScale;

View File

@@ -20,7 +20,11 @@
// default FOV for HL2
ConVar default_fov( "default_fov", "75", FCVAR_CHEAT );
ConVar fov_desired( "fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 110.0 );
#ifdef GAMEPADUI
ConVar fov_desired("fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 120.0);
#else
ConVar fov_desired("fov_desired", "75", FCVAR_ARCHIVE | FCVAR_USERINFO, "Sets the base field-of-view.", true, 75.0, true, 110.0);
#endif // GAMEPADUI
// The current client mode. Always ClientModeNormal in HL.
IClientMode *g_pClientMode = NULL;