feat: more async connect disconnect fns

ecsact-dev · Oct 9, 2024 · c43f73a · c43f73a
1 parent 2135353
commit c43f73a
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 6 deletions.
diff --git a/Source/Ecsact/Public/EcsactUnreal/EcsactRunner.cpp b/Source/Ecsact/Public/EcsactUnreal/EcsactRunner.cpp
@@ -1,4 +1,5 @@
 #include "EcsactUnreal/EcsactRunner.h"
+#include "EcsactUnreal/EcsactAsyncRunnerEvents.h"
 #include "EcsactUnreal/EcsactUnrealExecutionOptions.h"
 #include "UObject/ObjectMacros.h"
 #include "UObject/UObjectIterator.h"
@@ -45,6 +46,10 @@ auto UEcsactRunner::IsStopped() const -> bool {
 	return bIsStopped;
 }
 
+auto UEcsactRunner::HasAsyncEvents() const -> bool {
+	return Cast<IEcsactAsyncRunnerEvents>(this) != nullptr;
+}
+
 auto UEcsactRunner::Tick(float DeltaTime) -> void {
 }
 
@@ -177,6 +182,13 @@ auto UEcsactRunner::OnEntityCreatedRaw(
 ) -> void {
 	auto self = static_cast<ThisClass*>(callback_user_data);
 
+	UE_LOG(
+		LogTemp,
+		Warning,
+		TEXT("Received entity created callback for %i"),
+		static_cast<int>(entity_id)
+	);
+
 	auto create_callback =
 		self->CreateEntityCallbacks.Find(placeholder_entity_id);
 	if(create_callback) {

diff --git a/Source/Ecsact/Public/EcsactUnreal/EcsactRunner.h b/Source/Ecsact/Public/EcsactUnreal/EcsactRunner.h
@@ -81,6 +81,9 @@ class ECSACT_API UEcsactRunner : public UObject, public FTickableGameObject {
 	virtual auto Stop() -> void;
 	virtual auto IsStopped() const -> bool;
 
+	UFUNCTION(BlueprintPure)
+	bool HasAsyncEvents() const;
+
 	auto Tick(float DeltaTime) -> void override;
 	auto GetStatId() const -> TStatId override;
 	auto IsTickable() const -> bool override;

diff --git a/Source/Ecsact/Public/EcsactUnreal/EcsactRunnerSubsystem.cpp b/Source/Ecsact/Public/EcsactUnreal/EcsactRunnerSubsystem.cpp
@@ -1,4 +1,5 @@
 #include "EcsactRunnerSubsystem.h"
+#include "EcsactRunner.h"
 
 auto UEcsactRunnerSubsystem::InitComponentRaw(
 	ecsact_entity_id    EntityId,
@@ -29,10 +30,18 @@ auto UEcsactRunnerSubsystem::GetRunner() const -> const class UEcsactRunner* {
 	return OwningRunner;
 }
 
-auto UEcsactRunnerSubsystem::AsyncConnect_Implementation() -> void {
+auto UEcsactRunnerSubsystem::GetWorld() const -> class UWorld* {
+	if(OwningRunner != nullptr) {
+		return OwningRunner->GetWorld();
+	} else {
+		return nullptr;
+	}
 }
 
-auto UEcsactRunnerSubsystem::AsyncDisconnect_Implementation() -> void {
+auto UEcsactRunnerSubsystem::AsyncConnected_Implementation() -> void {
+}
+
+auto UEcsactRunnerSubsystem::AsyncDisconnected_Implementation() -> void {
 }
 
 auto UEcsactRunnerSubsystem::RunnerStart_Implementation(

diff --git a/Source/Ecsact/Public/EcsactUnreal/EcsactRunnerSubsystem.h b/Source/Ecsact/Public/EcsactUnreal/EcsactRunnerSubsystem.h
@@ -32,6 +32,8 @@ class ECSACT_API UEcsactRunnerSubsystem : public UObject {
 	auto GetRunner() const -> const class UEcsactRunner*;
 
 public:
+	auto GetWorld() const -> class UWorld* override;
+
 	UFUNCTION(BlueprintNativeEvent, Category = "Ecsact Runner")
 	void RunnerStart(class UEcsactRunner* Runner);
 
@@ -50,19 +52,19 @@ class ECSACT_API UEcsactRunnerSubsystem : public UObject {
 	 * NOTE: For 'async' runners only
 	 */
 	UFUNCTION(BlueprintNativeEvent, Category = "Ecsact Runner")
-	void AsyncConnect();
+	void AsyncConnected();
 
-	virtual auto AsyncConnect_Implementation() -> void;
+	virtual auto AsyncConnected_Implementation() -> void;
 
 	/**
 	 * Called when an ecsact_async_disconnect is called or if an error that
 	 * triggers a disconnect occurs.
 	 * NOTE: For 'async' runners only
 	 */
 	UFUNCTION(BlueprintNativeEvent, Category = "Ecsact Runner")
-	void AsyncDisconnect();
+	void AsyncDisconnected();
 
-	virtual auto AsyncDisconnect_Implementation() -> void;
+	virtual auto AsyncDisconnected_Implementation() -> void;
 
 	UFUNCTION(BlueprintNativeEvent, Category = "Ecsact Runner")
 	void EntityCreated(int32 Entity);