some more fixes

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-09 11:50:13 -07:00
parent 860b28c10b
commit d836503814
19 changed files with 52 additions and 52 deletions
@@ -37,7 +37,7 @@ namespace AzToolsFramework
ToolsApplication(int* argc = nullptr, char*** argv = nullptr);
~ToolsApplication();
void Stop();
void Stop() override;
void CreateReflectionManager() override;
void Reflect(AZ::ReflectContext* context) override;
@@ -65,7 +65,7 @@ namespace AzToolsFramework
/**
* Called right before we start reading from the instance pointed by classPtr.
*/
void OnReadBegin(void* classPtr)
void OnReadBegin(void* classPtr) override
{
EditorEntitySortComponent* component = reinterpret_cast<EditorEntitySortComponent*>(classPtr);
component->PrepareSave();
@@ -31,7 +31,7 @@ namespace AzToolsFramework
void AppendEntityAliasToPatchPaths(PrefabDom& providedPatch, const AZ::EntityId& entityId) override;
InstanceOptionalReference GetTopMostInstanceInHierarchy(AZ::EntityId entityId);
InstanceOptionalReference GetTopMostInstanceInHierarchy(AZ::EntityId entityId) override;
bool PatchTemplate(PrefabDomValue& providedPatch, TemplateId templateId, InstanceOptionalReference instanceToExclude = AZStd::nullopt) override;
@@ -76,10 +76,10 @@ namespace AzToolsFramework
void ResetContext() override;
void GetRequiredComponentTypes(AZ::ComponentTypeList& required) override;
bool IsSliceMetadataEntity(const AZ::EntityId entityId) override;
AZ::Entity* GetMetadataEntity(const AZ::EntityId entityId);
AZ::Entity* GetMetadataEntity(const AZ::EntityId entityId) override;
AZ::EntityId GetMetadataEntityIdFromEditorEntity(const AZ::EntityId editorEntityId) override;
AZ::EntityId GetMetadataEntityIdFromSliceAddress(const AZ::SliceComponent::SliceInstanceAddress& address) override;
void AddMetadataEntityToContext(const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/, AZ::Entity& entity);
void AddMetadataEntityToContext(const AZ::SliceComponent::SliceInstanceAddress& /*sliceAddress*/, AZ::Entity& entity) override;
//////////////////////////////////////////////////////////////////////////
@@ -61,7 +61,7 @@ namespace AzToolsFramework
/**
* Called right before we start reading from the instance pointed by classPtr.
*/
void OnReadBegin(void* classPtr)
void OnReadBegin(void* classPtr) override
{
EditorInspectorComponent* component = reinterpret_cast<EditorInspectorComponent*>(classPtr);
component->PrepareSave();
@@ -37,7 +37,7 @@ namespace AzToolsFramework
// AZ::NonUniformScaleRequestBus::Handler ...
AZ::Vector3 GetScale() const override;
void SetScale(const AZ::Vector3& scale) override;
void RegisterScaleChangedEvent(AZ::NonUniformScaleChangedEvent::Handler& handler);
void RegisterScaleChangedEvent(AZ::NonUniformScaleChangedEvent::Handler& handler) override;
private:
static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent);
@@ -62,11 +62,11 @@ namespace AzToolsFramework
//////////////////////////////////////////////////////////////////////////
// TraceMessagesBus
virtual bool OnAssert(const char* message);
virtual bool OnException(const char* message);
virtual bool OnError(const char* window, const char* message);
virtual bool OnWarning(const char* window, const char* message);
virtual bool OnPrintf(const char* window, const char* message);
bool OnAssert(const char* message) override;
bool OnException(const char* message) override;
bool OnError(const char* window, const char* message) override;
bool OnWarning(const char* window, const char* message) override;
bool OnPrintf(const char* window, const char* message) override;
//////////////////////////////////////////////////////////////////////////
/// Log a message received from the TraceMessageBus
@@ -55,12 +55,12 @@ namespace AzToolsFramework
// GUI is a pointer to the GUI used to editor your property (the one you created in CreateGUI)
// and instance is a the actual value (PropertyType).
// you may not cache the pointer to anything.
virtual void WriteGUIValuesIntoProperty(size_t index, WidgetType* GUI, PropertyType& instance, InstanceDataNode* node) = 0;
void WriteGUIValuesIntoProperty(size_t index, WidgetType* GUI, PropertyType& instance, InstanceDataNode* node) override = 0;
// this will get called in order to initialize your gui. It will be called once for each instance.
// for example if you have multiple objects selected, index will go from 0 to however many there are.
// you may not cache the pointer to anything.
virtual bool ReadValuesIntoGUI(size_t index, WidgetType* GUI, const PropertyType& instance, InstanceDataNode* node) = 0;
bool ReadValuesIntoGUI(size_t index, WidgetType* GUI, const PropertyType& instance, InstanceDataNode* node) override = 0;
// this will be called in order to initialize or refresh your gui. Your class will be fed one attribute at a time
// you may override this to interpret the attributes as you wish - use attrValue->Read<int>() for example, to interpret it as an int.
@@ -87,19 +87,19 @@ namespace AzToolsFramework
// and cause the next row to tab to your last button, when the user hits shift+tab on the next row.
// if your widget is a single widget or has a single focus proxy there is no need to override.
// you may not cache the pointer to anything.
virtual QWidget* GetFirstInTabOrder(WidgetType* widget) { return widget; }
virtual QWidget* GetLastInTabOrder(WidgetType* widget) { return widget; }
QWidget* GetFirstInTabOrder(WidgetType* widget) override { return widget; }
QWidget* GetLastInTabOrder(WidgetType* widget) override { return widget; }
// implement this function in order to set your internal tab order between child controls.
// just call a series of QWidget::setTabOrder
// you may not cache the pointer to anything.
virtual void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) { }
void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) override {}
// you must implement CreateGUI:
// create an instance of the GUI that is used to edit this property type.
// the QWidget pointer you return also serves as a handle for accessing data. This means that in order to trigger
// a write, you need to call RequestWrite(...) on that same widget handle you return.
virtual QWidget* CreateGUI(QWidget *pParent) override = 0;
QWidget* CreateGUI(QWidget *pParent) override = 0;
// you MAY override this if you wish to pool your widgets or reuse them. The default implementation simply calls delete.
//virtual QWidget* DestroyGUI(QWidget* object) override;
@@ -129,24 +129,24 @@ namespace AzToolsFramework
return false;
}
virtual QWidget* GetFirstInTabOrder(WidgetType* widget) { return widget; }
QWidget* GetFirstInTabOrder(WidgetType* widget) override { return widget; }
virtual QWidget* GetLastInTabOrder(WidgetType* widget) { return widget; }
virtual void UpdateWidgetInternalTabbing(WidgetType* /*widget*/) { }
virtual QWidget* CreateGUI(QWidget *pParent) override = 0;
QWidget* CreateGUI(QWidget *pParent) override = 0;
protected:
virtual bool HandlesType(const AZ::Uuid& id) const override
bool HandlesType(const AZ::Uuid& id) const override
{
(void)id;
return true;
}
virtual const AZ::Uuid& GetHandledType() const override
const AZ::Uuid& GetHandledType() const override
{
return nullUuid;
}
virtual void WriteGUIValuesIntoProperty_Internal(QWidget* widget, InstanceDataNode* node) override
void WriteGUIValuesIntoProperty_Internal(QWidget* widget, InstanceDataNode* node) override
{
for (size_t i = 0; i < node->GetNumInstances(); ++i)
{
@@ -154,13 +154,13 @@ namespace AzToolsFramework
}
}
virtual void WriteGUIValuesIntoTempProperty_Internal(QWidget* widget, void* tempValue, const AZ::Uuid& propertyType, AZ::SerializeContext* serializeContext) override
void WriteGUIValuesIntoTempProperty_Internal(QWidget* widget, void* tempValue, const AZ::Uuid& propertyType, AZ::SerializeContext* serializeContext) override
{
(void)serializeContext;
WriteGUIValuesIntoProperty(0, reinterpret_cast<WidgetType*>(widget), tempValue, propertyType);
}
virtual void ReadValuesIntoGUI_Internal(QWidget* widget, InstanceDataNode* node) override
void ReadValuesIntoGUI_Internal(QWidget* widget, InstanceDataNode* node) override
{
AZ_PROFILE_FUNCTION(AzToolsFramework);
@@ -34,11 +34,11 @@ namespace AzToolsFramework
//////////////////////////////////////////////////////////////////////////
// AZ::Component
virtual void Init();
virtual void Activate();
virtual void Deactivate();
void Init() override;
void Activate() override;
void Deactivate() override;
virtual PropertyHandlerBase* ResolvePropertyHandler(AZ::u32 handlerName, const AZ::Uuid& handlerType) override;
PropertyHandlerBase* ResolvePropertyHandler(AZ::u32 handlerName, const AZ::Uuid& handlerType) override;
//////////////////////////////////////////////////////////////////////////
private:
@@ -57,8 +57,8 @@ namespace AzToolsFramework
//////////////////////////////////////////////////////////////////////////
// PropertyTypeRegistrationMessages::Bus::Handler
virtual void RegisterPropertyType(PropertyHandlerBase* pHandler) override;
virtual void UnregisterPropertyType(PropertyHandlerBase* pHandler) override;
void RegisterPropertyType(PropertyHandlerBase* pHandler) override;
void UnregisterPropertyType(PropertyHandlerBase* pHandler) override;
//////////////////////////////////////////////////////////////////////////
typedef AZStd::unordered_multimap<AZ::u32, PropertyHandlerBase*> HandlerMap;
@@ -235,7 +235,7 @@ namespace AzToolsFramework
void PopulateFieldTreeRemovedEntities();
/// Event filter for key presses.
bool eventFilter(QObject* target, QEvent *event);
bool eventFilter(QObject* target, QEvent *event) override;
/// Conduct the push operation for all selected fields.
bool PushSelectedFields();
@@ -82,7 +82,7 @@ namespace AZ
FontFamilyPtr LoadFontFamily(const char* fontFamilyName) override;
FontFamilyPtr GetFontFamily(const char* fontFamilyName) override;
void AddCharsToFontTextures(FontFamilyPtr fontFamily, const char* chars, int glyphSizeX = ICryFont::defaultGlyphSizeX, int glyphSizeY = ICryFont::defaultGlyphSizeY) override;
AZStd::string GetLoadedFontNames() const;
AZStd::string GetLoadedFontNames() const override;
void OnLanguageChanged() override;
void ReloadAllFonts() override;
//////////////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@ namespace AZ
////////////////////////////////////////////////////////////////////////
// CrySystemEventBus
void OnCrySystemInitialized(ISystem& system, const SSystemInitParams& initParams);
void OnCrySystemInitialized(ISystem& system, const SSystemInitParams& initParams) override;
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
@@ -64,15 +64,15 @@ namespace BarrierInput
////////////////////////////////////////////////////////////////////////////////////////////
//! \ref RawInputNotificationsBarrier::OnRawKeyboardKeyDownEvent
virtual void OnRawKeyboardKeyDownEvent(uint32_t scanCode, ModifierMask activeModifiers);
void OnRawKeyboardKeyDownEvent(uint32_t scanCode, ModifierMask activeModifiers) override;
////////////////////////////////////////////////////////////////////////////////////////////
//! \ref RawInputNotificationsBarrier::OnRawKeyboardKeyUpEvent
virtual void OnRawKeyboardKeyUpEvent(uint32_t scanCode, ModifierMask activeModifiers);
void OnRawKeyboardKeyUpEvent(uint32_t scanCode, ModifierMask activeModifiers) override;
////////////////////////////////////////////////////////////////////////////////////////////
//! \ref RawInputNotificationsBarrier::OnRawKeyboardKeyRepeatEvent
virtual void OnRawKeyboardKeyRepeatEvent(uint32_t scanCode, ModifierMask activeModifiers);
void OnRawKeyboardKeyRepeatEvent(uint32_t scanCode, ModifierMask activeModifiers) override;
////////////////////////////////////////////////////////////////////////////////////////////
//! Thread safe method to queue raw key events to be processed in the main thread update
@@ -61,7 +61,7 @@ namespace EMotionFX
bool GetSupportsVisualization() const override { return true; }
AnimGraphPose* GetMainOutputPose(AnimGraphInstance* animGraphInstance) const override { return GetOutputPose(animGraphInstance, OUTPUTPORT_RESULT)->GetValue(); }
bool GetHasOutputPose() const override { return true; }
bool GetCanBeEntryNode() const { return true; }
bool GetCanBeEntryNode() const override { return true; }
bool GetCanBeInsideStateMachineOnly() const override { return true; }
bool GetHasVisualOutputPorts() const override { return false; }
bool GetCanHaveOnlyOneInsideParent() const override { return false; }
@@ -82,8 +82,8 @@ namespace EMotionFX
AnimGraphReferenceNode();
~AnimGraphReferenceNode();
void Reinit();
void RecursiveReinit();
void Reinit() override;
void RecursiveReinit() override;
bool InitAfterLoading(AnimGraph* animGraph) override;
AnimGraphObjectData* CreateUniqueData(AnimGraphInstance* animGraphInstance) override { return aznew UniqueData(this, animGraphInstance); }
@@ -115,7 +115,7 @@ namespace EMotionFX
public:
AZ_CLASS_ALLOCATOR(EMotionFXEventHandler, EMotionFXAllocator, 0);
const AZStd::vector<EventTypes> GetHandledEventTypes() const
const AZStd::vector<EventTypes> GetHandledEventTypes() const override
{
return {
EVENT_TYPE_ON_EVENT,
@@ -69,14 +69,14 @@ namespace ScriptCanvas
{
public:
/// Called right before we start reading from the instance pointed by classPtr.
void OnReadBegin(void* objectPtr)
void OnReadBegin(void* objectPtr) override
{
t_Class* deserializedObject = reinterpret_cast<t_Class*>(objectPtr);
deserializedObject->OnReadBegin();
}
/// Called after we are done reading from the instance pointed by classPtr.
void OnReadEnd(void* objectPtr)
void OnReadEnd(void* objectPtr) override
{
t_Class* deserializedObject = reinterpret_cast<t_Class*>(objectPtr);
deserializedObject->OnReadEnd();
@@ -224,7 +224,7 @@ namespace ScriptCanvas
m_dataType = dataReference;
}
virtual Data::Type GetDataType() override
Data::Type GetDataType() override
{
return Data::FromAZType(azrtti_typeid<DataType>());
}
@@ -310,7 +310,7 @@ namespace ScriptCanvas
}
// ComboBoxPropertyInterface
int GetSelectedIndex() const
int GetSelectedIndex() const override
{
int counter = -1;
@@ -328,7 +328,7 @@ namespace ScriptCanvas
return counter;
}
void SetSelectedIndex(int index)
void SetSelectedIndex(int index) override
{
if (index >= 0 || index < m_displaySet.size())
{
@@ -513,13 +513,13 @@ namespace ScriptCanvas
//! Node internal initialization, for custom init, use OnInit
void Init() override final;
void Init() final;
//! Node internal activation and housekeeping, for custom activation configuration use OnActivate
void Activate() override final;
void Activate() final;
//! Node internal deactivation and housekeeping, for custom deactivation configuration use OnDeactivate
void Deactivate() override final;
void Deactivate() final;
void PostActivate();
@@ -591,7 +591,7 @@ namespace ScriptCanvas
NodeDisabledFlag GetNodeDisabledFlag() const;
void SetNodeDisabledFlag(NodeDisabledFlag disabledFlag);
bool RemoveVariableReferences(const AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds);
bool RemoveVariableReferences(const AZStd::unordered_set< ScriptCanvas::VariableId >& variableIds) override;
////
Slot* GetSlotByName(AZStd::string_view slotName) const;
@@ -78,7 +78,7 @@ namespace ScriptCanvas
//////////////////////////////////////////////////////////////////////////
// TargetManagerClient
void DesiredTargetConnected(bool connected) override;
void DesiredTargetChanged(AZ::u32 newId, AZ::u32 oldId);
void DesiredTargetChanged(AZ::u32 newId, AZ::u32 oldId) override;
void TargetJoinedNetwork(AzFramework::TargetInfo info) override;
void TargetLeftNetwork(AzFramework::TargetInfo info) override;
//////////////////////////////////////////////////////////////////////////
@@ -56,7 +56,7 @@ namespace Terrain
//////////////////////////////////////////////////////////////////////////
// SurfaceDataProviderRequestBus
void GetSurfacePoints(const AZ::Vector3& inPosition, SurfaceData::SurfacePointList& surfacePointList) const;
void GetSurfacePoints(const AZ::Vector3& inPosition, SurfaceData::SurfacePointList& surfacePointList) const override;
//////////////////////////////////////////////////////////////////////////
// AzFramework::Terrain::TerrainDataNotificationBus