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

some more fixes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
+1 -1
View File
@@ -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;
Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.h
+1 -1
View File
@@ -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();
Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.h
+1 -1
View File
@@ -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;
Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.h
+2 -2
View File
@@ -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;
//////////////////////////////////////////////////////////////////////////
Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.h
+1 -1
View File
@@ -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();
Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorNonUniformScaleComponent.h
+1 -1
View File
@@ -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);
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.h
+5 -5
View File
@@ -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
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h
+13 -13
View File
@@ -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);
Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.h
+6 -6
View File
@@ -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;
Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.hxx
+1 -1
View File
@@ -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();