ActualHorse/ComboInput
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code compiles now, at least. That's a start.

Browse Source
This commit is contained in:
Jamie Greunbaum
2023-09-27 12:21:35 -04:00
parent ea4dd54ec9
commit 8b6cfafc45
12 changed files with 111 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/ComboInputEditor/Private/Ed/EdComboActionGraph.cpp
+2 -2
View File
@@ -2,11 +2,11 @@
#include "Ed/EdComboActionGraph.h"
#include "ComboActionGraph.h"
#include "Ed/EdComboActionGraphEdge.h"
#include "Ed/EdComboActionGraphNode.h"
#include "ComboActionGraph.h"
#include "Nodes/ComboActionGraphNode.h"
#include "Nodes/ComboActionGraphEdge.h"
#include "Nodes/ComboActionGraphNode.h"
//#include "Helpers/MounteaDialogueGraphEditorHelpers.h"
//#include "Helpers/MounteaDialogueGraphEditorUtilities.h"
//#include "Helpers/MounteaDialogueSystemEditorBFC.h"
Source/ComboInputEditor/Private/Ed/EdComboActionGraph.h
+3 -3
View File
@@ -11,7 +11,7 @@ DECLARE_LOG_CATEGORY_EXTERN(LogEdComboActionGraph, Log, All);
UCLASS()
class COMBOINPUT_API UEdComboActionGraph : public UEdGraph
class COMBOINPUTEDITOR_API UEdComboActionGraph : public UEdGraph
{
GENERATED_BODY()
@@ -32,10 +32,10 @@ public:
public:
UPROPERTY(Transient)
TMap<class UComboActionGraphNode*, class UEdComboActionGraphNode*> NodeMap;
TMap<class UComboActionGraphNode*, class UEdComboActionGraphNode*> NodeMap;
UPROPERTY(Transient)
TMap<class UComboActionGraphEdge*, class UEdComboActionGraphEdge*> EdgeMap;
TMap<class UComboActionGraphEdge*, class UEdComboActionGraphEdge*> EdgeMap;
protected:
Source/ComboInputEditor/Private/Ed/SEdComboActionGraphNode.cpp
+26 -17
View File
@@ -2,12 +2,12 @@
#include "SEdComboActionGraphNode.h"
#include "ComboInputEditor.h"
#include "Nodes/ComboActionGraphNode.h"
#include "Helpers/ComboActionGraphColors.h"
#include "Ed/SEdComboActionGraphNodeIndex.h"
#include "Ed/EdComboActionGraphNode.h"
//#include "SLevelOfDetailBranchNode.h"
#include "Widgets/Text/SInlineEditableTextBlock.h"
#include "SCommentBubble.h"
#include "SlateOptMacros.h"
@@ -79,18 +79,20 @@ protected:
const FSlateBrush *GetPinBorder() const
{
FComboInputEditorModule &ComboInputEditorModule = FComboInputEditorModule::Get();
if (const UComboActionGraphEditorSettings *GraphEditorSettings = GetMutableDefault<UComboActionGraphEditorSettings>())
{
switch (GraphEditorSettings->GetNodeType())
{
case EComboActionNodeType::SoftCorners:
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.TextSoftEdges");
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.TextSoftEdges");
case EComboActionNodeType::HardCorners:
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.TextHardEdges");
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.TextHardEdges");
}
}
return FComboActionGraphEditorStyle::GetBrush(TEXT("MDSStyleSet.Graph.PinDocksOverlay"));
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush(TEXT("MDSStyleSet.Graph.PinDocksOverlay"));
}
};
@@ -128,7 +130,8 @@ void SEdComboActionGraphNode::OnMouseLeave(const FPointerEvent& MouseEvent)
const FSlateBrush *SEdComboActionGraphNode::GetIndexBrush() const
{
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.TextSoftEdges");
FComboInputEditorModule &ComboInputEditorModule = FComboInputEditorModule::Get();
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.TextSoftEdges");
}
BEGIN_SLATE_FUNCTION_BUILD_OPTIMIZATION
@@ -155,8 +158,9 @@ void SEdComboActionGraphNode::UpdateGraphNode()
TSharedPtr<SVerticalBox> UniformBox;
this->ContentScale.Bind(this, &SGraphNode::GetContentScale);
const FSlateBrush* CircleBrush = FComboActionGraphEditorStyle::GetBrush(TEXT("MDSStyleSet.Node.IndexCircle"));
FComboInputEditorModule &ComboInputEditorModule = FComboInputEditorModule::Get();
const FSlateBrush *CircleBrush = ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush(TEXT("MDSStyleSet.Node.IndexCircle"));
this->GetOrAddSlot(ENodeZone::Left)
.SlotOffset(TAttribute<FVector2D>(this, &SEdComboActionGraphNode::GetIndexSlotOffset))
.SlotSize(TAttribute<FVector2D>(this, &SEdComboActionGraphNode::GetIndexSlotSize))
@@ -378,7 +382,7 @@ void SEdComboActionGraphNode::UpdateGraphNode()
.AutoHeight()
[
SAssignNew(InlineEditableText, SInlineEditableTextBlock)
.Style(FComboActionGraphEditorStyle::Get(), "MDSStyleSet.NodeTitleInlineEditableText")
.Style(ComboInputEditorModule.ComboActionGraphEditorStyleSet.Get(), "MDSStyleSet.NodeTitleInlineEditableText")
.Text(NodeTitle.Get(), &SNodeTitle::GetHeadTitle)
.OnVerifyTextChanged(
this, &SEdComboActionGraphNode::OnVerifyNameTextChanged)
@@ -994,34 +998,36 @@ void SEdComboActionGraphNode::OnNameTextCommitted(const FText& InText, ETextComm
const FSlateBrush *SEdComboActionGraphNode::GetNodeTypeBrush() const
{
FComboInputEditorModule &ComboInputEditorModule = FComboInputEditorModule::Get();
if (GraphEditorSettings)
{
switch (GraphEditorSettings->GetNodeType())
{
case EComboActionNodeType::SoftCorners:
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.SoftEdges");
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.SoftEdges");
case EComboActionNodeType::HardCorners:
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.HardEdges");
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.HardEdges");
}
}
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.SoftEdges");
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.SoftEdges");
}
const FSlateBrush *SEdComboActionGraphNode::GetTextNodeTypeBrush() const
{
FComboInputEditorModule &ComboInputEditorModule = FComboInputEditorModule::Get();
if (GraphEditorSettings)
{
switch (GraphEditorSettings->GetNodeType())
{
case EComboActionNodeType::SoftCorners:
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.TextSoftEdges");
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.TextSoftEdges");
case EComboActionNodeType::HardCorners:
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.TextHardEdges");
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.TextHardEdges");
}
}
return FComboActionGraphEditorStyle::GetBrush("MDSStyleSet.Node.TextSoftEdges");
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush("MDSStyleSet.Node.TextSoftEdges");
}
FSlateColor SEdComboActionGraphNode::GetBorderBackgroundColor() const
@@ -1084,6 +1090,8 @@ const FSlateBrush*SEdComboActionGraphNode::GetNameIcon() const
const FSlateBrush*SEdComboActionGraphNode::GetInheritsImageBrush() const
{
FComboInputEditorModule &ComboInputEditorModule = FComboInputEditorModule::Get();
bool bHasDecorators = false;
if (const UEdComboActionGraphNode *EdParentNode = Cast<UEdComboActionGraphNode>(this->GraphNode))
{
@@ -1093,7 +1101,7 @@ const FSlateBrush*SEdComboActionGraphNode::GetInheritsImageBrush() const
}
}
return FComboActionGraphEditorStyle::GetBrush( bHasDecorators ? "MDSStyleSet.Icon.OK" : "MDSStyleSet.Icon.Error" );
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush( bHasDecorators ? "MDSStyleSet.Icon.OK" : "MDSStyleSet.Icon.Error" );
}
FSlateColor SEdComboActionGraphNode::GetInheritsImageTint() const
@@ -1112,7 +1120,8 @@ FSlateColor SEdComboActionGraphNode::GetInheritsImageTint() const
const FSlateBrush*SEdComboActionGraphNode::GetBulletPointImageBrush() const
{
return FComboActionGraphEditorStyle::GetBrush( "MDSStyleSet.Icon.BulletPoint" );
FComboInputEditorModule &ComboInputEditorModule = FComboInputEditorModule::Get();
return ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush( "MDSStyleSet.Icon.BulletPoint" );
}
FText SEdComboActionGraphNode::GetIndexOverlayTooltipText() const
Source/ComboInputEditor/Private/Ed/SEdComboActionGraphNodeIndex.cpp
+3 -1
View File
@@ -2,12 +2,14 @@
#include "SEdComboActionGraphNodeIndex.h"
#include "ComboInputEditor.h"
#include "Settings/FComboActionGraphEditorStyle.h"
void SEdComboActionGraphNodeIndex::Construct(const FArguments &InArgs)
{
const FSlateBrush* CircleBrush = FComboActionGraphEditorStyle::GetBrush(TEXT("MDSStyleSet.Node.IndexCircle"));
FComboInputEditorModule &ComboInputEditorModule = FComboInputEditorModule::Get();
const FSlateBrush* CircleBrush = ComboInputEditorModule.ComboActionGraphEditorStyleSet->GetBrush(TEXT("MDSStyleSet.Node.IndexCircle"));
ChildSlot
[
SNew(SOverlay)