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

Combo graph code now compiles and functions properly in shipping builds.

Browse Source
This commit is contained in:
Jamie Greunbaum 2023-10-04 13:05:53 -04:00
parent c50c9c6bf7
commit 3d0fedabf6
6 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/ComboInput/Private/Nodes/ComboActionGraphNode.cpp
View File

@ -15,11 +15,12 @@ UComboActionGraphNode::UComboActionGraphNode()
{ {
this->NodeGUID = FGuid::NewGuid(); this->NodeGUID = FGuid::NewGuid();
this->bEnabled = true;
#if WITH_EDITORONLY_DATA #if WITH_EDITORONLY_DATA
this->CompatibleGraphType = UComboActionGraph::StaticClass(); this->CompatibleGraphType = UComboActionGraph::StaticClass();
this->BackgroundColor = FLinearColor::Black; this->BackgroundColor = FLinearColor::Black;
this->bEnabled = true;
this->bAllowInputNodes = true; this->bAllowInputNodes = true;
this->bAllowOutputNodes = true; this->bAllowOutputNodes = true;
@ -37,10 +38,10 @@ UComboActionGraphNode::UComboActionGraphNode()
void UComboActionGraphNode::SetNewWorld(UWorld *NewWorld) void UComboActionGraphNode::SetNewWorld(UWorld *NewWorld)
{ {
if (!NewWorld) return; if (NewWorld)
if (NewWorld == this->OwningWorld) return; {
this->OwningWorld = NewWorld;
this->OwningWorld = NewWorld; }
} }
void UComboActionGraphNode::InitializeNode_Implementation(UWorld *InWorld) void UComboActionGraphNode::InitializeNode_Implementation(UWorld *InWorld)

6
Source/ComboInput/Private/Nodes/ComboActionGraphNode_ActionNodeBase.cpp
View File

@ -151,7 +151,8 @@ void UComboActionGraphNode_ActionNodeBase::PostEditChangeProperty(FPropertyChang
} }
} }
FLinearColor UComboActionGraphNode_ActionNodeBase::GetBackgroundColor() const #if WITH_EDITOR
FLinearColor UComboActionGraphNode_ActionNodeBase::GetBackgroundColour() const
{ {
if (this->ComboAction && this->ComboAction->NodeColor != FLinearColor()) if (this->ComboAction && this->ComboAction->NodeColor != FLinearColor())
{ {
@ -161,8 +162,9 @@ FLinearColor UComboActionGraphNode_ActionNodeBase::GetBackgroundColor() const
{ {
return this->ComboInput->NodeColor; return this->ComboInput->NodeColor;
} }
return Super::GetBackgroundColor(); return Super::GetBackgroundColour();
} }
#endif
FText UComboActionGraphNode_ActionNodeBase::GetDescription_Implementation() const FText UComboActionGraphNode_ActionNodeBase::GetDescription_Implementation() const
{ {

6
Source/ComboInput/Public/Nodes/ComboActionGraphNode.h
View File

@ -325,11 +325,11 @@ public:
virtual FString GetNodeDocumentationLink_Implementation() const; virtual FString GetNodeDocumentationLink_Implementation() const;
/** /**
* Returns the Background Colour for this graph node. * Returns the background colour for this graph node.
* *
* @return The Background Colour for this node. * @return The background colour for this node.
*/ */
virtual FLinearColor GetBackgroundColor() const { return this->BackgroundColor; } virtual FLinearColor GetBackgroundColour() const { return this->BackgroundColor; }
FText GetInternalName() const { return this->NodeTypeName; } FText GetInternalName() const { return this->NodeTypeName; }
// Allows setting up the Node Title // Allows setting up the Node Title

6
Source/ComboInput/Public/Nodes/ComboActionGraphNode_ActionNodeBase.h
View File

@ -39,9 +39,9 @@ public:
virtual bool ValidateNodeRuntime_Implementation() const override; virtual bool ValidateNodeRuntime_Implementation() const override;
virtual FLinearColor GetBackgroundColor() const override; #if WITH_EDITOR
virtual FLinearColor GetBackgroundColour() const override;
public: #endif
#if WITH_EDITORONLY_DATA #if WITH_EDITORONLY_DATA

14
Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.cpp
View File

@ -82,11 +82,6 @@ void UEdComboActionGraphNode::AutowireNewNode(UEdGraphPin* FromPin)
} }
} }
FLinearColor UEdComboActionGraphNode::GetBackgroundColor() const
{
return this->ComboActionGraphNode ? this->ComboActionGraphNode->GetBackgroundColor() : FLinearColor::Black;
}
UEdGraphPin* UEdComboActionGraphNode::GetInputPin() const UEdGraphPin* UEdComboActionGraphNode::GetInputPin() const
{ {
return Pins[0]; return Pins[0];
@ -151,12 +146,19 @@ FText UEdComboActionGraphNode::GetTooltipText() const
return NSLOCTEXT("UEdComboActionGraphNode", "DefaultToolTip", "Combo Action Node"); return NSLOCTEXT("UEdComboActionGraphNode", "DefaultToolTip", "Combo Action Node");
} }
#if WITH_EDITOR
FLinearColor UEdComboActionGraphNode::GetBackgroundColor() const
{
return this->ComboActionGraphNode ? this->ComboActionGraphNode->GetBackgroundColour() : FLinearColor::Black;
}
FSlateIcon UEdComboActionGraphNode::GetIconAndTint(FLinearColor& OutColor) const FSlateIcon UEdComboActionGraphNode::GetIconAndTint(FLinearColor& OutColor) const
{ {
static const FSlateIcon Icon = FSlateIcon(FComboInputSlateStyle::GetAppStyleSetName(), "MDSStyleSet.Node.Icon.small"); static const FSlateIcon Icon = FSlateIcon(FComboInputSlateStyle::GetAppStyleSetName(), "MDSStyleSet.Node.Icon.small");
OutColor = this->ComboActionGraphNode->GetBackgroundColor(); OutColor = this->ComboActionGraphNode->GetBackgroundColour();
return Icon; return Icon;
} }
#endif
void UEdComboActionGraphNode::PostEditUndo() void UEdComboActionGraphNode::PostEditUndo()
{ {

5
Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.h
View File

@ -31,7 +31,6 @@ public:
virtual void PrepareForCopying() override; virtual void PrepareForCopying() override;
virtual void AutowireNewNode(UEdGraphPin *FromPin) override; virtual void AutowireNewNode(UEdGraphPin *FromPin) override;
virtual FLinearColor GetBackgroundColor() const;
virtual UEdGraphPin *GetInputPin() const; virtual UEdGraphPin *GetInputPin() const;
virtual UEdGraphPin *GetOutputPin() const; virtual UEdGraphPin *GetOutputPin() const;
@ -41,11 +40,13 @@ public:
virtual bool CanUserPasteNodes() const; virtual bool CanUserPasteNodes() const;
virtual FText GetTooltipText() const override; virtual FText GetTooltipText() const override;
virtual FSlateIcon GetIconAndTint(FLinearColor &OutColor) const override;
#if WITH_EDITOR #if WITH_EDITOR
virtual void PostEditUndo() override; virtual void PostEditUndo() override;
virtual void PostEditChangeProperty(FPropertyChangedEvent &PropertyChangedEvent) override; virtual void PostEditChangeProperty(FPropertyChangedEvent &PropertyChangedEvent) override;
virtual FLinearColor GetBackgroundColor() const;
virtual FSlateIcon GetIconAndTint(FLinearColor &OutColor) const override;
#endif #endif
UPROPERTY(VisibleAnywhere, Instanced, Category="Combo Action Graph") UPROPERTY(VisibleAnywhere, Instanced, Category="Combo Action Graph")