feat: refactor to use new ecsact si wasm header api

Author: zaucy

Source/Ecsact/Ecsact.Build.cs

@@ -65,7 +65,7 @@ public Ecsact(ReadOnlyTargetRules Target) : base(Target) {
 			"ECSACT_META_API_LOAD_AT_RUNTIME",
 			"ECSACT_SERIALIZE_API_LOAD_AT_RUNTIME",
 			"ECSACT_STATIC_API_LOAD_AT_RUNTIME",
-			"ECSACTSI_WASM_API_LOAD_AT_RUNTIME",
+			"ECSACT_SI_WASM_API_LOAD_AT_RUNTIME",
 		});
 		PrivateDefinitions.AddRange(new string[] {
 			"ECSACT_CORE_API_EXPORT",
@@ -74,7 +74,7 @@ public Ecsact(ReadOnlyTargetRules Target) : base(Target) {
 			"ECSACT_META_API_EXPORT",
 			"ECSACT_SERIALIZE_API_EXPORT",
 			"ECSACT_STATIC_API_EXPORT",
-			"ECSACTSI_WASM_API_EXPORT",
+			"ECSACT_SI_WASM_API_EXPORT",
 		});
 
 		var EcsactSources = GetEcsactSources();

Source/Ecsact/Public/EcsactUnreal/Ecsact.cpp

@@ -7,7 +7,7 @@
 #include "Misc/Paths.h"
 #include "EcsactUnreal/EcsactAsyncRunner.h"
 #include "ecsact/runtime.h"
-#include "ecsact/wasm.h"
+#include "ecsact/si/wasm.h"
 #include "Engine/World.h"
 
 #define LOCTEXT_NAMESPACE "FEcsactModule"
@@ -16,7 +16,7 @@ DEFINE_LOG_CATEGORY(Ecsact);
 
 #define INIT_ECSACT_API_FN(fn, UNUSED_PARAM) decltype(fn) fn = nullptr
 FOR_EACH_ECSACT_API_FN(INIT_ECSACT_API_FN, UNUSED_PARAM);
-FOR_EACH_ECSACTSI_WASM_API_FN(INIT_ECSACT_API_FN, UNUSED_PARAM);
+FOR_EACH_ECSACT_SI_WASM_API_FN(INIT_ECSACT_API_FN, UNUSED_PARAM);
 #undef INIT_ECSACT_API_FN
 
 FEcsactModule* FEcsactModule::Self = nullptr;

Source/Ecsact/Public/EcsactUnreal/EcsactRunner.cpp

@@ -183,6 +183,8 @@ auto UEcsactRunner::OnEntityCreatedRaw(
 ) -> void {
 	auto self = static_cast<ThisClass*>(callback_user_data);
 
+	UE_LOG(Ecsact, Error, TEXT("OnEntityCreatedRaw"));
+
 	auto create_callback =
 		self->CreateEntityCallbacks.Find(placeholder_entity_id);
 	if(create_callback) {

Source/Ecsact/Public/EcsactUnreal/EcsactSyncRunner.cpp

@@ -3,7 +3,10 @@
 #include "EcsactUnreal/EcsactUnrealExecutionOptions.h"
 #include "EcsactUnreal/EcsactExecution.h"
 #include "ecsact/runtime/core.h"
-#include "ecsact/wasm.h"
+#include "ecsact/si/wasm.h"
+
+UEcsactSyncRunner::UEcsactSyncRunner() : Super() {
+}
 
 auto UEcsactSyncRunner::StreamImpl(
 	ecsact_entity_id    Entity,
@@ -45,18 +48,21 @@ auto UEcsactSyncRunner::Tick(float DeltaTime) -> void {
 	}
 
 	if(registry_id != ECSACT_INVALID_ID(registry)) {
-		ecsact_execution_options* exec_opts = nullptr;
-		if(ExecutionOptions != nullptr && ExecutionOptions->IsNotEmpty()) {
-			exec_opts = ExecutionOptions->GetCPtr();
-		}
-
 		if(ecsact_execute_systems) {
-			auto err =
-				ecsact_execute_systems(registry_id, 1, exec_opts, GetEventsCollector());
+			ecsact_execution_options* exec_opts = nullptr;
+			if(ExecutionOptions != nullptr && ExecutionOptions->IsNotEmpty()) {
+				exec_opts = ExecutionOptions->GetCPtr();
+			}
+			auto err = ecsact_execute_systems( //
+				registry_id,
+				1,
+				exec_opts,
+				GetEventsCollector()
+			);
 			if(err != ECSACT_EXEC_SYS_OK) {
 				UE_LOG(Ecsact, Error, TEXT("Ecsact execution failed"));
 			}
-			if(ExecutionOptions) {
+			if(ExecutionOptions != nullptr) {
 				ExecutionOptions->Clear();
 			}
 		} else {
@@ -68,23 +74,23 @@ auto UEcsactSyncRunner::Tick(float DeltaTime) -> void {
 		}
 	}
 
-	if(ecsactsi_wasm_consume_logs != nullptr) {
-		ecsactsi_wasm_consume_logs(
+	if(ecsact_si_wasm_consume_logs != nullptr) {
+		ecsact_si_wasm_consume_logs(
 			[](
-				ecsactsi_wasm_log_level log_level,
-				const char*             message,
-				int32_t                 message_length,
-				void*                   user_data
+				ecsact_si_wasm_log_level log_level,
+				const char*              message,
+				int32_t                  message_length,
+				void*                    user_data
 			) {
 				switch(log_level) {
 					default:
-					case ECSACTSI_WASM_LOG_LEVEL_INFO:
+					case ECSACT_SI_WASM_LOG_LEVEL_INFO:
 						UE_LOG(Ecsact, Log, TEXT("%.*hs"), message_length, message);
 						break;
-					case ECSACTSI_WASM_LOG_LEVEL_WARNING:
+					case ECSACT_SI_WASM_LOG_LEVEL_WARNING:
 						UE_LOG(Ecsact, Warning, TEXT("%.*hs"), message_length, message);
 						break;
-					case ECSACTSI_WASM_LOG_LEVEL_ERROR:
+					case ECSACT_SI_WASM_LOG_LEVEL_ERROR:
 						UE_LOG(Ecsact, Error, TEXT("%.*hs"), message_length, message);
 						break;
 				}

Source/Ecsact/Public/EcsactUnreal/EcsactSyncRunner.h

@@ -25,6 +25,8 @@ class ECSACT_API UEcsactSyncRunner : public UEcsactRunner {
 	// TODO: Put this somewhere good.
 	ecsact_registry_id registry_id = ECSACT_INVALID_ID(registry);
 
+	UEcsactSyncRunner();
+
 	auto Tick(float DeltaTime) -> void override;
 	auto GetStatId() const -> TStatId override;
 };

Source/Ecsact/Public/EcsactUnreal/RuntimeLoad.h

@@ -3,7 +3,7 @@
 #include "EcsactUnreal/Ecsact.h"
 #include "EcsactUnreal/RuntimeHandle.h"
 #include "ecsact/runtime.h"
-#include "ecsact/wasm.h"
+#include "ecsact/si/wasm.h"
 
 /** @internal - DO NOT USE */
 #define ECSACT_API_FN_INIT_(fn, UNUSED_PARAM) decltype(fn) fn = nullptr
@@ -65,7 +65,7 @@
 				return {};                                                         \
 			}                                                                    \
 			FOR_EACH_ECSACT_API_FN(ECSACTAPI_FN_FN_LOAD_);                       \
-			FOR_EACH_ECSACTSI_WASM_API_FN(ECSACTAPI_FN_FN_LOAD_);                \
+			FOR_EACH_ECSACT_SI_WASM_API_FN(ECSACTAPI_FN_FN_LOAD_);               \
 			return result;                                                       \
 		})()
 
@@ -80,7 +80,7 @@
 			}                                                             \
 			EcsactUnreal::Detail::UnloadPostDisconnect(module, Handle_);  \
 			FOR_EACH_ECSACT_API_FN(ECSACT_API_FN_RESET_);                 \
-			FOR_EACH_ECSACTSI_WASM_API_FN(ECSACT_API_FN_RESET_);          \
+			FOR_EACH_ECSACT_SI_WASM_API_FN(ECSACT_API_FN_RESET_);         \
 			EcsactUnreal::Detail::UnloadPostReset(module, Handle_);       \
 		})(Handle)