fix: generate, actions, and association data issues

Author: Kelwan

.vscode/launch.json

@@ -8,6 +8,7 @@
 			"cwd": "${workspaceFolder}",
 			"args": [
 				"--gtest_catch_exceptions",
+				// "--gtest_break_on_failure",
 			],
 			"type": "cppvsdbg",
 			"windows": {

ecsact/entt/error_check.hh

@@ -47,4 +47,18 @@ auto check_update_component_error( //
 )");
 }
 
+template<typename A>
+auto check_action_error( //
+	::entt::registry&,
+	const A&
+) -> ecsact_execute_systems_error {
+	static_assert(detail::error_check_unimplemented_by_codegen<A>, R"(
+ -----------------------------------------------------------------------------
+| (!) CODEGEN ERROR                                                           |
+| `check_update_component_error<>` template specialization cannot be found.   |
+| This is typically generated by ecsact_rt_entt_codegen.                      |
+ -----------------------------------------------------------------------------
+)");
+}
+
 } // namespace ecsact::entt

ecsact/entt/wrapper/core.hh

@@ -193,11 +193,6 @@ auto remove_component_exec_options(
 			reg.template get<C>(entity)
 		);
 	}
-	// NOTE(Kelwan): Check if a system is trivial
-	// AKA: No read or write components and no adding non-tag components
-	// If it is trivial, generate code for a manual system impl execution
-	// Do it in template_specialization so execute_system isn't generated for
-	// trivial systems
 
 	reg.template erase<C>(entity);
 	reg.template remove<component_added<C>>(entity);
@@ -209,7 +204,7 @@ auto remove_component_exec_options(
 	}
 }
 
