Remove (almost) all references to pRenderer (#651)

Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
This commit is contained in:
bosnichd
2021-05-10 10:05:15 -06:00
committed by GitHub
parent 4a2e6a77b5
commit 440c40e490
191 changed files with 118 additions and 23548 deletions
-24
View File
@@ -49,7 +49,6 @@ AZ_POP_DISABLE_WARNING
#include "Objects/GizmoManager.h"
#include "Objects/AxisGizmo.h"
#include "DisplaySettings.h"
#include "ShaderEnum.h"
#include "KeyboardCustomizationSettings.h"
#include "Export/ExportManager.h"
#include "LevelIndependentFileMan.h"
@@ -60,7 +59,6 @@ AZ_POP_DISABLE_WARNING
#include "MainWindow.h"
#include "Alembic/AlembicCompiler.h"
#include "UIEnumsDatabase.h"
#include "Util/Ruler.h"
#include "RenderHelpers/AxisHelper.h"
#include "Settings.h"
#include "Include/IObjectManager.h"
@@ -134,7 +132,6 @@ CEditorImpl::CEditorImpl()
, m_bUpdates(true)
, m_bTerrainAxisIgnoreObjects(false)
, m_pDisplaySettings(nullptr)
, m_pShaderEnum(nullptr)
, m_pIconManager(nullptr)
, m_bSelectionLocked(true)
, m_pAxisGizmo(nullptr)
@@ -149,7 +146,6 @@ CEditorImpl::CEditorImpl()
, m_pSourceControl(nullptr)
, m_pSelectionTreeManager(nullptr)
, m_pUIEnumsDatabase(nullptr)
, m_pRuler(nullptr)
, m_pConsoleSync(nullptr)
, m_pSettingsManager(nullptr)
, m_pLevelIndependentFileMan(nullptr)
@@ -185,7 +181,6 @@ CEditorImpl::CEditorImpl()
m_pBackgroundScheduleManager.reset(new BackgroundScheduleManager::CScheduleManager);
m_pUIEnumsDatabase = new CUIEnumsDatabase;
m_pDisplaySettings = new CDisplaySettings;
m_pShaderEnum = new CShaderEnum;
m_pDisplaySettings->LoadRegistry();
m_pPluginManager = new CPluginManager;
@@ -202,7 +197,6 @@ CEditorImpl::CEditorImpl()
m_pImageUtil = new CImageUtil_impl();
m_pResourceSelectorHost.reset(CreateResourceSelectorHost());
m_pRuler = new CRuler;
m_selectedRegion.min = Vec3(0, 0, 0);
m_selectedRegion.max = Vec3(0, 0, 0);
DetectVersion();
@@ -335,8 +329,6 @@ CEditorImpl::~CEditorImpl()
}
SAFE_DELETE(m_pDisplaySettings)
SAFE_DELETE(m_pRuler)
SAFE_DELETE(m_pShaderEnum)
SAFE_DELETE(m_pToolBoxManager)
SAFE_DELETE(m_pCommandManager)
SAFE_DELETE(m_pClassFactory)
@@ -419,7 +411,6 @@ void CEditorImpl::Update()
m_bUpdates = false;
FUNCTION_PROFILER(GetSystem(), PROFILE_EDITOR);
m_pRuler->Update();
//@FIXME: Restore this latter.
//if (GetGameEngine() && GetGameEngine()->IsLevelLoaded())
@@ -440,15 +431,6 @@ ISystem* CEditorImpl::GetSystem()
return m_pSystem;
}
IRenderer* CEditorImpl::GetRenderer()
{
if (gEnv)
{
return gEnv->pRenderer;
}
return nullptr;
}
IEditorClassFactory* CEditorImpl::GetClassFactory()
{
return m_pClassFactory;
@@ -1182,11 +1164,6 @@ void CEditorImpl::AddTemplate(const QString& templateName, XmlNodeRef& tmpl)
m_templateRegistry.AddTemplate(templateName, tmpl);
}
CShaderEnum* CEditorImpl::GetShaderEnum()
{
return m_pShaderEnum;
}
bool CEditorImpl::ExecuteConsoleApp(const QString& CommandLine, QString& OutputText, [[maybe_unused]] bool bNoTimeOut, bool bShowWindow)
{
CLogFile::FormatLine("Executing console application '%s'", CommandLine.toUtf8().data());
@@ -1569,7 +1546,6 @@ void CEditorImpl::ReduceMemory()
GetIEditor()->GetUndoManager()->ClearRedoStack();
GetIEditor()->GetUndoManager()->ClearUndoStack();
GetIEditor()->GetObjectManager()->SendEvent(EVENT_FREE_GAME_DATA);
gEnv->pRenderer->FreeResources(FRR_TEXTURES);
#if defined(AZ_PLATFORM_WINDOWS)
HANDLE hHeap = GetProcessHeap();