birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove lots of unused things from CrySystem (#765)

Browse Source 
Remove lots of unused things from CrySystem
This commit is contained in:
bosnichd
2021-05-14 15:38:59 -06:00
committed by GitHub
parent 2a6938bdf5
commit 9ecbbe471b
105 changed files with 15 additions and 20956 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/CrySystem/System.cpp
-162
View File
@@ -135,25 +135,16 @@ LRESULT WINAPI WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
#include "XML/xml.h"
#include "XML/ReadWriteXMLSink.h"
#include "PhysRenderer.h"
#include "LocalizedStringManager.h"
#include "XML/XmlUtils.h"
#include "SystemEventDispatcher.h"
#include "ServerThrottle.h"
#include "HMDBus.h"
#include "IZLibCompressor.h"
#include "IZlibDecompressor.h"
#include "ILZ4Decompressor.h"
#include "IZStdDecompressor.h"
#include "zlib.h"
#include "RemoteConsole/RemoteConsole.h"
#include <PNoise3.h>
#include <StringUtils.h>
#include "CryWaterMark.h"
WATERMARKDATA(_m);
#include <LyShine/Bus/UiCursorBus.h>
#include <AzFramework/Asset/AssetSystemBus.h>
@@ -170,10 +161,6 @@ WATERMARKDATA(_m);
#include <malloc.h>
#endif
#if USE_STEAM
#include "Steamworks/public/steam/steam_api.h"
#endif
#include <ILevelSystem.h>
#include <AzFramework/IO/LocalFileIO.h>
@@ -185,11 +172,6 @@ VTuneFunction VTPause = NULL;
// Define global cvars.
SSystemCVars g_cvars;
#include "ITextModeConsole.h"
//////////////////////////////////////////////////////////////////////////
#include "Validator.h"
#include <IViewSystem.h>
#include <AzCore/Module/Environment.h>
@@ -308,16 +290,9 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
m_rFullscreen = NULL;
m_sysNoUpdate = NULL;
m_pProcess = NULL;
m_pValidator = NULL;
m_pCmdLine = NULL;
m_pDefaultValidator = NULL;
m_pLevelSystem = NULL;
m_pViewSystem = NULL;
m_pIZLibCompressor = NULL;
m_pIZLibDecompressor = NULL;
m_pILZ4Decompressor = NULL;
m_pIZStdDecompressor = nullptr;
m_pLocalizationManager = NULL;
#if defined(AZ_RESTRICTED_PLATFORM)
#define AZ_RESTRICTED_SECTION SYSTEM_CPP_SECTION_2
@@ -332,14 +307,12 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
m_sys_memory_debug = NULL;
m_sysWarnings = NULL;
m_sysKeyboard = NULL;
m_sys_GraphicsQuality = NULL;
m_sys_firstlaunch = NULL;
m_sys_enable_budgetmonitoring = NULL;
m_sys_preload = NULL;
// m_sys_filecache = NULL;
m_gpu_particle_physics = NULL;
m_pCpu = NULL;
m_bInitializedSuccessfully = false;
m_bRelaunch = false;
@@ -371,7 +344,6 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
m_pXMLUtils = new CXmlUtils(this);
m_pTextModeConsole = NULL;
if (!AZ::AllocatorInstance<AZ::OSAllocator>::IsReady())
{
@@ -390,7 +362,6 @@ CSystem::CSystem(SharedEnvironmentInstance* pSharedEnvironment)
m_eRuntimeState = ESYSTEM_EVENT_LEVEL_UNLOAD;
m_bHasRenderedErrorMessage = false;
m_bIsSteamInitialized = false;
m_pDataProbe = nullptr;
#if AZ_LEGACY_CRYSYSTEM_TRAIT_USE_MESSAGE_HANDLER
@@ -509,14 +480,6 @@ void CSystem::ShutDown()
GetIRemoteConsole()->Stop();
}
// clean up properly the console
if (m_pTextModeConsole)
{
m_pTextModeConsole->OnShutdown();
}
SAFE_DELETE(m_pTextModeConsole);
if (m_sys_firstlaunch)
{
m_sys_firstlaunch->Set("0");
@@ -566,10 +529,6 @@ void CSystem::ShutDown()
{
((CXConsole*)m_env.pConsole)->FreeRenderResources();
}
SAFE_RELEASE(m_pIZLibCompressor);
SAFE_RELEASE(m_pIZLibDecompressor);
SAFE_RELEASE(m_pILZ4Decompressor);
SAFE_RELEASE(m_pIZStdDecompressor);
SAFE_RELEASE(m_pViewSystem);
SAFE_RELEASE(m_pLevelSystem);
@@ -596,7 +555,6 @@ void CSystem::ShutDown()
SAFE_RELEASE(m_sysWarnings);
SAFE_RELEASE(m_sysKeyboard);
SAFE_RELEASE(m_sys_GraphicsQuality);
SAFE_RELEASE(m_sys_firstlaunch);
SAFE_RELEASE(m_sys_enable_budgetmonitoring);
@@ -608,13 +566,8 @@ void CSystem::ShutDown()
SAFE_RELEASE(m_sys_min_step);
SAFE_RELEASE(m_sys_max_step);
SAFE_DELETE(m_pDefaultValidator);
m_pValidator = nullptr;
SAFE_DELETE(m_pLocalizationManager);
SAFE_DELETE(m_pCpu);
delete m_pCmdLine;
m_pCmdLine = 0;
@@ -941,13 +894,6 @@ bool CSystem::UpdatePreTickBus(int updateFlags, int nPauseMode)
//update time subsystem
m_Time.UpdateOnFrameStart();
//////////////////////////////////////////////////////////////////////
// update rate limiter for dedicated server
if (m_pServerThrottle.get())
{
m_pServerThrottle->Update();
}
//////////////////////////////////////////////////////////////////////
//update console system
if (m_env.pConsole)
@@ -1277,21 +1223,6 @@ void CSystem::WarningV(EValidatorModule module, EValidatorSeverity severity, int
m_env.pLog->LogWithType(ltype, flags | VALIDATOR_FLAG_SKIP_VALIDATOR, "%s", szBuffer);
}
//if(file)
//m_env.pLog->LogWithType( ltype, " ... caused by file '%s'",file);
if (m_pValidator && (flags & VALIDATOR_FLAG_SKIP_VALIDATOR) == 0)
{
SValidatorRecord record;
record.file = file;
record.text = szBuffer;
record.module = module;
record.severity = severity;
record.flags = flags;
record.assetScope = m_env.pLog->GetAssetScopeString();
m_pValidator->Report(record);
}
if (bDbgBreak && g_cvars.sys_error_debugbreak)
{
AZ::Debug::Trace::Break();
@@ -1412,12 +1343,6 @@ void CSystem::ExecuteCommandLine(bool deferred)
m_executedCommandLine = true;
// auto detect system spec (overrides profile settings)
if (m_pCmdLine->FindArg(eCLAT_Pre, "autodetect"))
{
AutoDetectSpec(false);
}
// execute command line arguments e.g. +g_gametype ASSAULT +map "testy"
ICmdLine* pCmdLine = GetICmdLine();
@@ -1446,50 +1371,6 @@ void CSystem::ExecuteCommandLine(bool deferred)
//gEnv->pConsole->ExecuteString("sys_RestoreSpec test*"); // to get useful debugging information about current spec settings to the log file
}
ITextModeConsole* CSystem::GetITextModeConsole()
{
if (m_bDedicatedServer)
{
return m_pTextModeConsole;
}
return 0;
}
//////////////////////////////////////////////////////////////////////////
ESystemConfigSpec CSystem::GetConfigSpec(bool bClient)
{
if (bClient)
{
if (m_sys_GraphicsQuality)
{
return (ESystemConfigSpec)m_sys_GraphicsQuality->GetIVal();
}
return CONFIG_VERYHIGH_SPEC; // highest spec.
}
else
{
return m_nServerConfigSpec;
}
}
//////////////////////////////////////////////////////////////////////////
void CSystem::SetConfigSpec(ESystemConfigSpec spec, ESystemConfigPlatform platform, bool bClient)
{
if (bClient)
{
if (m_sys_GraphicsQuality)
{
SetConfigPlatform(platform);
m_sys_GraphicsQuality->Set(static_cast<int>(spec));
}
}
else
{
m_nServerConfigSpec = spec;
}
}
//////////////////////////////////////////////////////////////////////////
ESystemConfigSpec CSystem::GetMaxConfigSpec() const
{
@@ -1539,49 +1420,6 @@ void CProfilingSystem::VTunePause()
#endif
}
bool CSystem::SteamInit()
{
#if USE_STEAM
if (m_bIsSteamInitialized)
{
return true;
}
AZStd::string_view exePath;
AZ::ComponentApplicationBus::BroadcastResult(exePath, &AZ::ComponentApplicationRequests::GetExecutableFolder);
////////////////////////////////////////////////////////////////////////////
// ** DEVELOPMENT ONLY ** - creates the appropriate steam_appid.txt file needed to call SteamAPI_Init()
#if !defined(RELEASE)
AZStd::string appidPath = AZStd::string::format("%.*s/steam_appid.txt", aznumeric_cast<int>(exePath.size()), exePath.data());
azfopen(&pSteamAppID, appidPath.c_str(), "wt");
fprintf(pSteamAppID, "%d", g_cvars.sys_steamAppId);
fclose(pSteamAppID);
#endif // !defined(RELEASE)
// ** END DEVELOPMENT ONLY **
////////////////////////////////////////////////////////////////////////////
if (!SteamAPI_Init())
{
CryLog("[STEAM] SteamApi_Init failed");
return false;
}
////////////////////////////////////////////////////////////////////////////
// ** DEVELOPMENT ONLY ** - deletes the appropriate steam_appid.txt file as it's no longer needed
#if !defined(RELEASE)
remove(appidPath.c_str());
#endif // !defined(RELEASE)
// ** END DEVELOPMENT ONLY **
////////////////////////////////////////////////////////////////////////////
m_bIsSteamInitialized = true;
return true;
#else
return false;
#endif
}
//////////////////////////////////////////////////////////////////////
void CSystem::OnLanguageCVarChanged(ICVar* language)
{