-inline auto _trigger_create_entity_event(
+inline auto _trigger_create_entity_events(
 	ecsact_registry_id                                registry_id,
 	ecsact::entt::detail::execution_events_collector& events_collector
 ) -> void {
@@ -229,7 +224,7 @@ inline auto _trigger_create_entity_event(
 	}
 }
 
-inline auto _trigger_destroy_entity_event(
+inline auto _trigger_destroy_entity_events(
 	ecsact_registry_id                                registry_id,
 	ecsact::entt::detail::execution_events_collector& events_collector
 ) -> void {
@@ -351,11 +346,31 @@ auto _trigger_remove_component_event(
 	}
 }
 
-inline auto handle_execution_options(
-	ecsact_registry_id        registry_id,
-	ecsact_execution_options* options
-) -> void {
+auto check_action_error_t(
+	ecsact_registry_id registry_id,
+	const void*        action_data
+) -> ecsact_execute_systems_error;
+
+template<typename A>
+inline auto check_action_error(
+	ecsact_registry_id registry_id,
+	const void*        action_data
+) -> ecsact_execute_systems_error {
 	auto& reg = ecsact::entt::get_registry(registry_id);
+
+	auto action = *static_cast<const A*>(action_data);
+	auto result = ecsact::entt::check_action_error(reg, action);
+
+	return result;
+}
+
+template<typename C>
+inline auto clear_component(ecsact_registry_id registry_id) -> void {
+	auto& reg = ecsact::entt::get_registry(registry_id);
+
+	reg.clear<ecsact::entt::component_added<C>>();
+	reg.clear<ecsact::entt::component_changed<C>>();
+	reg.clear<ecsact::entt::component_removed<C>>();
 }
 
 } // namespace ecsact::entt::wrapper::core

ecsact/entt/wrapper/dynamic.hh

@@ -178,17 +178,14 @@ template<typename C>
 auto context_generate_add(
 	ecsact_system_execution_context* context,
 	ecsact_component_id              component_id,
-	const void*                      component_data
+	const void*                      component_data,
+	ecsact::entt::entity_id          entity
 ) -> void {
 	using ecsact::entt::detail::created_entity;
 	using ecsact::entt::detail::pending_add;
 
 	auto& registry = *context->registry;
 
-	// NOTE: This is flawed. An entity is being created for every component in a
-	// generate components list
-	auto entity = registry.create();
-
 	registry.template emplace<created_entity>(
 		entity,
 		created_entity{

rt_entt_codegen/core/check_error_template_specializations.cc

@@ -97,6 +97,40 @@ static auto print_check_update_component_error_template_specialization(
 	ctx.write("return ECSACT_UPDATE_OK;");
 }
 
+static auto print_check_action_error_template_specialization(
+	ecsact::codegen_plugin_context&                     ctx,
+	const ecsact::rt_entt_codegen::ecsact_entt_details& details,
+	ecsact_action_id                                    action_id
+) -> void {
+	using ecsact::cpp_codegen_plugin_util::block;
+	using ecsact::cpp_codegen_plugin_util::method_printer;
+	using ecsact::rt_entt_codegen::util::decl_cpp_ident;
+
+	auto cpp_action_ident = decl_cpp_ident(action_id);
+
+	const auto method_name =
+		"ecsact::entt::check_action_error<" + cpp_action_ident + ">";
+
+	ctx.write("template<>\n");
+
+	auto printer = //
+		method_printer{ctx, method_name}
+			.parameter("::entt::registry&", "registry")
+			.parameter(cpp_action_ident + " const&", "action")
+			.return_type("ecsact_execute_systems_error");
+
+	ctx.write("auto err = ECSACT_EXEC_SYS_OK;\n");
+
+	for_each_entity_field(action_id, [&](auto field_name) {
+		auto field_var = "ecsact::entt::entity_id{action." + field_name + "}";
+		block(ctx, "if(!registry.valid(" + field_var + "))", [&] {
+			ctx.write("return ECSACT_EXEC_SYS_ERR_ACTION_ENTITY_INVALID;\n");
+		});
+	});
+
+	ctx.write("return err;\n");
+}
+
 auto ecsact::rt_entt_codegen::core::print_check_error_template_specializations(
 	codegen_plugin_context&    ctx,
 	const ecsact_entt_details& details
@@ -116,4 +150,8 @@ auto ecsact::rt_entt_codegen::core::print_check_error_template_specializations(
 			comp_id
 		);
 	}
+
+	for(auto action_id : details.all_actions) {
+		print_check_action_error_template_specialization(ctx, details, action_id);
+	}
 }

rt_entt_codegen/core/core.hh

@@ -31,12 +31,17 @@ auto print_check_error_template_specializations( //
 	const ecsact_entt_details& details
 ) -> void;
 
-auto print_trigger_component_events_minimal( //
+auto print_trigger_ecsact_events_minimal( //
 	codegen_plugin_context&    ctx,
 	const ecsact_entt_details& details
 ) -> void;
 
-auto print_trigger_component_events_all( //
+auto print_trigger_ecsact_events_all( //
+	codegen_plugin_context&    ctx,
+	const ecsact_entt_details& details
+) -> void;
+
+auto print_cleanup_ecsact_component_events( //
 	codegen_plugin_context&    ctx,
 	const ecsact_entt_details& details
 ) -> void;

rt_entt_codegen/core/events.cc

@@ -4,6 +4,7 @@
 #include "ecsact/lang-support/lang-cc.hh"
 #include "rt_entt_codegen/core/core.hh"
 #include "rt_entt_codegen/shared/util.hh"
+#include "ecsact/cpp_codegen_plugin_util.hh"
 #include "rt_entt_codegen/shared/comps_with_caps.hh"
 
 static auto print_trigger_event_fn_call(
@@ -20,7 +21,7 @@ static auto print_trigger_event_fn_call(
 	);
 }
 
-auto ecsact::rt_entt_codegen::core::print_trigger_component_events_minimal( //
+auto ecsact::rt_entt_codegen::core::print_trigger_ecsact_events_minimal( //
 	codegen_plugin_context&    ctx,
 	const ecsact_entt_details& details
 ) -> void {
@@ -51,9 +52,19 @@ auto ecsact::rt_entt_codegen::core::print_trigger_component_events_minimal( //
 		auto type_name = cpp_identifier(decl_full_name(comp_id));
 		print_trigger_event_fn_call(ctx, "remove", type_name);
 	}
+
+	ctx.write(
+		"ecsact::entt::wrapper::core::_trigger_create_entity_events(registry_id, "
+		"events_collector);\n"
+	);
+
+	ctx.write(
+		"ecsact::entt::wrapper::core::_trigger_destroy_entity_events(registry_id, "
+		"events_collector);\n"
+	);
 }
 
-auto ecsact::rt_entt_codegen::core::print_trigger_component_events_all( //
+auto ecsact::rt_entt_codegen::core::print_trigger_ecsact_events_all( //
 	codegen_plugin_context&    ctx,
 	const ecsact_entt_details& details
 ) -> void {
@@ -89,4 +100,41 @@ auto ecsact::rt_entt_codegen::core::print_trigger_component_events_all( //
 		auto type_name = cpp_identifier(decl_full_name(component_id));
 		print_trigger_event_fn_call(ctx, "remove", type_name);
 	}
+
+	ctx.write(
+		"ecsact::entt::wrapper::core::_trigger_create_entity_events(registry_id, "
+		"events_collector);\n"
+	);
+
+	ctx.write(
+		"ecsact::entt::wrapper::core::_trigger_destroy_entity_events(registry_id, "
+		"events_collector);\n"
+	);
+}
+
+auto ecsact::rt_entt_codegen::core::print_cleanup_ecsact_component_events( //
+	codegen_plugin_context&    ctx,
+	const ecsact_entt_details& details
+) -> void {
+	using ecsact::cc_lang_support::cpp_identifier;
+	using ecsact::cpp_codegen_plugin_util::block;
+	using ecsact::meta::decl_full_name;
+	using ecsact::rt_entt_codegen::util::method_printer;
+
+	auto printer = //
+		method_printer{ctx, "cleanup_component_events"}
+			.parameter("ecsact_registry_id", "registry_id")
+			.return_type("void");
+
+	for(auto component_id : details.all_components) {
+		auto type_name = cpp_identifier(decl_full_name(component_id));
+		ctx.write(
+			"ecsact::entt::wrapper::core::clear_component",
+			"<::",
+			type_name,
+			">(registry_id);\n"
+		);
+	}
+
+	ctx.write("auto& reg = ecsact::entt::get_registry(registry_id);\n");
 }

rt_entt_codegen/core/execute_system_like_template_specializations.cc

@@ -409,7 +409,7 @@ static auto print_sys_exec_ctx_generate(
 		"static const auto generate_fns = "
 		"std::unordered_map<ecsact_component_id, "
 		"void(*)(ecsact_system_execution_context*, ecsact_component_id, const "
-		"void*)>",
+		"void*, ecsact::entt::entity_id)>",
 		[&] {
 			for(const auto& component : details.generate_comps) {
 				for(const auto& [comp_id, requirements] : component) {
@@ -430,13 +430,15 @@ static auto print_sys_exec_ctx_generate(
 	// NOTE(Kelwan): Multiple generates blocks are allowed in Ecsact systems but
 	// currently the interpreter won't allow this. More testing required after the
 	// issue is resolved https://github.com/ecsact-dev/ecsact_interpret/issues/185
+	ctx.write("auto entity = this->registry->create();\n");
+
 	block(ctx, "for(int i = 0; i < component_count; ++i)", [&] {
 		ctx.write("const auto component_id = component_ids[i];\n");
 		ctx.write("const void* component_data = components_data[i];\n");
 
 		ctx.write(
 			"generate_fns.at(component_id)(this, component_id, "
-			"component_data);\n"
+			"component_data, entity);\n"
 		);
 	});
 }
@@ -789,39 +791,11 @@ static auto print_other_contexts(
 			)
 		);
 
-		ctx.write("auto ", view_name, " = ", options.registry_var_name, ".view<");
-
-		std::string result;
-		for(auto&& [comp_id, capability] : assoc_detail.capabilities) {
-			if(capability != ECSACT_SYS_CAP_EXCLUDE) {
-				result += "::" + cpp_identifier(decl_full_name(comp_id)) + ", ";
-			}
-		}
-
-		if(result.ends_with(", ")) {
-			result = result.substr(0, result.size() - 2);
-		}
-
-		ctx.write(result);
-
-		ctx.write(">(");
-
-		if(!details.exclude_comps.empty()) {
-			ctx.write("::entt::exclude<");
-			for(auto&& [comp_id, capability] : assoc_detail.capabilities) {
-				if((ECSACT_SYS_CAP_EXCLUDE & capability) == ECSACT_SYS_CAP_EXCLUDE) {
-					auto full_name = cpp_identifier(decl_full_name(comp_id));
-					ctx.write("::", full_name, ", ");
-				}
-			}
-			ctx.write(">");
-		}
-
-		ctx.write(");\n");
-
 		auto other_details =
 			ecsact_entt_system_details::from_capabilities(assoc_detail.capabilities);
 
+		make_view(ctx, view_name, "registry", other_details);
+
 		block(ctx, "struct " + struct_header, [&] {
 			using namespace std::string_literals;
 			using ecsact::rt_entt_codegen::util::decl_cpp_ident;
@@ -854,7 +828,7 @@ static auto print_other_contexts(
 	return other_views;
 }
 
-static auto is_trivial_system(ecsact_system_id system_id) -> bool {
+static auto is_trivial_system(ecsact_system_like_id system_id) -> bool {
 	using ecsact::meta::get_field_ids;
 	using ecsact::meta::system_capabilities;
 
@@ -956,7 +930,7 @@ static auto print_execute_system_template_specialization(
 
 	using ecsact::rt_entt_codegen::util::method_printer;
 
-	if(is_trivial_system(system_id)) {
+	if(is_trivial_system(ecsact_id_cast<ecsact_system_like_id>(system_id))) {
 		print_trivial_system_like(
 			ctx,
 			details,
@@ -1004,6 +978,15 @@ static auto print_execute_actions_template_specialization(
 	using ecsact::meta::decl_full_name;
 	using ecsact::rt_entt_codegen::util::method_printer;
 
+	if(is_trivial_system(ecsact_id_cast<ecsact_system_like_id>(action_id))) {
+		print_trivial_system_like(
+			ctx,
+			details,
+			ecsact_id_cast<ecsact_system_like_id>(action_id)
+		);
+		return;
+	}
+
 	auto cpp_system_name = cpp_identifier(decl_full_name(action_id));
 
 	const auto method_name =

rt_entt_codegen/core/execute_systems.cc

@@ -37,8 +37,12 @@ auto ecsact::rt_entt_codegen::core::print_execute_systems( //
 
 	block(ctx, "if(execution_options_list != nullptr)", [&] {
 		ctx.write(
-			"handle_execution_options(registry_id, execution_options_list[i]);\n\n"
+			"auto err = handle_execution_options(registry_id, "
+			"execution_options_list[i]);\n\n"
 		);
+		block(ctx, "if(err != ECSACT_EXEC_SYS_OK)", [&] {
+			ctx.write("return err;");
+		});
 	});
 
 	for(auto sys_like : details.top_execution_order) {
@@ -84,9 +88,8 @@ auto ecsact::rt_entt_codegen::core::print_execute_systems( //
 				"trigger_component_events_all(registry_id, events_collector);\n\n"
 			);
 		});
+		ctx.write("cleanup_component_events(registry_id);\n");
 	});
 
-	// TODO: clear all event markers
-
 	ctx.write("return ECSACT_EXEC_SYS_OK;");
 }