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

Code/Editor

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-10 20:15:16 -07:00
parent 8554cea0ad
commit 7f157f152d
39 changed files with 524 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/Objects/EntityObject.h
+27 -27
View File
@@ -82,14 +82,14 @@ public:
// Overrides from CBaseObject.
//////////////////////////////////////////////////////////////////////////
//! Return type name of Entity.
QString GetTypeDescription() const { return GetEntityClass(); };
QString GetTypeDescription() const override { return GetEntityClass(); };
//////////////////////////////////////////////////////////////////////////
bool IsSameClass(CBaseObject* obj);
bool IsSameClass(CBaseObject* obj) override;
virtual bool Init(IEditor* ie, CBaseObject* prev, const QString& file);
virtual void InitVariables();
virtual void Done();
bool Init(IEditor* ie, CBaseObject* prev, const QString& file) override;
void InitVariables() override;
void Done() override;
void DrawExtraLightInfo (DisplayContext& disp);
@@ -102,30 +102,30 @@ public:
void SetEntityPropertyFloat(const char* name, float value);
void SetEntityPropertyString(const char* name, const QString& value);
virtual int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags);
virtual void OnContextMenu(QMenu* menu);
int MouseCreateCallback(CViewport* view, EMouseEvent event, QPoint& point, int flags) override;
void OnContextMenu(QMenu* menu) override;
void SetName(const QString& name);
void SetSelected(bool bSelect);
void SetName(const QString& name) override;
void SetSelected(bool bSelect) override;
virtual void GetLocalBounds(AABB& box);
void GetLocalBounds(AABB& box) override;
virtual bool HitTest(HitContext& hc);
virtual bool HitHelperTest(HitContext& hc);
virtual bool HitTestRect(HitContext& hc);
void UpdateVisibility(bool bVisible);
bool ConvertFromObject(CBaseObject* object);
bool HitTest(HitContext& hc) override;
bool HitHelperTest(HitContext& hc) override;
bool HitTestRect(HitContext& hc) override;
void UpdateVisibility(bool bVisible) override;
bool ConvertFromObject(CBaseObject* object) override;
using CBaseObject::Serialize;
void Serialize(CObjectArchive& ar) override;
virtual void PostLoad(CObjectArchive& ar);
void PostLoad(CObjectArchive& ar) override;
XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode);
XmlNodeRef Export(const QString& levelPath, XmlNodeRef& xmlNode) override;
//////////////////////////////////////////////////////////////////////////
void OnEvent(ObjectEvent event);
void OnEvent(ObjectEvent event) override;
virtual void SetTransformDelegate(ITransformDelegate* pTransformDelegate) override;
void SetTransformDelegate(ITransformDelegate* pTransformDelegate) override;
// Set attach flags and target
enum EAttachmentType
@@ -140,15 +140,15 @@ public:
EAttachmentType GetAttachType() const { return m_attachmentType; }
QString GetAttachTarget() const { return m_attachmentTarget; }
virtual void SetHelperScale(float scale);
virtual float GetHelperScale();
void SetHelperScale(float scale) override;
float GetHelperScale() override;
virtual void GatherUsedResources(CUsedResources& resources);
virtual bool IsSimilarObject(CBaseObject* pObject);
void GatherUsedResources(CUsedResources& resources) override;
bool IsSimilarObject(CBaseObject* pObject) override;
virtual bool HasMeasurementAxis() const { return false; }
bool HasMeasurementAxis() const override { return false; }
virtual bool IsIsolated() const { return false; }
bool IsIsolated() const override { return false; }
//////////////////////////////////////////////////////////////////////////
// END CBaseObject
@@ -233,7 +233,7 @@ protected:
//////////////////////////////////////////////////////////////////////////
//! Must be called after cloning the object on clone of object.
//! This will make sure object references are cloned correctly.
virtual void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx);
void PostClone(CBaseObject* pFromObject, CObjectCloneContext& ctx) override;
//! Draw default object items.
void DrawProjectorPyramid(DisplayContext& dc, float dist);
@@ -265,7 +265,7 @@ public:
}
protected:
void DeleteThis() { delete this; };
void DeleteThis() override { delete this; };
//////////////////////////////////////////////////////////////////////////
// Radius callbacks.