Remove I3DEngine CryCommon Interface (#567)

Delete:

- I3DEngine
- Missions
- Time of day
- GameEffectsSystem Gem
- ImageProcessing Gem
- SVOGI Gem
- Various other things that don't do anything now that the legacy renderer has been removed.
This commit is contained in:
bosnichd
2021-05-05 09:07:28 -06:00
committed by GitHub
parent 24df655d8b
commit d7b796fd73
222 changed files with 124 additions and 26474 deletions
+3 -2
View File
@@ -37,6 +37,8 @@
#include "ViewManager.h"
#include "IEditorImpl.h"
#include "GameEngine.h"
#include <IEntityRenderState.h>
#include <IStatObj.h>
// To use the Andrew's algorithm in order to make convex hull from the points, this header is needed.
#include "Util/GeometryUtil.h"
@@ -821,9 +823,8 @@ void CBaseObject::GetLocalBounds(AABB& box)
}
//////////////////////////////////////////////////////////////////////////
void CBaseObject::SetModified(bool boModifiedTransformOnly)
void CBaseObject::SetModified(bool)
{
((CObjectManager*)GetObjectManager())->OnObjectModified(this, false, boModifiedTransformOnly);
}
void CBaseObject::DrawDefault(DisplayContext& dc, const QColor& labelColor)
-5
View File
@@ -35,7 +35,6 @@ class CUndoBaseObject;
class CObjectManager;
class CGizmo;
class CObjectArchive;
class CEdGeometry;
struct SSubObjSelectionModifyContext;
struct SRayHitInfo;
class ISubObjectSelectionReferenceFrameCalculator;
@@ -580,10 +579,6 @@ public:
virtual void ModifySubObjSelection([[maybe_unused]] SSubObjSelectionModifyContext& modCtx) {};
virtual void AcceptSubObjectModify() {};
// Request a geometry pointer from the object.
// Return NULL if geometry can not be retrieved or object does not support geometries.
virtual CEdGeometry* GetGeometry() { return 0; };
//! In This function variables of the object must be initialized.
virtual void InitVariables() {};
@@ -33,7 +33,6 @@ struct IDisplayViewport;
struct IRenderer;
struct IRenderAuxGeom;
struct IIconManager;
struct I3DEngine;
class CDisplaySettings;
class CCamera;
@@ -70,7 +69,6 @@ struct SANDBOX_API DisplayContext
IRenderer* renderer;
IRenderAuxGeom* pRenderAuxGeom;
IIconManager* pIconManager;
I3DEngine* engine;
CCamera* camera;
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AABB box; // Bounding box of volume that need to be repainted.
@@ -18,8 +18,6 @@
#include "Include/IIconManager.h"
#include "Include/IDisplayViewport.h"
#include <I3DEngine.h>
#include <QDateTime>
#include <QPoint>
@@ -32,7 +30,6 @@ DisplayContext::DisplayContext()
{
view = 0;
renderer = 0;
engine = 0;
flags = 0;
settings = 0;
pIconManager = 0;
@@ -981,27 +978,8 @@ void DisplayContext::RenderObject(int objectType, const Vec3& pos, float scale)
}
//////////////////////////////////////////////////////////////////////////
void DisplayContext::RenderObject(int objectType, const Matrix34& tm)
void DisplayContext::RenderObject(int, const Matrix34&)
{
IStatObj* object = pIconManager ? pIconManager->GetObject((EStatObject)objectType) : 0;
if (object)
{
float color[4];
color[0] = m_color4b.r * (1.0f / 255.0f);
color[1] = m_color4b.g * (1.0f / 255.0f);
color[2] = m_color4b.b * (1.0f / 255.0f);
color[3] = m_color4b.a * (1.0f / 255.0f);
SRenderingPassInfo passInfo = SRenderingPassInfo::CreateGeneralPassRenderingInfo(GetIEditor()->GetSystem()->GetViewCamera());
Matrix34 xform = m_matrixStack[m_currentMatrix] * tm;
SRendParams rp;
rp.pMatrix = &xform;
rp.AmbientColor = ColorF(color[0], color[1], color[2], 1);
rp.fAlpha = color[3];
object->Render(rp, passInfo);
}
}
/////////////////////////////////////////////////////////////////////////
+2 -49
View File
@@ -32,6 +32,8 @@
#include "HitContext.h"
#include "Objects/SelectionGroup.h"
#include <IEntityRenderState.h>
#include <IStatObj.h>
//////////////////////////////////////////////////////////////////////////
//! Undo Entity Link
@@ -1926,55 +1928,6 @@ void CEntityObject::OnContextMenu(QMenu* pMenu)
CBaseObject::OnContextMenu(pMenu);
}
//////////////////////////////////////////////////////////////////////////
IOpticsElementBasePtr CEntityObject::GetOpticsElement()
{
CDLight* pLight = GetLightProperty();
if (pLight == NULL)
{
return NULL;
}
return pLight->GetLensOpticsElement();
}
//////////////////////////////////////////////////////////////////////////
void CEntityObject::SetOpticsName(const QString& opticsFullName)
{
if (opticsFullName.isEmpty())
{
CDLight* pLight = GetLightProperty();
if (pLight)
{
pLight->SetLensOpticsElement(NULL);
}
}
}
//////////////////////////////////////////////////////////////////////////
CDLight* CEntityObject::GetLightProperty() const
{
const PodArray<ILightSource*>* pLightEntities = GetIEditor()->Get3DEngine()->GetLightEntities();
if (pLightEntities == NULL)
{
return NULL;
}
for (int i = 0, iLightSize(pLightEntities->Count()); i < iLightSize; ++i)
{
ILightSource* pLightSource = pLightEntities->GetAt(i);
if (pLightSource == NULL)
{
continue;
}
CDLight& lightProperty = pLightSource->GetLightProperties();
if (GetName() != lightProperty.m_sName)
{
continue;
}
return &lightProperty;
}
return NULL;
}
//////////////////////////////////////////////////////////////////////////
void CEntityObject::PreInitLightProperty()
{
@@ -214,8 +214,6 @@ public:
QString GetLightAnimation() const;
IVariable* GetLightVariable(const char* name) const;
IOpticsElementBasePtr GetOpticsElement();
void SetOpticsName(const QString& opticsFullName);
void PreInitLightProperty();
void UpdateLightProperty();
@@ -230,8 +228,6 @@ public:
void RegisterListener(IEntityObjectListener* pListener);
void UnregisterListener(IEntityObjectListener* pListener);
CDLight* GetLightProperty() const;
protected:
template <typename T>
void SetEntityProperty(const char* name, T value);
@@ -400,8 +400,6 @@ void CObjectManager::DeleteObject(CBaseObject* obj)
CUndo::Record(new CUndoBaseObjectDelete(obj));
}
OnObjectModified(obj, true, false);
AABB objAAB;
obj->GetBoundBox(objAAB);
GetIEditor()->GetGameEngine()->OnAreaModified(objAAB);
@@ -2477,17 +2475,6 @@ IGizmoManager* CObjectManager::GetGizmoManager()
return m_gizmoManager;
}
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
void CObjectManager::OnObjectModified(CBaseObject* pObject, [[maybe_unused]] bool bDelete, [[maybe_unused]] bool boModifiedTransformOnly)
{
if (IRenderNode* pRenderNode = pObject->GetEngineNode())
{
GetIEditor()->Get3DEngine()->OnObjectModified(pRenderNode, pRenderNode->GetRndFlags());
}
}
//////////////////////////////////////////////////////////////////////////
bool CObjectManager::IsLightClass(CBaseObject* pObject)
{
@@ -326,9 +326,6 @@ public:
// Gathers all resources used by all objects.
void GatherUsedResources(CUsedResources& resources);
// Called when object gets modified.
void OnObjectModified(CBaseObject* pObject, bool bDelete, bool boModifiedTransformOnly);
virtual bool IsLightClass(CBaseObject* pObject);
virtual void FindAndRenameProperty2(const char* property2Name, const QString& oldValue, const QString& newValue);
@@ -22,6 +22,7 @@
#include "ViewManager.h"
#include "Include/IObjectManager.h"
#include <IStatObj.h>
//////////////////////////////////////////////////////////////////////////
CSelectionGroup::CSelectionGroup()