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

The Great ScriptCanvas Purge, Part II

Browse Source 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
This commit is contained in:
chcurran
2021-07-01 17:08:16 -07:00
parent 0e8f8e5a7f
commit fea83b0b51
25 changed files with 54 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp
-41
View File
@@ -27,47 +27,6 @@
namespace ScriptCanvasEditor
{
/////////////////////////////////
// CreateEntityRefNodeMimeEvent
/////////////////////////////////
void CreateEntityRefNodeMimeEvent::Reflect(AZ::ReflectContext* reflectContext)
{
AZ::SerializeContext* serializeContext = azrtti_cast<AZ::SerializeContext*>(reflectContext);
if (serializeContext)
{
serializeContext->Class<CreateEntityRefNodeMimeEvent, GraphCanvas::GraphCanvasMimeEvent>()
->Version(0)
->Field("EntityId", &CreateEntityRefNodeMimeEvent::m_entityId)
;
}
}
CreateEntityRefNodeMimeEvent::CreateEntityRefNodeMimeEvent(const AZ::EntityId& entityId)
: m_entityId(entityId)
{
}
ScriptCanvasEditor::NodeIdPair CreateEntityRefNodeMimeEvent::CreateNode(const ScriptCanvas::ScriptCanvasId& scriptCanvasId) const
{
return Nodes::CreateEntityNode(m_entityId, scriptCanvasId);
}
/////////////////////////////////
// EntityRefNodePaletteTreeItem
/////////////////////////////////
EntityRefNodePaletteTreeItem::EntityRefNodePaletteTreeItem(AZStd::string_view nodeName, [[maybe_unused]] const QString& iconPath)
: DraggableNodePaletteTreeItem(nodeName, ScriptCanvasEditor::AssetEditorId)
{
}
GraphCanvas::GraphCanvasMimeEvent* EntityRefNodePaletteTreeItem::CreateMimeEvent() const
{
return aznew CreateEntityRefNodeMimeEvent();
}
///////////////////////////////
// CreateCommentNodeMimeEvent
///////////////////////////////
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.h
-33
View File
@@ -11,39 +11,6 @@
namespace ScriptCanvasEditor
{
// <EntityRefNode>
class CreateEntityRefNodeMimeEvent
: public CreateNodeMimeEvent
{
public:
AZ_RTTI(CreateEntityRefNodeMimeEvent, "{20CD5AF5-216E-4A41-9630-191C2803899B}", CreateNodeMimeEvent);
AZ_CLASS_ALLOCATOR(CreateEntityRefNodeMimeEvent, AZ::SystemAllocator, 0);
static void Reflect(AZ::ReflectContext* reflectContext);
CreateEntityRefNodeMimeEvent() = default;
CreateEntityRefNodeMimeEvent(const AZ::EntityId& entityId);
~CreateEntityRefNodeMimeEvent() = default;
protected:
ScriptCanvasEditor::NodeIdPair CreateNode(const ScriptCanvas::ScriptCanvasId& scriptCanvasId) const override;
private:
AZ::EntityId m_entityId;
};
class EntityRefNodePaletteTreeItem
: public GraphCanvas::DraggableNodePaletteTreeItem
{
public:
AZ_CLASS_ALLOCATOR(EntityRefNodePaletteTreeItem, AZ::SystemAllocator, 0);
EntityRefNodePaletteTreeItem(AZStd::string_view nodeName, const QString& iconPath);
~EntityRefNodePaletteTreeItem() = default;
GraphCanvas::GraphCanvasMimeEvent* CreateMimeEvent() const override;
};
// </EntityRefNode>
// <CommentNode>
class CreateCommentNodeMimeEvent
: public SpecializedCreateNodeMimeEvent
Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp
-1
View File
@@ -30,7 +30,6 @@
#include "Editor/Include/ScriptCanvas/GraphCanvas/NodeDescriptorBus.h"
#include <Core/Attributes.h>
#include <Libraries/Core/Assign.h>
#include <Libraries/Core/Method.h>
#include <Editor/GraphCanvas/GraphCanvasEditorNotificationBusId.h>
Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp
-61
View File
@@ -55,59 +55,6 @@
namespace ScriptCanvasEditor
{
//////////////////////////////
// AddSelectedEntitiesAction
//////////////////////////////
AddSelectedEntitiesAction::AddSelectedEntitiesAction(QObject* parent)
: GraphCanvas::ContextMenuAction("", parent)
{
}
GraphCanvas::ActionGroupId AddSelectedEntitiesAction::GetActionGroupId() const
{
return AZ_CRC("EntityActionGroup", 0x17e16dfe);
}
void AddSelectedEntitiesAction::RefreshAction(const GraphCanvas::GraphId&, const AZ::EntityId&)
{
AzToolsFramework::EntityIdList selectedEntities;
AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
setEnabled(!selectedEntities.empty());
if (selectedEntities.size() <= 1)
{
setText("Reference selected entity");
}
else
{
setText("Reference selected entities");
}
}
GraphCanvas::ContextMenuAction::SceneReaction AddSelectedEntitiesAction::TriggerAction(const AZ::EntityId& graphCanvasGraphId, const AZ::Vector2& scenePos)
{
AzToolsFramework::EntityIdList selectedEntities;
AzToolsFramework::ToolsApplicationRequests::Bus::BroadcastResult(selectedEntities, &AzToolsFramework::ToolsApplicationRequests::GetSelectedEntities);
ScriptCanvas::ScriptCanvasId scriptCanvasId;
GeneralRequestBus::BroadcastResult(scriptCanvasId, &GeneralRequests::GetScriptCanvasId, graphCanvasGraphId);
GraphCanvas::SceneRequestBus::Event(graphCanvasGraphId, &GraphCanvas::SceneRequests::ClearSelection);
AZ::Vector2 addPosition = scenePos;
for (const AZ::EntityId& id : selectedEntities)
{
NodeIdPair nodePair = Nodes::CreateEntityNode(id, scriptCanvasId);
GraphCanvas::SceneRequestBus::Event(graphCanvasGraphId, &GraphCanvas::SceneRequests::AddNode, nodePair.m_graphCanvasId, addPosition, false);
addPosition += AZ::Vector2(20, 20);
}
return GraphCanvas::ContextMenuAction::SceneReaction::PostUndo;
}
////////////////////////////
// EndpointSelectionAction
////////////////////////////
@@ -860,12 +807,6 @@ namespace ScriptCanvasEditor
{
const bool inContextMenu = true;
Widget::ScriptCanvasNodePaletteConfig paletteConfig(paletteModel, assetModel, inContextMenu);
m_addSelectedEntitiesAction = aznew AddSelectedEntitiesAction(this);
AddActionGroup(m_addSelectedEntitiesAction->GetActionGroupId());
AddMenuAction(m_addSelectedEntitiesAction);
AddNodePaletteMenuAction(paletteConfig);
}
@@ -905,8 +846,6 @@ namespace ScriptCanvasEditor
m_graphCanvasConstructGroups.SetCommentsEnabled(false);
m_nodeGroupPresets.SetEnabled(false);
m_alignmentActionsGroups.SetEnabled(false);
m_addSelectedEntitiesAction->setEnabled(false);
}
//////////////////////////
Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.h
-18
View File
@@ -32,22 +32,6 @@ namespace ScriptCanvasEditor
// CustomActions
//////////////////
class AddSelectedEntitiesAction
: public GraphCanvas::ContextMenuAction
{
Q_OBJECT
public:
AZ_CLASS_ALLOCATOR(AddSelectedEntitiesAction, AZ::SystemAllocator, 0);
AddSelectedEntitiesAction(QObject* parent);
virtual ~AddSelectedEntitiesAction() = default;
GraphCanvas::ActionGroupId GetActionGroupId() const override;
void RefreshAction(const GraphCanvas::GraphId& graphCanvasGraphId, const AZ::EntityId& targetId) override;
SceneReaction TriggerAction(const GraphCanvas::GraphId& graphCanvasGraphId, const AZ::Vector2& scenePos) override;
};
class EndpointSelectionAction
: public QAction
{
@@ -217,8 +201,6 @@ namespace ScriptCanvasEditor
protected:
AZ::EntityId m_sourceSlotId;
AddSelectedEntitiesAction* m_addSelectedEntitiesAction;
};
class ConnectionContextMenu