From 3d0fedabf601c0aaf9afb3b238e68de8dbca84f9 Mon Sep 17 00:00:00 2001 From: Jamie Greunbaum Date: Wed, 4 Oct 2023 13:05:53 -0400 Subject: [PATCH] Combo graph code now compiles and functions properly in shipping builds. --- .../Private/Nodes/ComboActionGraphNode.cpp | 11 ++++++----- .../Nodes/ComboActionGraphNode_ActionNodeBase.cpp | 6 ++++-- .../ComboInput/Public/Nodes/ComboActionGraphNode.h | 6 +++--- .../Nodes/ComboActionGraphNode_ActionNodeBase.h | 6 +++--- .../Private/Ed/EdComboActionGraphNode.cpp | 14 ++++++++------ .../Private/Ed/EdComboActionGraphNode.h | 5 +++-- 6 files changed, 27 insertions(+), 21 deletions(-) diff --git a/Source/ComboInput/Private/Nodes/ComboActionGraphNode.cpp b/Source/ComboInput/Private/Nodes/ComboActionGraphNode.cpp index 0557b8f..a8b665f 100644 --- a/Source/ComboInput/Private/Nodes/ComboActionGraphNode.cpp +++ b/Source/ComboInput/Private/Nodes/ComboActionGraphNode.cpp @@ -15,11 +15,12 @@ UComboActionGraphNode::UComboActionGraphNode() { this->NodeGUID = FGuid::NewGuid(); + this->bEnabled = true; + #if WITH_EDITORONLY_DATA this->CompatibleGraphType = UComboActionGraph::StaticClass(); this->BackgroundColor = FLinearColor::Black; - this->bEnabled = true; this->bAllowInputNodes = true; this->bAllowOutputNodes = true; @@ -37,10 +38,10 @@ UComboActionGraphNode::UComboActionGraphNode() void UComboActionGraphNode::SetNewWorld(UWorld *NewWorld) { - if (!NewWorld) return; - if (NewWorld == this->OwningWorld) return; - - this->OwningWorld = NewWorld; + if (NewWorld) + { + this->OwningWorld = NewWorld; + } } void UComboActionGraphNode::InitializeNode_Implementation(UWorld *InWorld) diff --git a/Source/ComboInput/Private/Nodes/ComboActionGraphNode_ActionNodeBase.cpp b/Source/ComboInput/Private/Nodes/ComboActionGraphNode_ActionNodeBase.cpp index 540fb8a..b55a545 100644 --- a/Source/ComboInput/Private/Nodes/ComboActionGraphNode_ActionNodeBase.cpp +++ b/Source/ComboInput/Private/Nodes/ComboActionGraphNode_ActionNodeBase.cpp @@ -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()) { @@ -161,8 +162,9 @@ FLinearColor UComboActionGraphNode_ActionNodeBase::GetBackgroundColor() const { return this->ComboInput->NodeColor; } - return Super::GetBackgroundColor(); + return Super::GetBackgroundColour(); } +#endif FText UComboActionGraphNode_ActionNodeBase::GetDescription_Implementation() const { diff --git a/Source/ComboInput/Public/Nodes/ComboActionGraphNode.h b/Source/ComboInput/Public/Nodes/ComboActionGraphNode.h index d61b238..fa4cd43 100644 --- a/Source/ComboInput/Public/Nodes/ComboActionGraphNode.h +++ b/Source/ComboInput/Public/Nodes/ComboActionGraphNode.h @@ -325,11 +325,11 @@ public: 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; } // Allows setting up the Node Title diff --git a/Source/ComboInput/Public/Nodes/ComboActionGraphNode_ActionNodeBase.h b/Source/ComboInput/Public/Nodes/ComboActionGraphNode_ActionNodeBase.h index 4d9a902..0ece33d 100644 --- a/Source/ComboInput/Public/Nodes/ComboActionGraphNode_ActionNodeBase.h +++ b/Source/ComboInput/Public/Nodes/ComboActionGraphNode_ActionNodeBase.h @@ -39,9 +39,9 @@ public: virtual bool ValidateNodeRuntime_Implementation() const override; - virtual FLinearColor GetBackgroundColor() const override; - -public: +#if WITH_EDITOR + virtual FLinearColor GetBackgroundColour() const override; +#endif #if WITH_EDITORONLY_DATA diff --git a/Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.cpp b/Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.cpp index 2825cda..08c636e 100644 --- a/Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.cpp +++ b/Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.cpp @@ -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 { return Pins[0]; @@ -151,12 +146,19 @@ FText UEdComboActionGraphNode::GetTooltipText() const 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 { static const FSlateIcon Icon = FSlateIcon(FComboInputSlateStyle::GetAppStyleSetName(), "MDSStyleSet.Node.Icon.small"); - OutColor = this->ComboActionGraphNode->GetBackgroundColor(); + OutColor = this->ComboActionGraphNode->GetBackgroundColour(); return Icon; } +#endif void UEdComboActionGraphNode::PostEditUndo() { diff --git a/Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.h b/Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.h index 605f8ae..812ea3f 100644 --- a/Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.h +++ b/Source/ComboInputEditor/Private/Ed/EdComboActionGraphNode.h @@ -31,7 +31,6 @@ public: virtual void PrepareForCopying() override; virtual void AutowireNewNode(UEdGraphPin *FromPin) override; - virtual FLinearColor GetBackgroundColor() const; virtual UEdGraphPin *GetInputPin() const; virtual UEdGraphPin *GetOutputPin() const; @@ -41,11 +40,13 @@ public: virtual bool CanUserPasteNodes() const; virtual FText GetTooltipText() const override; - virtual FSlateIcon GetIconAndTint(FLinearColor &OutColor) const override; #if WITH_EDITOR virtual void PostEditUndo() override; virtual void PostEditChangeProperty(FPropertyChangedEvent &PropertyChangedEvent) override; + + virtual FLinearColor GetBackgroundColor() const; + virtual FSlateIcon GetIconAndTint(FLinearColor &OutColor) const override; #endif UPROPERTY(VisibleAnywhere, Instanced, Category="Combo Action Graph")