Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit ea7e0d4
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Wed Mar 30 20:25:27 2022 +0200

    added Is Input Connected method #96

commit acd4260
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Wed Mar 30 19:49:32 2022 +0200

    polishing up last PRs

commit f2f5328
Author: Joseph <joseph@ascent.ai>
Date:   Thu Mar 31 02:13:17 2022 +0900

    Added a custom dilation from the parent actor (#90)

    while playing the level sequence.

commit 6398cf3
Author: Erdem Acar <50913011+kathelon@users.noreply.github.com>
Date:   Wed Mar 30 20:04:46 2022 +0300

    Added timer restart pin. (#94)

commit fc661a2
Author: Markus Ahrweiler <Mephiztopheles@users.noreply.github.com>
Date:   Wed Mar 30 18:58:44 2022 +0200

    Added DeniedClasses as option to blacklist FlowNodes (#92)

commit f915b7d
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Mar 25 19:10:01 2022 +0100

    crash fix

commit 68726c8
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Mar 25 17:28:58 2022 +0100

    CIS fix

commit be4e496
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Mar 25 17:02:57 2022 +0100

    SaveGame fix: don't remove saved data from other worlds while saving

commit 1baf450
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Mar 10 14:20:32 2022 +0100

    clear data, in case we received here reused SaveGame object

commit 5bf8dd6
Author: Krzysiek Justyński <krzysiek.justynski@gmail.com>
Date:   Tue Mar 8 13:04:00 2022 +0100

    Update README.md

commit 21ec316
Author: Guy Lundvall <47373221+Drakynfly@users.noreply.github.com>
Date:   Tue Mar 8 03:59:13 2022 -0800

    fix localization collision caused by identical keys (#95)

commit 4cb9ec2
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Feb 22 16:23:07 2022 +0100

    do not call Start node on Sub Graph loaded from save

commit d836e91
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Feb 13 19:35:59 2022 +0100

    #91 Visualize in graph that Flow Node class is marked as "Deprecated"

commit 18b064e
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Jan 28 16:18:23 2022 +0100

    added include

commit b0b4736
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Jan 28 16:01:07 2022 +0100

    Only create Flow Subsystem instance if there is no override implementation defined

commit ca6b535
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Jan 28 15:57:09 2022 +0100

    fixed refreshing SFlowAssetInstanceList

commit 0a27024
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Jan 28 15:57:09 2022 +0100

    fixed refreshing SFlowAssetInstanceList

commit cb90eaf
Author: Satheesh (ryanjon2040) <ryanjon2040@users.noreply.github.com>
Date:   Fri Jan 28 16:36:08 2022 +0530

    Fix start node deletable (#71)

commit eaf2f99
Author: Guy Lundvall <47373221+Drakynfly@users.noreply.github.com>
Date:   Fri Jan 28 02:57:30 2022 -0800

    Fix minor typo (#88)

commit 0cd2809
Author: Luna Ryuko Zaremba <contact@lunaryuko.space>
Date:   Thu Jan 27 17:02:55 2022 +0100

    Make UFlowNodeBlueprint not final, so it can be subclassed (#87)

commit ca6ab81
Author: Luna Ryuko Zaremba <contact@lunaryuko.space>
Date:   Thu Jan 27 17:02:55 2022 +0100

    Make UFlowNodeBlueprint not final, so it can be subclassed (#87)

commit bffcaf4
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Jan 24 11:56:16 2022 +0100

    bump version to 1.2

commit e618dbe
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Jan 16 20:31:12 2022 +0100

    allow to customize Flow Asset Category Name

commit 4e07528
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Dec 23 21:22:14 2021 +0100

    added nullchecks on Sequence Player

    fixes a rare crash occurring blueprint caused infinite loop before calling CreatePlayer method

commit 8b7df0f
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Dec 21 20:23:28 2021 +0100

    clear old bindings before binding again, which might happen while loading a SaveGame

commit eb398d3
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Dec 19 14:11:55 2021 +0100

    fixed case where Root Flow wouldn't be properly finished and cleaned up

    bug reported and fixed by BorMor

commit eb6233d
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Dec 19 14:03:27 2021 +0100

    SaveGame fix: restoring state Recorded Nodes and Active Nodes on load

    Based on BorMor report and fix

commit d37787a
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sat Dec 18 19:09:56 2021 +0100

    added unique Referencer Name

commit 8d043b6
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sat Dec 18 19:09:24 2021 +0100

    added include + cleanup

commit 7094fb5
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sat Dec 18 19:08:55 2021 +0100

    unused property removed

commit 9d7df13
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sat Dec 18 19:08:35 2021 +0100

    removed hacky loading all Flow Assets, unused

    only caused issues with functional tests

commit 0c7bab9
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sat Dec 18 15:20:11 2021 +0100

    Data Validation now checks if node class does exist

commit c998f72
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Dec 16 19:52:05 2021 +0100

    Fixed and optimized check preventing dirtying Flow Asset on harvesting node connections

commit 91ad7f8
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Nov 29 21:59:47 2021 +0100

    tweaked include order

commit d8dab6c
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Nov 29 21:14:15 2021 +0100

    documentation on EFlowFinishPolicy

commit 7ad4dd7
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Nov 29 21:09:57 2021 +0100

    Mark entire HarvestNodeConnections method as editor-only

commit b283d53
Author: Mahoukyou <dawidwdowiak@hotmail.com>
Date:   Mon Nov 29 20:52:46 2021 +0100

    Fix node not being registered with the asset after undoing it's deletion (#74)

commit 296a84d
Author: Sergey Vikhirev <truesmb@gmail.com>
Date:   Mon Nov 29 23:45:09 2021 +0400

    FlowNode_Timer's RemainingStepTime should be used only for first timer tick (#75)

commit fbc7208
Author: Sergey Vikhirev <truesmb@gmail.com>
Date:   Mon Nov 29 23:27:01 2021 +0400

    Clear previously selected nodes before new node creation (#77)

commit 9865f65
Author: Sergey Vikhirev <truesmb@gmail.com>
Date:   Mon Nov 29 23:26:42 2021 +0400

    Make UFlowSubsystem::CreateRootFlow public (#76)

commit dbcea32
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sat Nov 27 22:04:40 2021 +0100

    compilaton fixed against recent engine's code

commit c808530
Author: Proboszcz777 <watroba.grzegorz@gmail.com>
Date:   Wed Nov 17 20:55:52 2021 +0100

    Update FlowAsset.cpp (#73)

    Prevention of auto checkout when instancing flow asset

commit 63cd32e
Author: Satheesh (ryanjon2040) <ryanjon2040@users.noreply.github.com>
Date:   Thu Nov 11 19:58:51 2021 +0530

    #14: Double clicking on wire creates reroute node (PR #70)

commit 0c429d7
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Nov 9 11:18:28 2021 +0100

    Allowed Node Classes list filters out what nodes can be placed in given Flow Asset type

commit 043de45
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Nov 7 20:50:33 2021 +0100

    5.0 compilation fix

commit 093207f
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Nov 4 15:11:54 2021 +0100

    Timer node is no longer final, it can be extended

commit 167f5f3
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Nov 1 16:26:17 2021 +0100

    exposed Camera Settings on Play Level Sequence node

commit 524d0ab
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Nov 1 12:47:15 2021 +0100

    Created UFlowGraphEditorSettings, SFlowGraphNode_SubGraph

    followed by cosmetic tweaks of recent pull requests

commit 91ee21d
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Oct 31 16:07:22 2021 +0100

    actually pass ValidatedTags to notify event and replication

    Issue found by Mahoukyou

commit aef5bed
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Oct 26 12:47:21 2021 +0200

    removed duplicated GetNodeInstance method

    + const correctness

commit 5e551b1
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Oct 25 23:09:00 2021 +0200

    minor tweaks to displayed node path

commit aa68c4b
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Oct 25 22:53:57 2021 +0200

    removed Fatal option, copy-pasted tooltips from ELogVerbosity

commit 889624b
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Oct 25 22:19:17 2021 +0200

    fixed and improved PR

commit d5d4a21
Author: Satheesh (ryanjon2040) <ryanjon2040@users.noreply.github.com>
Date:   Tue Oct 26 01:19:26 2021 +0530

    Add asset path on flow node (#60)

commit 0f57985
Author: Satheesh (ryanjon2040) <ryanjon2040@users.noreply.github.com>
Date:   Tue Oct 26 01:17:52 2021 +0530

    Add log verbosity (#58)

commit 7893e25
Author: Satheesh (ryanjon2040) <ryanjon2040@users.noreply.github.com>
Date:   Tue Oct 26 01:17:44 2021 +0530

    Add bubbles to circuit connection (#61)

commit 42ff04b
Author: Markus Ahrweiler <Mephiztopheles@users.noreply.github.com>
Date:   Mon Oct 25 21:48:38 2021 +0200

    set custom color for even "native" nodes (#59)

commit abed98a
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Oct 24 21:00:41 2021 +0200

    #63 prevent updating Flow objects while compiling any blueprint

commit 62c02fd
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Oct 24 19:11:18 2021 +0200

    #57 don't cache node categories, loading blueprint too soon might cause compilation issues

    the additional benefit is that Flow Palette would refresh after changing properties of Flow Node class

commit 8df0f2b
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Wed Oct 13 20:55:36 2021 +0200

    cosmetic tweaks

commit c0bd98b
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Oct 11 20:43:09 2021 +0200

    exposed World Asset Class

commit 9e6b57d
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Oct 10 00:49:43 2021 +0200

    #56 crash fix + optimizations

commit 5ee34b8
Author: Satheesh (ryanjon2040) <ryanjon2040@users.noreply.github.com>
Date:   Wed Oct 6 02:00:47 2021 +0530

    Implement graph tooltip. (#55)

    * Implement graph tooltip.

    * Show path of graph in tooltip preview

commit 06a614f
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Sep 28 22:18:35 2021 +0200

    use standard connection style by default

commit 00c33b5
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Sep 28 22:10:40 2021 +0200

    Update FlowNode_PlayLevelSequenceDetails.cpp

commit c634c33
Author: Satheesh (ryanjon2040) <ryanjon2040@users.noreply.github.com>
Date:   Wed Sep 29 01:28:59 2021 +0530

    Add circuit connection drawing. (#54)

commit 3b88e66
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Sep 28 20:59:50 2021 +0200

    removed redundant Extensibility Managers

commit a73dfae
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Sep 28 20:59:08 2021 +0200

    toolbar classes merged, a lot of Flow Asset methods made virtual

commit 24ce1b0
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Sep 28 20:43:50 2021 +0200

    replace method deprecated in UE5

commit 6013d68
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Tue Sep 28 20:43:06 2021 +0200

    const correctness

commit 7247497
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Sep 24 14:07:41 2021 +0200

    exposed engine's Playback Settings

commit 4828381
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Sep 24 13:57:54 2021 +0200

    typo fix

commit e4493e2
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Sep 20 23:26:20 2021 +0200

    prevent starting Flow from the obsolete AWorldSettings actor that still exists in the world

commit f9f66eb
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Sep 5 22:20:01 2021 +0200

    ue5-main fixes

commit 3100f2c
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Sep 5 18:53:14 2021 +0200

    updated Reikon acknowledgement

commit 214ecfb
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Sep 3 00:52:25 2021 +0200

    exposed NetMode parameter, passing it to NotifyFromGraph()

commit 1ec1c92
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Sep 3 00:51:36 2021 +0200

    added Identity Match Type, improves Component Observer

commit f07ec26
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Sep 3 00:50:39 2021 +0200

    const correctness

commit a3e54ee
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Fri Sep 3 00:50:26 2021 +0200

    copy-paste fixed

commit 00d93ce
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Aug 23 23:50:20 2021 +0200

    using Viewport Stats Subsystem to display permanent error messages

commit 0d4fcdc
Author: Constantine Romakhov <34831419+Solessfir@users.noreply.github.com>
Date:   Thu Aug 19 17:28:23 2021 +0300

    Fixed Engine version string in Flow.uplugin could not be parsed (#51)

commit 53ed6ca
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Aug 16 23:10:41 2021 +0200

    allow to hide Flow Asset and Flow Node from "Create Asset" menu

commit edf0760
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Aug 16 22:27:21 2021 +0200

    removing flawed UI customization

commit 1aa1792
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Aug 15 11:13:08 2021 +0200

    fixed API deprecation warning

commit efad2d8
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Sun Aug 15 11:12:55 2021 +0200

    const correctness

commit b074389
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Aug 5 15:49:35 2021 +0200

    adjusted padding

commit 6b4a923
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Aug 5 15:46:32 2021 +0200

    removed zombie tab, it appears that we don't need to manually add Toolbar Tab in UE5

commit cefa156
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Aug 5 15:35:45 2021 +0200

    removed High Detail layout since it doesn't apply to UE5 level editor toolbar

commit 64a22ce
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Aug 5 15:34:53 2021 +0200

    fixed registering asset toolbar

commit 4403621
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Thu Aug 5 14:17:56 2021 +0200

    added option to hide Asset Toolbar above Level Editor

commit e02b422
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Wed Aug 4 21:04:09 2021 +0200

    new nodes: On Actor Registered, On Actor Unregistered

commit 68c86a7
Author: Moth Doctor <krzysiek.justynski@gmail.com>
Date:   Mon Aug 2 18:32:44 2021 +0200

    intial UE 5 support
  • Loading branch information
@MothDoctor
MothDoctor committed Apr 5, 2022
1 parent 9f8d1db commit 593b26b
Show file tree
Hide file tree
Showing 11 changed files with 39 additions and 78 deletions.
2 changes: 1 addition & 1 deletion Flow.uplugin
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"DocsURL" : "https://github.com/MothCocoon/FlowGraph/wiki",
"MarketplaceURL" : "",
"SupportURL": "https://discord.gg/zMtMQ2vUUa",
"EngineVersion": "4.27.0",
"EngineAssociation": "5.0",
"EnabledByDefault" : true,
"CanContainContent" : false,
"IsBetaVersion" : false,
Expand Down
2 changes: 1 addition & 1 deletion Source/Flow/Private/LevelSequence/FlowLevelSequencePlayer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ UFlowLevelSequencePlayer* UFlowLevelSequencePlayer::CreateFlowLevelSequencePlaye
ALevelSequenceActor* Actor = World->SpawnActor<AFlowLevelSequenceActor>(SpawnParams);

Actor->PlaybackSettings = Settings;
Actor->LevelSequence = LevelSequence;
Actor->LevelSequenceAsset = LevelSequence;
Actor->CameraSettings = CameraSettings;

Actor->InitializePlayer();
Expand Down
1 change: 1 addition & 0 deletions Source/FlowEditor/FlowEditor.Build.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public FlowEditor(ReadOnlyTargetRules Target) : base(Target)
"CoreUObject",
"DetailCustomizations",
"DeveloperSettings",
"EditorFramework",
"EditorStyle",
"Engine",
"GraphEditor",
Expand Down
54 changes: 21 additions & 33 deletions Source/FlowEditor/Private/Asset/FlowAssetEditor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ TSharedRef<SDockTab> FFlowAssetEditor::SpawnTab_Details(const FSpawnTabArgs& Arg
check(Args.GetTabId() == DetailsTab);

return SNew(SDockTab)
.Icon(FEditorStyle::GetBrush("LevelEditor.Tabs.Details"))
.Label(LOCTEXT("FlowDetailsTitle", "Details"))
[
DetailsView.ToSharedRef()
Expand All @@ -162,11 +161,10 @@ TSharedRef<SDockTab> FFlowAssetEditor::SpawnTab_Palette(const FSpawnTabArgs& Arg
check(Args.GetTabId() == PaletteTab);

return SNew(SDockTab)
.Icon(FEditorStyle::GetBrush("Kismet.Tabs.Palette"))
.Label(LOCTEXT("FlowPaletteTitle", "Palette"))
[
Palette.ToSharedRef()
];
[
Palette.ToSharedRef()
];
}

void FFlowAssetEditor::InitFlowAssetEditor(const EToolkitMode::Type Mode, const TSharedPtr<class IToolkitHost>& InitToolkitHost, UObject* ObjectToEdit)
Expand All @@ -186,38 +184,28 @@ void FFlowAssetEditor::InitFlowAssetEditor(const EToolkitMode::Type Mode, const
BindGraphCommands();
CreateWidgets();

const TSharedRef<FTabManager::FLayout> StandaloneDefaultLayout = FTabManager::NewLayout("FlowAssetEditor_Layout_v2")
const TSharedRef<FTabManager::FLayout> StandaloneDefaultLayout = FTabManager::NewLayout("FlowAssetEditor_Layout_v3")
->AddArea
(
FTabManager::NewPrimaryArea()->SetOrientation(Orient_Vertical)
FTabManager::NewPrimaryArea()->SetOrientation(Orient_Horizontal)
->Split
(
FTabManager::NewStack()
->SetSizeCoefficient(0.225f)
->AddTab(DetailsTab, ETabState::OpenedTab)
)
->Split
(
FTabManager::NewStack()
->SetSizeCoefficient(0.1f)
->AddTab(GetToolbarTabId(), ETabState::OpenedTab)->SetHideTabWell(true)
)
(
FTabManager::NewStack()
->SetSizeCoefficient(0.65f)
->AddTab(GraphTab, ETabState::OpenedTab)->SetHideTabWell(true)
)
->Split
(
FTabManager::NewSplitter()->SetOrientation(Orient_Horizontal)->SetSizeCoefficient(0.9f)
->Split
(
FTabManager::NewStack()
->SetSizeCoefficient(0.225f)
->AddTab(DetailsTab, ETabState::OpenedTab)
)
->Split
(
FTabManager::NewStack()
->SetSizeCoefficient(0.65f)
->AddTab(GraphTab, ETabState::OpenedTab)->SetHideTabWell(true)
)
->Split
(
FTabManager::NewStack()
->SetSizeCoefficient(0.125f)
->AddTab(PaletteTab, ETabState::OpenedTab)
)
)
(
FTabManager::NewStack()
->SetSizeCoefficient(0.125f)
->AddTab(PaletteTab, ETabState::OpenedTab)
)
);

constexpr bool bCreateDefaultStandaloneMenu = true;
Expand Down
2 changes: 1 addition & 1 deletion Source/FlowEditor/Private/FlowEditorModule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ void FFlowEditorModule::StartupModule()
if (FLevelEditorModule* LevelEditorModule = FModuleManager::GetModulePtr<FLevelEditorModule>(TEXT("LevelEditor")))
{
const TSharedPtr<FExtender> MenuExtender = MakeShareable(new FExtender());
MenuExtender->AddToolBarExtension("Game", EExtensionHook::After, nullptr, FToolBarExtensionDelegate::CreateRaw(this, &FFlowEditorModule::CreateFlowToolbar));
MenuExtender->AddToolBarExtension("Play", EExtensionHook::After, nullptr, FToolBarExtensionDelegate::CreateRaw(this, &FFlowEditorModule::CreateFlowToolbar));
LevelEditorModule->GetToolBarExtensibilityManager()->AddExtender(MenuExtender);
}
}
Expand Down
6 changes: 2 additions & 4 deletions Source/FlowEditor/Private/Graph/FlowGraphSchema.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include "AssetRegistryModule.h"
#include "Developer/ToolMenus/Public/ToolMenus.h"
#include "EdGraph/EdGraph.h"
#include "Misc/HotReloadInterface.h"
#include "ScopedTransaction.h"
#include "UObject/UObjectIterator.h"

Expand All @@ -41,8 +40,7 @@ void UFlowGraphSchema::SubscribeToAssetChanges()
AssetRegistry.Get().OnAssetAdded().AddStatic(&UFlowGraphSchema::OnAssetAdded);
AssetRegistry.Get().OnAssetRemoved().AddStatic(&UFlowGraphSchema::OnAssetRemoved);

IHotReloadInterface& HotReloadSupport = FModuleManager::LoadModuleChecked<IHotReloadInterface>("HotReload");
HotReloadSupport.OnHotReload().AddStatic(&UFlowGraphSchema::OnHotReload);
FCoreUObjectDelegates::ReloadCompleteDelegate.AddStatic(&UFlowGraphSchema::OnHotReload);

if (GEditor)
{
Expand Down Expand Up @@ -408,7 +406,7 @@ void UFlowGraphSchema::GatherFlowNodes()
OnNodeListChanged.Broadcast();
}

void UFlowGraphSchema::OnHotReload(bool bWasTriggeredAutomatically)
void UFlowGraphSchema::OnHotReload(EReloadCompleteReason ReloadCompleteReason)
{
GatherFlowNodes();
}
Expand Down
6 changes: 3 additions & 3 deletions Source/FlowEditor/Private/Graph/Nodes/FlowGraphNode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -746,7 +746,7 @@ void UFlowGraphNode::RemoveOrphanedPin(UEdGraphPin* Pin)

PinBreakpoints.Remove(Pin);

Pin->MarkPendingKill();
Pin->MarkAsGarbage();
Pins.Remove(Pin);

ReconstructNode();
Expand Down Expand Up @@ -821,7 +821,7 @@ void UFlowGraphNode::RemoveInstancePin(UEdGraphPin* Pin)
InputPins.Remove(Pin);
FlowNode->RemoveUserInput();

Pin->MarkPendingKill();
Pin->MarkAsGarbage();
Pins.Remove(Pin);
}
}
Expand All @@ -832,7 +832,7 @@ void UFlowGraphNode::RemoveInstancePin(UEdGraphPin* Pin)
OutputPins.Remove(Pin);
FlowNode->RemoveUserOutput();

Pin->MarkPendingKill();
Pin->MarkAsGarbage();
Pins.Remove(Pin);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Source/FlowEditor/Private/Graph/Widgets/SFlowPalette.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ void SFlowPaletteItem::Construct(const FArguments& InArgs, FCreateWidgetForActio
const bool bIsReadOnly = false;

const TSharedRef<SWidget> IconWidget = CreateIconWidget(IconToolTip, IconBrush, IconColor);
const TSharedRef<SWidget> NameSlotWidget = CreateTextSlotWidget(NameFont, InCreateData, bIsReadOnly);
const TSharedRef<SWidget> NameSlotWidget = CreateTextSlotWidget(InCreateData, bIsReadOnly);
const TSharedRef<SWidget> HotkeyDisplayWidget = CreateHotkeyDisplayWidget(NameFont, HotkeyChord);

// Create the actual widget
Expand Down
34 changes: 4 additions & 30 deletions Source/FlowEditor/Private/LevelEditor/SLevelEditorFlow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
#include "Graph/FlowGraphSettings.h"

#include "Editor.h"
#include "Framework/MultiBox/MultiBoxDefs.h"
#include "PropertyCustomizationHelpers.h"
#include "SLevelOfDetailBranchNode.h"

#define LOCTEXT_NAMESPACE "SLevelEditorFlow"

Expand All @@ -25,8 +23,7 @@ void SLevelEditorFlow::OnMapOpened(const FString& Filename, bool bAsTemplate)

void SLevelEditorFlow::CreateFlowWidget()
{
UFlowComponent* FlowComponent = FindFlowComponent();
if (FlowComponent && FlowComponent->RootFlow)
if (UFlowComponent* FlowComponent = FindFlowComponent(); FlowComponent && FlowComponent->RootFlow)
{
FlowPath = FName(*FlowComponent->RootFlow->GetPathName());
}
Expand All @@ -35,7 +32,9 @@ void SLevelEditorFlow::CreateFlowWidget()
FlowPath = FName();
}

const TSharedRef<SWidget> FlowWidget = SNew(SHorizontalBox)
ChildSlot
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.AutoWidth()
[
Expand All @@ -44,31 +43,6 @@ void SLevelEditorFlow::CreateFlowWidget()
.DisplayThumbnail(false)
.OnObjectChanged(this, &SLevelEditorFlow::OnFlowChanged)
.ObjectPath(this, &SLevelEditorFlow::GetFlowPath)
];

ChildSlot
[
SNew(SLevelOfDetailBranchNode)
.UseLowDetailSlot(FMultiBoxSettings::UseSmallToolBarIcons)
.LowDetail()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.AutoWidth()
[
FlowWidget
]
]
.HighDetail()
[
SNew(SVerticalBox)
+ SVerticalBox::Slot()
.AutoHeight()
.VAlign(VAlign_Top)
.Padding(5.0f)
[
FlowWidget
]
]
];
}
Expand Down
6 changes: 3 additions & 3 deletions Source/FlowEditor/Private/Nodes/FlowNodeBlueprintFactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,11 +147,11 @@ class SFlowNodeBlueprintCreateDialog final : public SCompoundWidget
Options.DisplayMode = EClassViewerDisplayMode::TreeView;
Options.bIsBlueprintBaseOnly = true;

TSharedPtr<FFlowNodeBlueprintParentFilter> Filter = MakeShareable(new FFlowNodeBlueprintParentFilter);
const TSharedPtr<FFlowNodeBlueprintParentFilter> Filter = MakeShareable(new FFlowNodeBlueprintParentFilter);

// All child child classes of UFlowNode are valid
Filter->AllowedChildrenOfClasses.Add(UFlowNode::StaticClass());
Options.ClassFilter = Filter;
Options.ClassFilters = {Filter.ToSharedRef()};

ParentClassContainer->ClearChildren();
ParentClassContainer->AddSlot()
Expand Down Expand Up @@ -240,7 +240,7 @@ UFlowNodeBlueprintFactory::UFlowNodeBlueprintFactory(const FObjectInitializer& O

bool UFlowNodeBlueprintFactory::ConfigureProperties()
{
TSharedRef<SFlowNodeBlueprintCreateDialog> Dialog = SNew(SFlowNodeBlueprintCreateDialog);
const TSharedRef<SFlowNodeBlueprintCreateDialog> Dialog = SNew(SFlowNodeBlueprintCreateDialog);
return Dialog->ConfigureProperties(this);
}

Expand Down
2 changes: 1 addition & 1 deletion Source/FlowEditor/Public/Graph/FlowGraphSchema.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class FLOWEDITOR_API UFlowGraphSchema : public UEdGraphSchema
static void OnBlueprintCompiled();

static void GatherFlowNodes();
static void OnHotReload(bool bWasTriggeredAutomatically);
static void OnHotReload(EReloadCompleteReason ReloadCompleteReason);

static void OnAssetAdded(const FAssetData& AssetData);
static void AddAsset(const FAssetData& AssetData, const bool bBatch);
Expand Down

0 comments on commit 593b26b

Please sign in to comment.