Skip to content

Commit

Permalink
Merge branch 'main' into more-timeline-types
Browse files Browse the repository at this point in the history
  • Loading branch information
zompi2 committed Dec 11, 2024
2 parents cd8d41b + 225f693 commit f492493
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 25 deletions.
3 changes: 2 additions & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
github: zompi2
buy_me_a_coffee: zompi2
ko_fi: zompi2
buy_me_a_coffee: zompi2
Binary file added .vs/slnx.sqlite
Binary file not shown.
6 changes: 6 additions & 0 deletions Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
###### 3.3.13
* uplugin fixes to prepare it for FAB

###### 3.3.12
* Fixed shadow variable warnings which failed compilation with clang.

###### 3.3.11
* Proper coroutine handle destruction for dangling handles.

Expand Down
3 changes: 2 additions & 1 deletion EnhancedCodeFlow.uplugin
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
{
"FileVersion": 3,
"Version": 1,
"VersionName": "3.3.11",
"VersionName": "3.3.13",
"FriendlyName": "Enhanced Code Flow",
"Description": "This code plugin provides functions that drastically improve the quality of life during the implementation of game flow in C++.",
"Category": "Programming",
"CreatedBy": "Damian Nowakowski",
"CreatedByURL": "https://zompidev.blogspot.com",
"DocsURL": "https://github.com/zompi2/UE4EnhancedCodeFlow",
"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/0e9dd2a8f807456da0fe6af280ab795c",
"FabURL": "com.epicgames.launcher://ue/Fab/product/2f3cbfb1-8acd-45b3-99ad-ee295c97b53e",
"SupportURL": "mailto:zompi2@gmail.com",
"CanContainContent": false,
"IsBetaVersion": false,
Expand Down
28 changes: 9 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The plugin has been tested on the Engine's versions: 4.27, 5.2, 5.3 and 5.4.

# Table of content

- [Unreal Engine Marketplace](#unreal-engine-marketplace)
- [Fab](#fab)
- [Example Project](#example-project)
- [Used in...](#used-in)
- [Contact](#contact)
Expand All @@ -25,16 +25,15 @@ The plugin has been tested on the Engine's versions: 4.27, 5.2, 5.3 and 5.4.
- [Stopping Actions](#stopping-actions)
- [Measuring Performance](#measuring-performance)
- [Extending Plugin](#extending-plugin)
- [Extra Links](#extra-links)
- [Special Thanks](#special-thanks)

# Unreal Engine Marketplace
# Fab

The plugin is finally available on the Unreal Engine Marketplace! It is free, of course.
If you don't want to build this plugin by yourself, you can **[download it from here](https://www.unrealengine.com/marketplace/en-US/product/enhanced-code-flow)**.
Unreal Engine Marketplace allow to publish the code plugins for new versions of the Unreal Engine only, so currently only 5.4, 5.3 and 5.2 are available.
If you are using 4.27 you can download the precompiled package **[from here](https://github.com/zompi2/UE4EnhancedCodeFlow/raw/build-4.27/EnhancedCodeFlow-4.27-Compiled.zip)**.
The plugin's version that's on the Marketplace is **3.3.10**.
The plugin is available on the Fab! It is free, of course.
If you don't want to build this plugin by yourself, you can **[download it from here](https://www.fab.com/listings/c7a13871-0671-45d5-971c-2f5b3d53d3c0)**.
Currently plugin is available for Unreal Engine version 5.4, 5.3, 5.2 and 4.27.
If you have troubles with downloading version for 4.27 you can download the precompiled package **[from here](https://github.com/zompi2/UE4EnhancedCodeFlow/raw/build-4.27/EnhancedCodeFlow-4.27-Compiled.zip)**.
The plugin's version that's on the Fab is **3.3.13**.

[Back to top](#table-of-content)

Expand Down Expand Up @@ -63,7 +62,7 @@ If you are using ECF in your project, let me know :)

# Contact

If you have any question or suggestion regardles this plugin simply add an **Issue** to the github project or write an e-mail to me: **zompi2@gmail.com** I will try my best to answer it quickly :)
If you have any question or suggestion regardles this plugin simply add an **Issue** to the github project. I will try my best to answer it quickly :) You can also write an e-mail to me: **zompi2@gmail.com**, however there is a risk that it will be filtered as spam.

[Back to top](#table-of-content)

Expand Down Expand Up @@ -535,7 +534,7 @@ There is additional BP node which will validate an `InstanceId` if it is not val
# Coroutines (experimental)

> Coroutines are treated as an **experimental** feature. You can use them at your own risk!
> They are experimental, because c++ coroutines are relatively new features and I'm still learning how to implement them correctly. It is highly propable there will be stability or performance issues.
> They are experimental, because c++ coroutines are relatively new features and I'm still learning how to implement them correctly. It is highly probable there will be stability or performance issues.
[Coroutines](https://en.cppreference.com/w/cpp/language/coroutines) are functions that can suspend their execution and be resumed later. They require C++20 which is supported in Unreal Engine from verion 5.3. To make sure that your project supports C++20 add the following line to your project's `Build.cs`:

Expand Down Expand Up @@ -855,15 +854,6 @@ You can temporarily disable plugin's build optimizations by setting the `bDisabl
[Back to top](#table-of-content)
# Extra links
* [Unreal Engine Marketplace](https://www.unrealengine.com/marketplace/en-US/product/enhanced-code-flow)
* [Unreal Engine Forum](https://forums.unrealengine.com/t/plugin-enhanced-code-flow/684237)
* [Blog Entry](https://zompidev.blogspot.com/2021/03/enhanced-code-flow-plugin-for-ue4.html)
* [Reddit Post](https://www.reddit.com/r/unrealengine/comments/mbkzqj/enhanced_code_flow_plugin)
[Back to top](#table-of-content)
# Special thanks
I want to send special thanks to Monika, because she always supports me and believes in me, to Pawel, for allowing me to test this plugin on his project and to everyone that contributed to this project.
Expand Down
4 changes: 2 additions & 2 deletions Source/EnhancedCodeFlow/Public/CodeFlowActions/ECFTimeline.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ class ENHANCEDCODEFLOW_API UECFTimeline : public UECFActionBase
bool Setup(float InStartValue, float InStopValue, float InTime, TUniqueFunction<void(float, float)>&& InTickFunc, TUniqueFunction<void(float, float)>&& InCallbackFunc, EECFBlendFunc InBlendFunc, float InBlendExp)
{
CallbackFunc_NoStopped = MoveTemp(InCallbackFunc);
return Setup(InStartValue, InStopValue, InTime, MoveTemp(InTickFunc), [this](float Value, float Time, bool bStopped)
return Setup(InStartValue, InStopValue, InTime, MoveTemp(InTickFunc), [this](float FwdValue, float FwdTime, bool bStopped)
{
if (CallbackFunc_NoStopped)
{
CallbackFunc_NoStopped(Value, Time);
CallbackFunc_NoStopped(FwdValue, FwdTime);
}
}, InBlendFunc, InBlendExp);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ class ENHANCEDCODEFLOW_API FECFCoroutineAwaiter

// Helper function for adding coroutine actions to the ECF subsystem.
template<typename T, typename ... Ts>
void AddCoroutineAction(const UObject* InOwner, FECFCoroutineHandle InCoroutineHandle, const FECFActionSettings& Settings, Ts&& ... Args)
void AddCoroutineAction(const UObject* InOwner, FECFCoroutineHandle InCoroutineHandle, const FECFActionSettings& InSettings, Ts&& ... Args)
{
if (UECFSubsystem* ECF = UECFSubsystem::Get(InOwner))
{
ECF->AddCoroutineAction<T>(InOwner, InCoroutineHandle, Settings, Forward<Ts>(Args)...);
ECF->AddCoroutineAction<T>(InOwner, InCoroutineHandle, InSettings, Forward<Ts>(Args)...);
}
}

Expand Down

0 comments on commit f492493

Please sign in to comment.