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

Gems/ScriptCanvas

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-09-03 20:38:07 -07:00
parent 27cdf174cf
commit 52607ce2c0
5 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
+21
View File
@@ -61,7 +61,10 @@ namespace ScriptCanvasEditor
bool IsInSubMenu() const override;
AZStd::string GetSubMenuPath() const override;
using GraphCanvas::SceneContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::SceneContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
};
@@ -77,7 +80,10 @@ namespace ScriptCanvasEditor
GraphCanvas::ActionGroupId GetActionGroupId() const override;
using GraphCanvas::ContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::ContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
private:
@@ -110,7 +116,10 @@ namespace ScriptCanvasEditor
GraphCanvas::ActionGroupId GetActionGroupId() const override;
using SlotManipulationMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using SlotManipulationMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
private:
@@ -127,7 +136,10 @@ namespace ScriptCanvasEditor
ExposeSlotMenuAction(QObject* parent);
virtual ~ExposeSlotMenuAction() = default;
using GraphCanvas::SlotContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::SlotContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
protected:
@@ -145,7 +157,10 @@ namespace ScriptCanvasEditor
virtual ~SetDataSlotTypeMenuAction() = default;
static bool IsSupportedSlotType(const AZ::EntityId& slotId);
using GraphCanvas::SlotContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::SlotContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
private:
@@ -164,7 +179,10 @@ namespace ScriptCanvasEditor
CreateAzEventHandlerSlotMenuAction(QObject* parent);
using GraphCanvas::SlotContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::SlotContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
static const AZ::BehaviorMethod* FindBehaviorMethodWithAzEventReturn(const GraphCanvas::GraphId& graphId, AZ::EntityId targetId);
@@ -239,7 +257,10 @@ namespace ScriptCanvasEditor
RenameFunctionDefinitionNodeAction(NodeDescriptorComponent* descriptor, QObject* parent);
virtual ~RenameFunctionDefinitionNodeAction() = default;
using GraphCanvas::NodeContextMenuAction::RefreshAction;
void RefreshAction(const GraphCanvas::GraphId& graphId, const AZ::EntityId& targetId) override;
using GraphCanvas::NodeContextMenuAction::TriggerAction;
GraphCanvas::ContextMenuAction::SceneReaction TriggerAction(const GraphCanvas::GraphId& graphId, const AZ::Vector2& scenePos) override;
NodeDescriptorComponent* m_descriptor;
Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Node.h
+4 -3
View File
@@ -178,8 +178,8 @@ namespace ScriptCanvas
NodePropertyInterface() = default;
public:
AZ_RTTI(NodePropertyInterface, "{265A2163-D3AE-4C4E-BDCC-37BA0084BF88}");
virtual ~NodePropertyInterface() = default;
virtual Data::Type GetDataType() = 0;
@@ -217,7 +217,7 @@ namespace ScriptCanvas
AZ_RTTI((TypedNodePropertyInterface<DataType>, "{24248937-86FB-406C-8DD5-023B10BD0B60}", DataType), NodePropertyInterface);
TypedNodePropertyInterface() = default;
~TypedNodePropertyInterface() = default;
virtual ~TypedNodePropertyInterface() = default;
void SetPropertyReference(DataType* dataReference)
{
@@ -283,7 +283,7 @@ namespace ScriptCanvas
AZ_RTTI((TypedComboBoxNodePropertyInterface<DataType>, "{24248937-86FB-406C-8DD5-023B10BD0B60}", DataType), TypedNodePropertyInterface<DataType>, ComboBoxPropertyInterface);
TypedComboBoxNodePropertyInterface() = default;
~TypedComboBoxNodePropertyInterface() = default;
virtual ~TypedComboBoxNodePropertyInterface() = default;
// TypedNodePropertyInterface
void ResetToDefault() override
@@ -354,6 +354,7 @@ namespace ScriptCanvas
{
public:
AZ_RTTI(EnumComboBoxNodePropertyInterface, "{7D46B998-9E05-401A-AC92-37A90BAF8F60}", TypedComboBoxNodePropertyInterface<int32_t>);
virtual ~EnumComboBoxNodePropertyInterface() = default;
// No way of identifying Enum types properly yet. Going to fake a BCO object type for now.
static const AZ::Uuid k_EnumUUID;
Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp
+5 -4
View File
@@ -39,13 +39,14 @@ namespace ScriptCanvasDeveloperEditor
{
public:
DynamicSlotFullCreationInterface(DeveloperUtils::ConnectionStyle connectionStyle)
DynamicSlotFullCreationInterface(DeveloperUtils::ConnectionStyle connectionStyle)
{
m_chainConfig.m_connectionStyle = connectionStyle;
m_chainConfig.m_skipHandlers = true;
}
virtual ~DynamicSlotFullCreationInterface() = default;
void SetupInterface(const AZ::EntityId& activeGraphCanvasGraphId, const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
void SetupInterface(const AZ::EntityId& activeGraphCanvasGraphId, const ScriptCanvas::ScriptCanvasId& scriptCanvasId) override
{
m_graphCanvasGraphId = activeGraphCanvasGraphId;
m_scriptCanvasId = scriptCanvasId;
@@ -142,12 +143,12 @@ namespace ScriptCanvasDeveloperEditor
}
}
bool ShouldProcessItem([[maybe_unused]] const GraphCanvas::NodePaletteTreeItem* nodePaletteTreeItem) const
bool ShouldProcessItem([[maybe_unused]] const GraphCanvas::NodePaletteTreeItem* nodePaletteTreeItem) const override
{
return !m_availableVariableIds.empty();
}
void ProcessItem(const GraphCanvas::NodePaletteTreeItem* nodePaletteTreeItem)
void ProcessItem(const GraphCanvas::NodePaletteTreeItem* nodePaletteTreeItem) override
{
AZStd::unordered_set<ScriptCanvasEditor::NodeIdPair> createdPairs;
GraphCanvas::GraphCanvasMimeEvent* mimeEvent = nodePaletteTreeItem->CreateMimeEvent();
Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp
+1 -3
View File
@@ -37,9 +37,7 @@ namespace ScriptCanvasDeveloperEditor
m_variableNameFormat += " %i";
}
~VariablePaletteFullCreationInterface()
{
}
virtual ~VariablePaletteFullCreationInterface() = default;
void SetupInterface([[maybe_unused]] const AZ::EntityId& graphCanvasId, const ScriptCanvas::ScriptCanvasId& scriptCanvasId)
{
Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp
+4 -2
View File
@@ -175,7 +175,7 @@ namespace ScriptCanvasPhysicsTests
MOCK_CONST_METHOD0(GetNativePointer, void*());
};
class MockShape
class MockShape
: public Physics::Shape
{
public:
@@ -203,10 +203,12 @@ namespace ScriptCanvasPhysicsTests
MOCK_METHOD1(SetContactOffset, void(float));
};
class MockPhysicsMaterial
class MockPhysicsMaterial
: public Physics::Material
{
public:
virtual ~MockPhysicsMaterial() = default;
MOCK_CONST_METHOD0(GetSurfaceType, AZ::Crc32());
MOCK_CONST_METHOD0(GetSurfaceTypeName, const AZStd::string&());
MOCK_METHOD1(SetSurfaceTypeName, void(const AZStd::string&));