feat: more multi assoc api adjustments (#244)

ecsact-dev · May 24, 2024 · 82e37e2 · 82e37e2
1 parent ef3e316
commit 82e37e2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/ecsact/runtime/dynamic.h b/ecsact/runtime/dynamic.h
@@ -380,7 +380,8 @@ ECSACT_DYNAMIC_API_FN(void, ecsact_unset_system_capability)
 
 ECSACT_DYNAMIC_API_FN(ecsact_system_assoc_id, ecsact_add_system_assoc)
 ( //
-	ecsact_system_like_id
+	ecsact_system_like_id,
+	ecsact_component_like_id
 );
 
 ECSACT_DYNAMIC_API_FN(void, ecsact_remove_system_assoc)
@@ -393,23 +394,20 @@ ECSACT_DYNAMIC_API_FN(void, ecsact_add_system_assoc_field)
 ( //
 	ecsact_system_like_id,
 	ecsact_system_assoc_id,
-	ecsact_component_like_id,
 	ecsact_field_id
 );
 
 ECSACT_DYNAMIC_API_FN(void, ecsact_remove_system_assoc_field)
 ( //
 	ecsact_system_like_id,
 	ecsact_system_assoc_id,
-	ecsact_component_like_id,
 	ecsact_field_id
 );
 
 ECSACT_DYNAMIC_API_FN(void, ecsact_set_system_assoc_capbility)
 ( //
 	ecsact_system_like_id,
 	ecsact_system_assoc_id,
-	ecsact_component_like_id,
 	ecsact_system_capability
 );
 

diff --git a/ecsact/runtime/meta.h b/ecsact/runtime/meta.h
@@ -289,21 +289,30 @@ ECSACT_META_API_FN(int32_t, ecsact_meta_system_assoc_count)
 	ecsact_system_like_id system_id
 );
 
-ECSACT_META_API_FN(int32_t, ecsact_meta_system_assoc_ids)
+ECSACT_META_API_FN(void, ecsact_meta_system_assoc_ids)
 ( //
 	ecsact_system_like_id   system_id,
 	int32_t                 max_assoc_count,
 	ecsact_system_assoc_id* out_assoc_ids,
 	int32_t*                out_assoc_count
 );
 
+ECSACT_META_API_FN(
+	ecsact_component_like_id,
+	ecsact_meta_system_assoc_component_id
+)
+( //
+	ecsact_system_like_id  system_id,
+	ecsact_system_assoc_id assoc_id
+);
+
 ECSACT_META_API_FN(int32_t, ecsact_meta_system_assoc_fields_count)
 ( //
 	ecsact_system_like_id  system_id,
 	ecsact_system_assoc_id assoc_id
 );
 
-ECSACT_META_API_FN(int32_t, ecsact_meta_system_assoc_fields)
+ECSACT_META_API_FN(void, ecsact_meta_system_assoc_fields)
 ( //
 	ecsact_system_like_id  system_id,
 	ecsact_system_assoc_id assoc_id,
@@ -535,6 +544,7 @@ ECSACT_META_API_FN(void, ecsact_meta_system_notify_settings)
 		fn(ecsact_meta_system_capabilities, __VA_ARGS__);                   \
 		fn(ecsact_meta_system_assoc_count, __VA_ARGS__);                    \
 		fn(ecsact_meta_system_assoc_ids, __VA_ARGS__);                      \
+		fn(ecsact_meta_system_assoc_component_id, __VA_ARGS__);             \
 		fn(ecsact_meta_system_assoc_fields_count, __VA_ARGS__);             \
 		fn(ecsact_meta_system_assoc_fields, __VA_ARGS__);                   \
 		fn(ecsact_meta_system_assoc_capabilities_count, __VA_ARGS__);       \